Changeset 3517 for trunk

Timestamp:

Nov 14, 2024, 1:57:43 PM (7 days ago)

Author:

jbclement

Message:

PEM:
Committing the right correction in previous commit (r33516) would have been better...
JBC

Location:

trunk/LMDZ.COMMON/libf/evolution

Files:

• changelog.txt (modified) (1 diff)
• conf_pem.F90 (modified) (1 diff)
• deftank/lib_launchPEM.sh (modified) (5 diffs)

trunk/LMDZ.COMMON/libf/evolution/changelog.txt

@@ -486 +486 @@
 == 14/11/2024 == JBC
 Small corrections related to r3498 (time step from integer to real) for the launching script + making a proper initilization of 'year_bp_ini' in case of there is no orbital evolution.
+
+== 14/11/2024 == JBC
+Committing the right correction in previous commit (r33516) would have been better...

trunk/LMDZ.COMMON/libf/evolution/conf_pem.F90

@@ -135 +135 @@
     write(*,*) 'Ice table is asked to be computed both by the equilibrium and dynamic method.'
     write(*,*) 'The dynamic method is then chosen.'
-    icetable_dynamic = .false.
+    icetable_equilibrium = .false.
 endif
 

trunk/LMDZ.COMMON/libf/evolution/deftank/lib_launchPEM.sh

@@ -52 +52 @@
 
     if [ -v n_mars_years ] && [ ! -z "$n_mars_years" ]; then
-        if [ $(echo "$n_mars_years < 0." | bc -l) ]; then
+        if [ $(echo "$n_mars_years < 0." | bc -l) -eq 1 ]; then
             echo "Error: the value of 'n_mars_years' must be >0!"
             errlaunch
         fi
     elif [ -v n_earth_years ] && [ ! -z "$n_earth_years" ]; then
-        if [ $(echo "$n_earth_years < 0." | bc -l) ]; then
+        if [ $(echo "$n_earth_years < 0." | bc -l) -eq 1 ]; then
             echo "Error: the value of 'n_earth_years' must be >0!"
             errlaunch
@@ -168 +168 @@
         ii=$3
     fi
-    if [ $(echo "$i_myear < $n_myear" | bc -l) ]; then
+    if [ $(echo "$i_myear < $n_myear" | bc -l) -eq 1 ]; then
         echo "Run PCM $iPCM: call $ii/$2..."
         if [ $1 -eq 0 ]; then # Mode: processing scripts
@@ -193 +193 @@
     fi
     for ((i = $ii; i <= $2; i++)); do
-        if [ $(echo "$i_myear < $n_myear" | bc -l) ]; then
+        if [ $(echo "$i_myear < $n_myear" | bc -l) -eq 1 ]; then
             echo "Run PCM $iPCM: call $i/$2..."
             if [ $1 -eq 0 ]; then # Mode: processing scripts
@@ -219 +219 @@
 # arg1: launching mode
 submitPEM() {
-    if [ $(echo "$i_myear < $n_myear" | bc -l) ]; then
+    if [ $(echo "$i_myear < $n_myear" | bc -l) -eq 1 ]; then
         echo "Run PEM $iPEM"
         if [ $1 -eq 0 ]; then # Mode: processing scripts
@@ -248 +248 @@
 
     # PEM run
-    if [ $(echo "$i_myear < $n_myear" | bc -l) ]; then
+    if [ $(echo "$i_myear < $n_myear" | bc -l) -eq 1 ]; then
         echo "Run PEM $iPEM"
         if [ $1 -eq 0 ]; then # Mode: processing scripts