Changeset 4171 for LMDZ6/branches/LMDZ-ECRAD/makelmdz_fcm

Timestamp:

Jun 17, 2022, 4:24:49 PM (3 years ago)

Author:

lguez

Message:

Sync latest trunk changes to branch LMDZ-ECRAD.

Location:

LMDZ6/branches/LMDZ-ECRAD

Files:

• . (modified) (1 prop)
• makelmdz_fcm (modified) (20 diffs)

LMDZ6/branches/LMDZ-ECRAD/makelmdz_fcm

@@ -23 +23 @@
 couple=false
 veget=false
-sisvat=false
 inlandsis=false
 rrtm=false
-ecrad=false
+rad="old"
 dust=false
 strataer=false
 chimie=false
 parallel=none
-paramem="par"
+paramem="mem"
 compil_mod=prod
 io=ioipsl
@@ -41 +40 @@
 full=''
 libphy=false
+isotopes=false
+isoverif=false
+diagiso=false
+isotrac=false
+force_compile=false
 
 arch_defined="FALSE"
@@ -55 +59 @@
 DYN_PHYS_SUB_PATH=$LMDGCM/.void_dir
 PHY_COMMON_PATH=$LMDGCM/.void_dir
-RRTM_PATH=$LMDGCM/.void_dir
+RAD_PATH=$LMDGCM/.void_dir
+INLANDSIS_PATH=$LMDGCM/.void_dir
 ECRAD_PATH=$LMDGCM/.void_dir
 DUST_PATH=$LMDGCM/.void_dir
 STRATAER_PATH=$LMDGCM/.void_dir
-SISVAT_PATH=$LMDGCM/.void_dir
 COSP_PATH=$LMDGCM/.void_dir
 fcm_path=$LMDGCM/tools/fcm/bin
@@ -67 +71 @@
 ########################################################################
 
-CPP_KEY="" 
+CPP_KEY="IN_LMDZ" 
 INCLUDE=""
 LIB=""
@@ -101 +105 @@
 [-cosp2 true/false]    : compile with/without cosp2 package (default: false)
 [-cospv2 true/false]    : compile with/without cospv2 package (default: false)
-[-sisvat true/false]  : compile with/without sisvat package (default: false)
 [-inlandsis true/false]  : compile with/without inlandsis package (default: false)
 [-rrtm true/false]    : compile with/without rrtm package (default: false)
-[-ecrad true/false]    : compile with/without ecrad package (default: false)
+[-rad old/rrtm/ecrad]    : compile with old/rrtm/ecrad radiatif code (default: old)
 [-dust true/false]    : compile with/without the dust package by Boucher and co (default: false)
 [-strataer true/false]    : compile with/without the strat aer package by Boucher and co (default: false)
+[-isotopes true/false]    : compile with/without water isotopes in the physics
+[-isoverif true/false]    : compile with/without verifications for water isotopes in the physics
+[-diagiso true/false]    : compile with/without special diagnostics for water isotopes in the physics
+[-isotrac true/false]    : compile with/without tracers of water isotopes in the physics
 [-parallel none/mpi/omp/mpi_omp] : parallelism (default: none) : mpi, openmp or mixted mpi_openmp
 [-g GRI]                   : grid configuration in dyn3d/GRI_xy.h  (default: reg, inclues a zoom)
@@ -113 +120 @@
 [-cpp CPP_KEY]             : additional preprocessing definitions
 [-adjnt]                   : adjoint model, not operational ...
-[-mem]                     : reduced memory dynamics (if in parallel mode)
+[-mem]                     : reduced memory dynamics (obsolete flag; always on in parallel mode)
 [-filtre NOMFILTRE]        : use filtre from libf/NOMFILTRE (default: filtrez)
 [-link LINKS]              : additional links with other libraries
@@ -122 +129 @@
 [-ext_src path]            : path to an additional set of routines to compile with the model
 [-arch_path path]          : path to architecture files (default: $arch_default_path)
+[-force_compile]           : recompile although there seems to be an on-going compilation
  -arch nom_arch            : target architecture 
  exec                      : executable to build
@@ -154 +162 @@
           veget="$2" ; shift ; shift ;;
 
-      "-sisvat")
-          sisvat="$2" ; shift ; shift ;;
-
       "-inlandsis")
-    inlandsis="$2" ; shift ; shift ;;
+          inlandsis="$2" ; shift ; shift ;;
 
       "-rrtm")
-          rrtm="$2" ; shift ; shift ;;
-
-      "-ecrad")
-          ecrad="$2" ; shift ; shift ;;
+          rrtm="$2" ; if [ "$2" = "false" ] ; then rad="old" ; else rad="rrtm" ; fi ; shift ; shift ;;
+
+      "-rad")
+          rad="$2" ; shift ; shift ;;
 
       "-dust")
@@ -174 +179 @@
       "-chimie")
           chimie="$2" ; shift ; shift ;;
+
+      "-isotopes")
+          isotopes="$2" ; shift ; shift ;;
+
+      "-isoverif")
+          isoverif="$2" ; shift ; shift ;;
+
+      "-diagiso")
+          diagiso="$2" ; shift ; shift ;;
+
+      "-isotrac")
+          isotrac="$2" ; shift ; shift ;;
 
       "-parallel")
@@ -199 +216 @@
       
       "-mem")
+          echo "option -mem is obsolete (now always on in parallel)"
           paramem="mem" ; shift ;;
 
@@ -227 +245 @@
       "-arch_path")
           arch_path=$2 ; arch_path_defined="TRUE"; shift ; shift ;;
+
+      "-force_compile")
+          force_compile=true ; shift ;;
 
       *)
@@ -318 +339 @@
 if [[ "${physique:0:5}" == "venus" ]] ; then phys_root=venus ; fi
 if [[ "${physique:0:5}" == "titan" ]] ; then phys_root=titan ; fi
-if [[ "${physique:0:3}" == "mar" ]] ; then phys_root=mar ; fi
 if [[ "${physique:0:3}" == "dev" ]] ; then phys_root=dev ; fi
 
@@ -347 +367 @@
    INCLUDE="$INCLUDE -I${INCA_INCDIR}"
    LIB="$LIB -L${INCA_LIBDIR} -lchimie"
+fi
+
+if [[ "$isotopes" == "true" ]]
+then
+   CPP_KEY="$CPP_KEY ISO"
+fi
+
+if [[ "$isoverif" == "true" ]]
+then
+   CPP_KEY="$CPP_KEY ISOVERIF"
+fi
+
+if [[ "$diagiso" == "true" ]]
+then
+   CPP_KEY="$CPP_KEY DIAGISO"
+fi
+
+if [[ "$isotrac" == "true" ]]
+then
+   CPP_KEY="$CPP_KEY ISOTRAC"
 fi
 
@@ -420 +460 @@
 fi
 
-if [[ "$sisvat" == "true" ]]
-then
-   CPP_KEY="$CPP_KEY CPP_SISVAT"
-   SISVAT_PATH="$LIBFGCM/%PHYS/sisvat"
-fi
-
 if [[ "$inlandsis" == "true" ]]
 then
@@ -433 +467 @@
 
 
-if [[ "$rrtm" == "true" ]]
+if [[ "$rad" == "rrtm" ]]
 then
    CPP_KEY="$CPP_KEY CPP_RRTM"
-   RRTM_PATH="$LIBFGCM/%PHYS/rrtm"
+   RAD_PATH="$LIBFGCM/%PHYS/rrtm"
+fi
+if [[ "$rad" == "ecrad" ]]
+then
+   CPP_KEY="$CPP_KEY CPP_ECRAD"
+   RAD_PATH="$LIBFGCM/%PHYS/ecrad"
 fi
 
@@ -525 +564 @@
 if [[ -f dimensions.h ]]
 then
-  echo 'ATTENTION: vous etes sans doute en train de compiler le modele par ailleurs'
-  echo "Attendez que la premiere compilation soit terminee pour relancer la suivante."
-  echo "Si vous etes sur que vous ne compilez pas le modele par ailleurs,"
-  echo  vous pouvez continuer en repondant oui.
-  echo "Voulez-vous vraiment continuer?"
-  echo ""
-  echo "WARNING: you are probably already compiling the model somewhere else."
-  echo "Wait until the first compilation is finished before launching this one."
-  echo "If you are sure that you are not compiling elsewhere, just answer "
-  echo "yes (or 'oui') to the question below to proceed."
-  echo "Do you wish to continue?"
-  read reponse
-  if [[ $reponse == "oui" || $reponse == "yes" ]]
-  then
-    \rm -f $LIBFGCM/grid/dimensions.h
-  else
-    exit
-  fi
+    if [[ $force_compile == true ]]
+    then
+        \rm -f $LIBFGCM/grid/dimensions.h
+    else
+        echo "WARNING: you are probably already compiling the model somewhere else."
+        echo "Wait until the first compilation is finished before launching this one."
+        echo "If you are sure that you are not compiling elsewhere, "
+        echo "run makelmdz_fcm with option -force_compile"
+        exit 1
+    fi
 fi
 
@@ -671 +702 @@
 fi
 
+if [[ "$isotopes" == "true" ]]
+then
+  SUFF_NAME=${SUFF_NAME}_iso
+fi
+if [[ "$isoverif" == "true" ]]
+then
+  SUFF_NAME=${SUFF_NAME}_isoverif
+fi
+if [[ "$isotrac" == "true" ]]
+then
+  SUFF_NAME=${SUFF_NAME}_isotrac
+fi
+if [[ "$diagiso" == "true" ]]
+then
+  SUFF_NAME=${SUFF_NAME}_diagiso
+fi
+
 if [[ $libphy == "true" ]]
 then
@@ -707 +755 @@
 echo "%DYN_PHYS      $DYN_PHYS_PATH" >> $config_fcm
 echo "%DYN_PHYS_SUB  $DYN_PHYS_SUB_PATH" >> $config_fcm
-echo "%RRTM          $RRTM_PATH"     >> $config_fcm
+echo "%RAD           $RAD_PATH"     >> $config_fcm
 echo "%ECRAD         $ECRAD_PATH"    >> $config_fcm
 echo "%DUST          $DUST_PATH"     >> $config_fcm
 echo "%STRATAER      $STRATAER_PATH" >> $config_fcm
-echo "%SISVAT        $SISVAT_PATH"   >> $config_fcm
 echo "%INLANDSIS     $INLANDSIS_PATH" >> $config_fcm
 echo "%COSP          $COSP_PATH"     >> $config_fcm
@@ -732 +779 @@
 fi
 
+set +e
+
 rm -f $LIBOGCM/${arch}${SUFF_NAME}/.config/fcm.bld.lock
 ./build_gcm ${fcm_path} -j $job $full
+build_status=$?
 
 err=$?
@@ -752 +802 @@
   \rm -f $LIBFGCM/grid/dimensions.h
 fi
+
+exit $build_status