Changeset 5432

Timestamp:

Dec 19, 2024, 8:51:45 PM (4 weeks ago)

Author:

fhourdin

Message:

Minor improvements

Location:

BOL/LMDZ_Setup

Files:

• main.sh (modified) (3 diffs)
• setup.sh (modified) (4 diffs)

BOL/LMDZ_Setup/main.sh

@@ -21 +21 @@
 # Version of the tar file on https://lmdz.lmd.jussieu.fr/pub/src
 # Last "testing" version, thoroughly checked by the LMDZ team : contains LMDZ rev 4729 (2023-10-22)
-version="20241018.trunk" #!! DON'T CHANGE IT WITHOUT CHECKING WITH LMDZ TEAM !!
-svn=""                   #!! DON'T CHANGE IT WITHOUT CHECKING WITH LMDZ TEAM !!
+version="20241121.trunk" # Preferencially use a "testing" version available
+                     # on https://lmdz.lmd.jussieu.fr/pub/src_archives/testing/
+svn="" 
 # CONTACT LMDZ Team :
 #       email: poihl@listes.lmd.ipsl.fr
@@ -71 +72 @@
 mthend=200501
 
-
 # Expert options passed to setup.sh
 rad=rrtm       # Radiation oldrad/rrtm/ecrad
@@ -117 +117 @@
     # Remember: some other options are only available in lmdz_env.sh and setup.sh.
     # shellcheck disable=SC2086
-    ./setup.sh -v "$version" -d "$resol" -mthini "$mthini" -mthend "$mthend" -init "$init" -climato "$climato" -f "$freq" -p "$lmd_phys" -name "$name" $cosp $xios $nudging -r "$svn" -rad $rad -netcdf $netcdf -aerosols $aerosols
+    ./setup.sh -v "$version" -d "$resol" -mthini "$mthini" -mthend "$mthend" -init "$init" -climato "$climato" -f "$freq" -p "$lmd_phys" -name "$name" $cosp $xios $nudging -r "$svn" -rad $rad -netcdf $netcdf -aerosols $aerosols -veget $veget
   else
     echo "File $deffile inexistent"; exit 1

BOL/LMDZ_Setup/setup.sh

@@ -164 +164 @@
   esac
 
+  im=$(echo "$resol" | cut -dx -f1)
+  jm=$(echo "$resol" | cut -dx -f2)
+  lm=$(echo "$resol" | cut -dx -f3)
+
   yearini=$(echo "$mthini" | cut -c-4)
   if [[ $freq = yr ]]; then stopsim=$(echo "$mthend" | cut -c-4); else stopsim=$mthend; fi
@@ -181 +185 @@
   #   omp=2 for veget=CMIP6+XIOS beacause of a bug in ORCHIDEE/src_xml/xios_orchidee.f90
   ######################################################################
-  jm=$(echo "$resol" | cut -dx -f2)
   (( mpi = ( jm + 1 ) / 2 ))
   omp=8
@@ -215 +218 @@
   # (Temporary) Constraints for aerosols=spla :
   # --> resolution 128x88x79 and rad=rrtm
-  if [[ $aerosols = "spla" && $resol != "128x88x79" ]]; then
+  if [[ $aerosols = "spla" && ${im}x${jm} != "128x88" ]]; then
     echo 'STOP: For now, <aerosols=spla> requires <resol=128x88x79>, and uses the zoomed grid from gcm.def_zNAfrica_BiJe, for which forcing & initial files are available'
     echo "Right now resol=<$resol>"
@@ -275 +278 @@
   # Choix de la grille verticale
   ######################################################################
-  lm=$(echo "$resol" | cut -dx -f3)
   if [ ! -f "DEF/L$lm.def" ]; then
     echo "STOP: Résolution verticale non prévue - créer un fichier DEF/L$lm.def"; exit 1