intf_DA: Makefile variable replacement into common_build_interface

Replacing the variable in `model/Makefile` and `framework/Makefile` is identical for all machines and can therefore be moved to the common_build_interface. The new function `c_configure_pdaf` is introduced for this purpose.
HPSCTerrSys · Jan 5, 2023 · 5e7a0f5 · 5e7a0f5
1 parent c5361e6
commit 5e7a0f5
Show file tree

Hide file tree

Showing 5 changed files with 69 additions and 220 deletions.
diff --git a/bldsva/intf_DA/pdaf1_1/arch/AGROCLUSTER/build_interface_pdaf1_1_AGROCLUSTER.ksh b/bldsva/intf_DA/pdaf1_1/arch/AGROCLUSTER/build_interface_pdaf1_1_AGROCLUSTER.ksh
@@ -26,15 +26,7 @@ route "${cyellow}>> configure_da${cnormal}"
 
   c_configure_pdaf_arch
 
-#PDAF interface part
-  file1=$dadir/interface/model/Makefile
-  file2=$dadir/interface/framework/Makefile
-  comment "   cp pdaf interface Makefiles to $dadir"
-    cp $rootdir/bldsva/intf_DA/pdaf1_1/model/Makefile  $file1 >> $log_file 2>> $err_file
-  check
-    cp $rootdir/bldsva/intf_DA/pdaf1_1/framework/Makefile  $file2 >> $log_file 2>> $err_file
-  check
-
+#PDAF interface part configuration variables
   importFlags=" "
   importFlagsOAS=" "
   importFlagsPFL=" "
@@ -189,52 +181,7 @@ route "${cyellow}>> configure_da${cnormal}"
      obj+=' $(OBJCLM) $(OBJCOSMO) $(OBJPF) '
   fi
 
-  comment "   sed bindir to Makefiles"
-    sed -i "s,__bindir__,$bindir," $file1 $file2 >> $log_file 2>> $err_file
-  check
-  comment "   sed comp flags to Makefiles"
-    sed -i "s,__fflags__,-cpp -I$dadir/interface/model -I$ncdfPath/include $importFlags," $file1 $file2 >> $log_file 2>> $err_file
-  check
-    sed -i "s,__ccflags__,-I$dadir/interface/model -I$ncdfPath/include $importFlags," $file1 $file2 >> $log_file 2>> $err_file
-  check
-  comment "   sed preproc flags to Makefiles"
-    sed -i "s,__cpp_defs__,$cppdefs," $file1 $file2 >> $log_file 2>> $err_file
-  check
-    sed -i "s,__fcpp_defs__,$cppdefs," $file1 $file2 >> $log_file 2>> $err_file
-  check
-  comment "   sed libs to Makefiles"
-    sed -i "s,__libs__,$libs," $file2 >> $log_file 2>> $err_file
-  check
-  comment "   sed obj to Makefiles"
-    sed -i "s,__obj__,$obj," $file1 >> $log_file 2>> $err_file
-  check
-  comment "   sed -D prefix to Makefiles"
-    sed -i "s,__pf__,$pf," $file1 $file2 >> $log_file 2>> $err_file
-  check
-  comment "   sed clm directory to Makefiles"
-    sed -i "s,__clmdir__,${mList[1]}," $file1 $file2 >> $log_file 2>> $err_file
-  check
-  comment "   sed cosmo directory to Makefiles"
-    sed -i "s,__cosdir__,${mList[2]}," $file1 $file2 >> $log_file 2>> $err_file
-  check
-  comment "   sed parflow directory to Makefiles"
-    sed -i "s,__pfldir__,${mList[3]}," $file1 $file2 >> $log_file 2>> $err_file
-  check
-
-
-  comment "   cd to $dadir/interface/model"
-    cd $dadir/interface/model >> $log_file 2>> $err_file
-  check
-  comment "   make clean model"
-    make clean >> $log_file 2>> $err_file
-  check
-  comment "   cd to $dadir/src/interface/framework"
-    cd $dadir/interface/framework >> $log_file 2>> $err_file
-  check
-  comment "   make clean framework"
-    make clean >> $log_file 2>> $err_file
-  check
-
+  c_configure_pdaf
 
 route "${cyellow}<< configure_da${cnormal}"
 }

diff --git a/bldsva/intf_DA/pdaf1_1/arch/GENERIC_X86/build_interface_pdaf1_1_GENERIC_X86.ksh b/bldsva/intf_DA/pdaf1_1/arch/GENERIC_X86/build_interface_pdaf1_1_GENERIC_X86.ksh
@@ -26,15 +26,7 @@ route "${cyellow}>> configure_da${cnormal}"
 
   c_configure_pdaf_arch
 
-#PDAF interface part
-  file1=$dadir/interface/model/Makefile
-  file2=$dadir/interface/framework/Makefile
-  comment "   cp pdaf interface Makefiles to $dadir"
-    cp $rootdir/bldsva/intf_DA/pdaf1_1/model/Makefile  $file1 >> $log_file 2>> $err_file
-  check
-    cp $rootdir/bldsva/intf_DA/pdaf1_1/framework/Makefile  $file2 >> $log_file 2>> $err_file
-  check
-
+#PDAF interface part configuration variables
   importFlags=" "
   importFlagsOAS=" "
   importFlagsPFL=" "
@@ -189,52 +181,7 @@ route "${cyellow}>> configure_da${cnormal}"
      obj+=' $(OBJCLM) $(OBJCOSMO) $(OBJPF) '
   fi
 
-  comment "   sed bindir to Makefiles"
-    sed -i "s,__bindir__,$bindir," $file1 $file2 >> $log_file 2>> $err_file
-  check
-  comment "   sed comp flags to Makefiles"
-    sed -i "s,__fflags__,-cpp -I$dadir/interface/model -I$ncdfPath/include $importFlags," $file1 $file2 >> $log_file 2>> $err_file
-  check
-    sed -i "s,__ccflags__,-I$dadir/interface/model -I$ncdfPath/include $importFlags," $file1 $file2 >> $log_file 2>> $err_file
-  check
-  comment "   sed preproc flags to Makefiles"
-    sed -i "s,__cpp_defs__,$cppdefs," $file1 $file2 >> $log_file 2>> $err_file
-  check
-    sed -i "s,__fcpp_defs__,$cppdefs," $file1 $file2 >> $log_file 2>> $err_file
-  check
-  comment "   sed libs to Makefiles"
-    sed -i "s,__libs__,$libs," $file2 >> $log_file 2>> $err_file
-  check
-  comment "   sed obj to Makefiles"
-    sed -i "s,__obj__,$obj," $file1 >> $log_file 2>> $err_file
-  check
-  comment "   sed -D prefix to Makefiles"
-    sed -i "s,__pf__,$pf," $file1 $file2 >> $log_file 2>> $err_file
-  check
-  comment "   sed clm directory to Makefiles"
-    sed -i "s,__clmdir__,${mList[1]}," $file1 $file2 >> $log_file 2>> $err_file
-  check
-  comment "   sed cosmo directory to Makefiles"
-    sed -i "s,__cosdir__,${mList[2]}," $file1 $file2 >> $log_file 2>> $err_file
-  check
-  comment "   sed parflow directory to Makefiles"
-    sed -i "s,__pfldir__,${mList[3]}," $file1 $file2 >> $log_file 2>> $err_file
-  check
-
-
-  comment "   cd to $dadir/interface/model"
-    cd $dadir/interface/model >> $log_file 2>> $err_file
-  check
-  comment "   make clean model"
-    make clean >> $log_file 2>> $err_file
-  check
-  comment "   cd to $dadir/src/interface/framework"
-    cd $dadir/interface/framework >> $log_file 2>> $err_file
-  check
-  comment "   make clean framework"
-    make clean >> $log_file 2>> $err_file
-  check
-
+  c_configure_pdaf
 
 route "${cyellow}<< configure_da${cnormal}"
 }

diff --git a/bldsva/intf_DA/pdaf1_1/arch/JURECA/build_interface_pdaf1_1_JURECA.ksh b/bldsva/intf_DA/pdaf1_1/arch/JURECA/build_interface_pdaf1_1_JURECA.ksh
@@ -39,15 +39,7 @@ route "${cyellow}>> configure_da${cnormal}"
 
   c_configure_pdaf_arch
 
-#PDAF interface part
-  file1=$dadir/interface/model/Makefile
-  file2=$dadir/interface/framework/Makefile
-  comment "   cp pdaf interface Makefiles to $dadir"
-    cp $rootdir/bldsva/intf_DA/pdaf1_1/model/Makefile  $file1 >> $log_file 2>> $err_file
-  check
-    cp $rootdir/bldsva/intf_DA/pdaf1_1/framework/Makefile  $file2 >> $log_file 2>> $err_file
-  check
-
+#PDAF interface part configuration variables
   importFlags=" "
   importFlagsOAS=" "
   importFlagsPFL=" "
@@ -202,52 +194,7 @@ route "${cyellow}>> configure_da${cnormal}"
      obj+=' $(OBJCLM) $(OBJCOSMO) $(OBJPF) '
   fi
 
-  comment "   sed bindir to Makefiles"
-    sed -i "s,__bindir__,$bindir," $file1 $file2 >> $log_file 2>> $err_file
-  check
-  comment "   sed comp flags to Makefiles"
-    sed -i "s,__fflags__,-cpp -I$dadir/interface/model -I$ncdfPath/include $importFlags," $file1 $file2 >> $log_file 2>> $err_file
-  check
-    sed -i "s,__ccflags__,-I$dadir/interface/model -I$ncdfPath/include $importFlags," $file1 $file2 >> $log_file 2>> $err_file
-  check
-  comment "   sed preproc flags to Makefiles"
-    sed -i "s,__cpp_defs__,$cppdefs," $file1 $file2 >> $log_file 2>> $err_file
-  check
-    sed -i "s,__fcpp_defs__,$cppdefs," $file1 $file2 >> $log_file 2>> $err_file
-  check
-  comment "   sed libs to Makefiles"
-    sed -i "s,__libs__,$libs," $file2 >> $log_file 2>> $err_file
-  check
-  comment "   sed obj to Makefiles"
-    sed -i "s,__obj__,$obj," $file1 >> $log_file 2>> $err_file
-  check
-  comment "   sed -D prefix to Makefiles"
-    sed -i "s,__pf__,$pf," $file1 $file2 >> $log_file 2>> $err_file
-  check
-  comment "   sed clm directory to Makefiles"
-    sed -i "s,__clmdir__,${mList[1]}," $file1 $file2 >> $log_file 2>> $err_file
-  check
-  comment "   sed cosmo directory to Makefiles"
-    sed -i "s,__cosdir__,${mList[2]}," $file1 $file2 >> $log_file 2>> $err_file
-  check
-  comment "   sed parflow directory to Makefiles"
-    sed -i "s,__pfldir__,${mList[3]}," $file1 $file2 >> $log_file 2>> $err_file
-  check
-
-
-  comment "   cd to $dadir/interface/model"
-    cd $dadir/interface/model >> $log_file 2>> $err_file
-  check
-  comment "   make clean model"
-    make clean >> $log_file 2>> $err_file
-  check
-  comment "   cd to $dadir/src/interface/framework"
-    cd $dadir/interface/framework >> $log_file 2>> $err_file
-  check
-  comment "   make clean framework"
-    make clean >> $log_file 2>> $err_file
-  check
-
+  c_configure_pdaf
 
 route "${cyellow}<< configure_da${cnormal}"
 }

diff --git a/bldsva/intf_DA/pdaf1_1/arch/JUWELS/build_interface_pdaf1_1_JUWELS.ksh b/bldsva/intf_DA/pdaf1_1/arch/JUWELS/build_interface_pdaf1_1_JUWELS.ksh
@@ -44,15 +44,7 @@ route "${cyellow}>> configure_da${cnormal}"
 
   c_configure_pdaf_arch
 
-#PDAF interface part
-  file1=$dadir/interface/model/Makefile
-  file2=$dadir/interface/framework/Makefile
-  comment "   cp pdaf interface Makefiles to $dadir"
-    cp $rootdir/bldsva/intf_DA/pdaf1_1/model/Makefile  $file1 >> $log_file 2>> $err_file
-  check
-    cp $rootdir/bldsva/intf_DA/pdaf1_1/framework/Makefile  $file2 >> $log_file 2>> $err_file
-  check
-
+#PDAF interface part configuration variables
   importFlags=" "
   importFlagsOAS=" "
   importFlagsPFL=" "
@@ -207,52 +199,7 @@ route "${cyellow}>> configure_da${cnormal}"
      obj+=' $(OBJCLM) $(OBJCOSMO) $(OBJPF) '
   fi
 
-  comment "   sed bindir to Makefiles"
-    sed -i "s,__bindir__,$bindir," $file1 $file2 >> $log_file 2>> $err_file
-  check
-  comment "   sed comp flags to Makefiles"
-    sed -i "s,__fflags__,-cpp -I$dadir/interface/model -I$ncdfPath/include $importFlags," $file1 $file2 >> $log_file 2>> $err_file
-  check
-    sed -i "s,__ccflags__,-I$dadir/interface/model -I$ncdfPath/include $importFlags," $file1 $file2 >> $log_file 2>> $err_file
-  check
-  comment "   sed preproc flags to Makefiles"
-    sed -i "s,__cpp_defs__,$cppdefs," $file1 $file2 >> $log_file 2>> $err_file
-  check
-    sed -i "s,__fcpp_defs__,$cppdefs," $file1 $file2 >> $log_file 2>> $err_file
-  check
-  comment "   sed libs to Makefiles"
-    sed -i "s,__libs__,$libs," $file2 >> $log_file 2>> $err_file
-  check
-  comment "   sed obj to Makefiles"
-    sed -i "s,__obj__,$obj," $file1 >> $log_file 2>> $err_file
-  check
-  comment "   sed -D prefix to Makefiles"
-    sed -i "s,__pf__,$pf," $file1 $file2 >> $log_file 2>> $err_file
-  check
-  comment "   sed clm directory to Makefiles"
-    sed -i "s,__clmdir__,${mList[1]}," $file1 $file2 >> $log_file 2>> $err_file
-  check
-  comment "   sed cosmo directory to Makefiles"
-    sed -i "s,__cosdir__,${mList[2]}," $file1 $file2 >> $log_file 2>> $err_file
-  check
-  comment "   sed parflow directory to Makefiles"
-    sed -i "s,__pfldir__,${mList[3]}," $file1 $file2 >> $log_file 2>> $err_file
-  check
-
-
-  comment "   cd to $dadir/interface/model"
-    cd $dadir/interface/model >> $log_file 2>> $err_file
-  check
-  comment "   make clean model"
-    make clean >> $log_file 2>> $err_file
-  check
-  comment "   cd to $dadir/src/interface/framework"
-    cd $dadir/interface/framework >> $log_file 2>> $err_file
-  check
-  comment "   make clean framework"
-    make clean >> $log_file 2>> $err_file
-  check
-
+  c_configure_pdaf
 
 route "${cyellow}<< configure_da${cnormal}"
 }

diff --git a/bldsva/intf_oas3/common_build_interface.ksh b/bldsva/intf_oas3/common_build_interface.ksh
@@ -1244,6 +1244,67 @@ route "${cyellow}>>> c_configure_pdaf_arch${cnormal}"
 route "${cyellow}<<< c_configure_pdaf_arch${cnormal}"
 }
 
+c_configure_pdaf(){
+route "${cyellow}>>> c_configure_pdaf${cnormal}"
+
+#PDAF interface part
+  file1=$dadir/interface/model/Makefile
+  file2=$dadir/interface/framework/Makefile
+  comment "   cp pdaf interface Makefiles to $dadir"
+    cp $rootdir/bldsva/intf_DA/pdaf1_1/model/Makefile  $file1 >> $log_file 2>> $err_file
+  check
+    cp $rootdir/bldsva/intf_DA/pdaf1_1/framework/Makefile  $file2 >> $log_file 2>> $err_file
+  check
+
+  comment "   sed bindir to Makefiles"
+    sed -i "s,__bindir__,$bindir," $file1 $file2 >> $log_file 2>> $err_file
+  check
+  comment "   sed comp flags to Makefiles"
+    sed -i "s,__fflags__,-cpp -I$dadir/interface/model -I$ncdfPath/include $importFlags," $file1 $file2 >> $log_file 2>> $err_file
+  check
+    sed -i "s,__ccflags__,-I$dadir/interface/model -I$ncdfPath/include $importFlags," $file1 $file2 >> $log_file 2>> $err_file
+  check
+  comment "   sed preproc flags to Makefiles"
+    sed -i "s,__cpp_defs__,$cppdefs," $file1 $file2 >> $log_file 2>> $err_file
+  check
+    sed -i "s,__fcpp_defs__,$cppdefs," $file1 $file2 >> $log_file 2>> $err_file
+  check
+  comment "   sed libs to Makefiles"
+    sed -i "s,__libs__,$libs," $file2 >> $log_file 2>> $err_file
+  check
+  comment "   sed obj to Makefiles"
+    sed -i "s,__obj__,$obj," $file1 >> $log_file 2>> $err_file
+  check
+  comment "   sed -D prefix to Makefiles"
+    sed -i "s,__pf__,$pf," $file1 $file2 >> $log_file 2>> $err_file
+  check
+  comment "   sed clm directory to Makefiles"
+    sed -i "s,__clmdir__,${mList[1]}," $file1 $file2 >> $log_file 2>> $err_file
+  check
+  comment "   sed cosmo directory to Makefiles"
+    sed -i "s,__cosdir__,${mList[2]}," $file1 $file2 >> $log_file 2>> $err_file
+  check
+  comment "   sed parflow directory to Makefiles"
+    sed -i "s,__pfldir__,${mList[3]}," $file1 $file2 >> $log_file 2>> $err_file
+  check
+
+  comment "   cd to $dadir/interface/model"
+    cd $dadir/interface/model >> $log_file 2>> $err_file
+  check
+  comment "   make clean model"
+    make clean >> $log_file 2>> $err_file
+  check
+  comment "   cd to $dadir/src/interface/framework"
+    cd $dadir/interface/framework >> $log_file 2>> $err_file
+  check
+  comment "   make clean framework"
+    make clean >> $log_file 2>> $err_file
+  check
+
+
+route "${cyellow}<<< c_configure_pdaf${cnormal}"
+}
+
 c_make_pdaf(){
 route "${cyellow}>>> c_make_pdaf${cnormal}"