Changeset 5738 for LMDZ6/branches/compilation_2

Timestamp:

Jul 1, 2025, 2:16:35 PM (5 weeks ago)

Author:

lguez

Message:

Allow CONFIG_NAME to be defined on command line

Location:

LMDZ6/branches/compilation_2

Files:

• bld.cfg.ecrad (modified) (1 diff)
• bld.cfg.rrtm (modified) (1 diff)
• makelmdz_fcm (modified) (5 diffs)

LMDZ6/branches/compilation_2/bld.cfg.ecrad

@@ -11 +11 @@
 inc config.fcm
 
-%CONFIG_NAME       %{ARCH}%SUFF_NAME
 %BASE_CONFIG_PATH  %LIBO/%CONFIG_NAME
 %CONFIG_PATH       %BASE_CONFIG_PATH/.config

LMDZ6/branches/compilation_2/bld.cfg.rrtm

@@ -11 +11 @@
 inc config.fcm
 
-%CONFIG_NAME       %{ARCH}%SUFF_NAME
 %BASE_CONFIG_PATH  %LIBO/%CONFIG_NAME
 %CONFIG_PATH       %BASE_CONFIG_PATH/.config

LMDZ6/branches/compilation_2/makelmdz_fcm

@@ -132 +132 @@
 [-force_compile]           : recompile although there seems to be an on-going compilation
 [-build_dir]               : build directory (default: libo in current directory)
+[-config]                  : config name (default: automatic creation of name based on other options of makelmdz_fcm)
  -arch nom_arch            : target architecture 
  exec                      : executable to build
@@ -142 +143 @@
       "-build_dir")
           LIBOGCM=$2 ; shift ; shift ;;
+
+      "-config")
+          config_name=$2 ; shift ; shift ;;
 
       "-p")
@@ -737 +741 @@
 rm -f arch.fcm
 rm -f arch.opt
+config_name=${config_name:-$arch$SUFF_NAME}
 
 echo "%ARCH          $arch"          >> $config_fcm
+echo "%CONFIG_NAME   $config_name"   >> $config_fcm
 echo "%INCDIR        $INCLUDE"       >> $config_fcm 
 echo "%LIB           $LIB"           >> $config_fcm
@@ -782 +788 @@
 set +e
 
-rm -f $LIBOGCM/${arch}${SUFF_NAME}/.config/fcm.bld.lock
+rm -f $LIBOGCM/${config_name}/.config/fcm.bld.lock
 ./build_gcm ${fcm_path} -j $job $full
 build_status=$?
@@ -788 +794 @@
 rm -rf tmp_src
 rm -rf config
-ln -s $LIBOGCM/${arch}${SUFF_NAME}/.config config
-ln -s $LIBOGCM/${arch}${SUFF_NAME}/.config/ppsrc tmp_src
+ln -s $LIBOGCM/${config_name}/.config config
+ln -s $LIBOGCM/${config_name}/.config/ppsrc tmp_src
 
 if [[ -r $LIBFGCM/grid/dimensions_mod.f90 ]]