Changeset 3580

Timestamp:

Jan 15, 2025, 1:55:46 PM (6 hours ago)

Author:

jbclement

Message:

Mars PCM:
Improvement of Bash scripts for the 1D in the deftank with an automatic error detection which ends the script with a message.
JBC

Location:

trunk/LMDZ.MARS

Files:

• changelog.txt (modified) (1 diff)
• deftank/launch_1Dchained.sh (modified) (4 diffs)
• deftank/launch_orb_1Dchained.sh (modified) (4 diffs)

trunk/LMDZ.MARS/changelog.txt

@@ -4749 +4749 @@
 Fixing bug in soilwater: the specific surface area was missing in the
 expression of the adsorption rate when choice_ads = 2.
+
+== 15/01/2025 == JBC
+Improvement of Bash scripts for the 1D in the deftank with an automatic error detection which ends the script with a message.

trunk/LMDZ.MARS/deftank/launch_1Dchained.sh

@@ -3 +3 @@
 ### Launching script for a chained simulation of 1D PCM runs ###
 ################################################################
+set -e
+trap 'echo -e "\033[31mError: an issue occurred in the script on line $LINENO! Please review the command and try again.\033[0m"' ERR
+
 
 echo "The launching script is starting!"
@@ -13 +16 @@
 fi
 
-# A few parameters that might need be changed depending on your setup:
-# Path to the arch.env to source:
-source ../trunk/LMDZ.COMMON/arch.env
-
 # Save the current value of LC_NUMERIC and set it to a locale that uses a dot as the decimal separator
 OLD_LC_NUMERIC=$LC_NUMERIC
 LC_NUMERIC=en_US.UTF-8
 
+################################################################
+# Modify here the parameters for the simulation
+###############################################
+# Path to the arch.env to source:
+source ../trunk/LMDZ.COMMON/arch.env
 
-################################################################
-#---------- Modify here the number of years to be simulated ------------
-## set the number of Martian years:
+# Set the number of Martian years to be simulated:
 n_myears=1000
 
-#------------------ Modify here the name of PCM exe --------------------
-## fill in the name of executable for PCM:
+# Name of executable for the PCM:
 exePCM="testphys1d_29_phymars_seq.e"
 ################################################################
 
 
-#------ Check if files/directories necessary for the script exist ------
+# Check if files/directories necessary for the script exist
 dir=`pwd`
 machine=`hostname`
@@ -51 +52 @@
 fi
 
-#---------------------------- Initialization ---------------------------
+# Initialization
 dir=`pwd`
 machine=`hostname`
@@ -68 +69 @@
 fi
 
-#---------------- Main loop to to run PCM year by year -----------------
+# Main loop to to run PCM year by year
 while [ $i_myear -lt $n_myears ]; do
     # Run the PCM

trunk/LMDZ.MARS/deftank/launch_orb_1Dchained.sh

@@ -4 +4 @@
 ###                following orbital changes                 ###
 ################################################################
+set -e
+trap 'echo -e "\033[31mError: an issue occurred in the script on line $LINENO! Please review the command and try again.\033[0m"' ERR
 
 echo "The launching script is starting!"
@@ -14 +16 @@
 fi
 
-# A few parameters that might need be changed depending on your setup:
-# Path to the arch.env to source:
-source ../trunk/LMDZ.COMMON/arch.env
-
 # Save the current value of LC_NUMERIC and set it to a locale that uses a dot as the decimal separator
 OLD_LC_NUMERIC=$LC_NUMERIC
 LC_NUMERIC=en_US.UTF-8
 
+################################################################
+# Modify here the parameters for the simulation
+###############################################
+# Path to the arch.env to source:
+source ../trunk/LMDZ.COMMON/arch.env
 
-################################################################
-#--------- Modify here the number of years for initialization ----------
-## set the number of Earth years before present to start:
+# Set the number of Earth years before present to start:
 eyears_bp_ini=-1000
 
-#---------- Modify here the number of years to be simulated ------------
-## set the number of Martian years:
+# Set the number of Martian years to be simulated:
 n_myears=500
 
-#------------------ Modify here the name of PCM exe --------------------
-## fill in the name of executable for PCM:
+# Name of executable for the PCM:
 exePCM="testphys1d_29_phymars_para.e"
 
-#----------- Modify here the name of the orbital data file -------------
-## fill in the name of executable for PCM:
+# Name of the orbital data file:
 orb_data="obl_ecc_lsp.asc"
 ################################################################
 
 
-#------ Check if files/directories necessary for the script exist ------
+# Check if files/directories necessary for the script exist
 dir=`pwd`
 machine=`hostname`
@@ -68 +66 @@
 fi
 
-#---------------------------- Initialization ---------------------------
+# Initialization
 dir=`pwd`
 machine=`hostname`
@@ -85 +83 @@
 fi
 
-#---------------- Main loop to to run PCM year by year -----------------
+# Main loop to to run PCM year by year
 while [ $i_myear -lt $n_myears ]; do
     # Get the new values for the orbital parameters