Changeset 5539

Timestamp:

Feb 13, 2025, 6:58:30 PM (41 hours ago)

Author:

fhourdin

Message:

Calling save_pub from main.sh

Location:

BOL/LMDZ_Setup

Files:

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

BOL/LMDZ_Setup/main.sh

@@ -2 +2 @@
 
 set -eu
+. lmdz_env.sh
 
 #####################################################################
@@ -75 +76 @@
 
 # Expert options passed to setup.sh
-rad=rrtm       # Radiation oldrad/rrtm/ecrad
-netcdf=0       # netcddf 0 (from system) / 1 reinstall / directory containing nectdf*
-aerosols=clim  # n (no) / clim 
-veget=CMIP6    # Orchidee version : CMIP6 / 7983 (orch2.2 ) / more recent svn
+rad=rrtm        # Radiation oldrad/rrtm/ecrad
+netcdf=0        # netcddf 0(from system)/1 reinstall/dir. containing nectdf*
+aerosols=clim   # n (no) / clim 
+veget=CMIP6     # Orchidee version : CMIP6 / 7983 (orch2.2 ) / more recent svn
+save_pub=$LMDZD # Will save files downloaded by wget on $LMDZD (could be 0 or 1)
 
 # For rapid tests
@@ -121 +123 @@
     # 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 -veget $veget
+    ./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 -save_pub $save_pub
   else
     echo "File $deffile inexistent"; exit 1

BOL/LMDZ_Setup/setup.sh

@@ -56 +56 @@
   #     For aerosols=n, aerosol flags will automatically be set to "n".
   #   With XIOS : adjust DEF/XMLfiles*/file*xml
+
+  save_pub=0
+
 }
 
@@ -140 +143 @@
              -nudging                to run with nudging. Nudging files must be created independently
              -p                      the physics to use (default <$phylmd>)
+             -save_pub               To files downlaoded with wget (default <$SIM>)
              -name                   install folder name (default <$SIM>)
              Other options available (see "options" section in the script)
 ........fin
         exit;;
-      "-v") version="$2"; shift; shift;;
-      "-r") svn=$2; shift; shift;;
-      "-d") resol=$2; shift; shift;;
-      "-f") freq=$2; shift; shift;;
-      "-p") phylmd=$2; shift; shift;;
-      "-name") SIM=$2; shift; shift;;
-      "-rad") rad=$2; shift; shift;;
-      "-netcdf") netcdf=$2; shift; shift;;
-      "-aerosols") aerosols=$2; shift; shift;;
-      "-veget") veget=$2; shift; shift;;
+      "-v") version="$2"; shift 2;;
+      "-r") svn=$2; shift 2;;
+      "-d") resol=$2; shift 2;;
+      "-f") freq=$2; shift 2;;
+      "-p") phylmd=$2; shift 2;;
+      "-name") SIM=$2; shift 2;;
+      "-save_pub") save_pub=$2 ; shift 2 ;;
+      "-rad") rad=$2; shift 2;;
+      "-netcdf") netcdf=$2; shift 2;;
+      "-aerosols") aerosols=$2; shift 2;;
+      "-veget") veget=$2; shift 2;;
       "-cosp") cosp=y; shift;;
       "-xios") xios=y; shift;;
-      "-init") init=$2; shift; shift;;
+      "-init") init=$2; shift 2;;
       "-nudging") ok_guide=y; shift;;
-      "-climato") climato=$2; shift; shift;;
-      "-mthini") mthini=$2; shift; shift;;
-      "-mthend") mthend=$2; shift; shift;;
+      "-climato") climato=$2; shift 2;;
+      "-mthini") mthini=$2; shift 2;;
+      "-mthend") mthend=$2; shift 2;;
       *) echo "unexpected $1"; $0 -h; exit
     esac
@@ -181 +186 @@
   jm=$(echo "$resol" | cut -dx -f2)
   lm=$(echo "$resol" | cut -dx -f3)
+
+  case $save_pub in
+     0) save_pub_opt=0 ;;
+     1) save_pub_opt="-save_pub" ;;
+     *) save_pub_opt="-save_pub -save_pub_dir $save_pub"
+          mkdir -p $save_pub
+          if [ $? != 0 ] ; then echo Cannot create directory $save_pub
+                           exit 1 ; fi
+  esac
 
   yearini=$(echo "$mthini" | cut -c-4)
@@ -277 +291 @@
      jobcmd="bash"
   fi
-  echo "./install_lmdz.sh -noclean $optim -v $version $svnopt -d $resol -rad $rad -bench compile_only $parallel $ins_cosp $ins_xios $ins_aero $ins_inlandsis -name $LMDZname -veget $veget -netcdf $netcdf -arch $ARCH -make_j $make_j -jobcmd $jobcmd" >> install_lmdz_options.$$.sh
+  echo "./install_lmdz.sh -noclean $optim -v $version $svnopt -d $resol -rad $rad -bench compile_only $parallel $ins_cosp $ins_xios $ins_aero $ins_inlandsis -name $LMDZname -veget $veget -netcdf $netcdf -arch $ARCH -make_j $make_j -jobcmd $jobcmd" $save_pub_opt >> install_lmdz_options.$$.sh
   chmod +x install_lmdz_options.$$.sh
   echo "Running install_lmdz_options.$$.sh"