Fix clone module

CMakeLists.txt

@@ -100,7 +100,8 @@ list(APPEND prec_srcs
     ${CMAKE_CURRENT_BINARY_DIR}/src/core/field_module.F90
     ${CMAKE_CURRENT_BINARY_DIR}/src/util/field_array_module.F90
     ${CMAKE_CURRENT_BINARY_DIR}/src/util/field_array_util_module.F90
-    ${CMAKE_CURRENT_BINARY_DIR}/src/util/field_util_module.F90)
+    ${CMAKE_CURRENT_BINARY_DIR}/src/util/field_util_module.F90
+    ${CMAKE_CURRENT_BINARY_DIR}/src/util/field_clone_module.F90)
 
 list(APPEND obj_libs
         field_api_core

src/util/field_RANKSUFF_clone_module.fypp

@@ -15,11 +15,12 @@ ${fieldType.useParkind1 ()}$
 
 IMPLICIT NONE
 
-INTERFACE FIELD_CLONE
-  MODULE PROCEDURE :: ${ft.name}$_CLONE
-END INTERFACE FIELD_CLONE
-
-PUBLIC :: FIELD_CLONE
+#:for TARGET in ["HOST", "DEVICE"]
+INTERFACE FIELD_CLONE_ON_${TARGET}$
+  MODULE PROCEDURE :: ${ft.name}$_CLONE_ON_${TARGET}$
+END INTERFACE FIELD_CLONE_ON_${TARGET}$
+PUBLIC :: FIELD_CLONE_ON_${TARGET}$
+#:endfor
 
 CONTAINS
 

src/util/field_clone_module.fypp

@@ -9,34 +9,14 @@
 
 MODULE FIELD_CLONE_MODULE
 
-#:set fieldTypeListOT = fieldType.getFieldTypeList (hasView=True, kinds=['JPIM', 'JPLM'])
-#:set fieldTypeListRM = fieldType.getFieldTypeList (hasView=True, kinds=['JPRM'])
-#:set fieldTypeListRB = fieldType.getFieldTypeList (hasView=True, kinds=['JPRB'])
-#:set fieldTypeListRD = fieldType.getFieldTypeList (hasView=True, kinds=['JPRD'])
+#:set fieldTypeList = fieldType.getFieldTypeList ()
 
-#:def useAliasRB (ftlRB, ftlTA, ftlOT)
-
-#:for fta, ftb in zip (ftlTA, ftlRB)
-USE ${fta.name}$_CLONE_MODULE, ONLY : &
-      & ${ftb.name}$_CLONE_ON_HOST  => ${fta.name}$_CLONE_ON_HOST,  &
-      & ${fta.name}$_CLON_ON_HOSTE
-      & ${ftb.name}$_CLONE_ON_DEVICE  => ${fta.name}$_CLONE_ON_DEVICE,  &
-      & ${fta.name}$_CLONE_ON_DEVICE
-#:endfor
+${fieldType.useParkind1 ()}$
 
-#:for fto in ftlOT
-USE ${fto.name}$_CLONE_MODULE
+#:for ft in fieldTypeList
+USE ${ft.name}$_CLONE_MODULE
 #:endfor
 
-#:enddef
-
-#ifdef PARKIND1_SINGLE
-$:useAliasRB (fieldTypeListRB, fieldTypeListRM, fieldTypeListRD + fieldTypeListOT)
-#else
-$:useAliasRB (fieldTypeListRB, fieldTypeListRD, fieldTypeListRM + fieldTypeListOT)
-#endif
-${fieldType.useParkind1 ()}$
-
 IMPLICIT NONE
 
 END MODULE