Changeset 3666 for trunk/LMDZ.COMMON/libf/evolution/deftank

Timestamp:

Feb 28, 2025, 5:51:32 PM (5 months ago)

Author:

jbclement

Message:

PEM:

• Adjusments of few scripts to handle more situations.
• Bug correction related to deallocation in case of "soil_pem = .false." or "layering_algo = .true.".

JBC

Location:

trunk/LMDZ.COMMON/libf/evolution/deftank

Files:

• inipem_orbit.sh (modified) (6 diffs)
• lib_launchPEM.sh (modified) (4 diffs)
• visu_evol_layering.py (modified) (1 diff)

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

@@ -15 +15 @@
 # Name of the file containing the orbital data
 orb_data="obl_ecc_lsp.asc"
+
+# Name of the file containing the starting date (Earth years)
+date_file="run_PEM.def"
 ######################################################################
 
@@ -23 +26 @@
     exit 1
 fi
-if [ ! -f "startfi.nc" ]; then
+if [ ! -f "$name_file" ]; then
     echo "Error: file \"$name_file\" not found!"
     exit 1
 fi
-if [ ! -f "run_PEM.def" ]; then
-    echo "Error: file \"run_PEM.def\" not found!"
+if [ ! -f "$date_file" ]; then
+    echo "Error: file \"$date_file\" not found!"
     exit 1
 fi
 
-# Get the number of Earth years before present to start the PEM run from "run_PEM.def"
-eyears_bp_ini=$(grep 'year_earth_bp_ini=' run_PEM.def | cut -d '=' -f 2 | tr -d '[:space:]')
-echo "The starting date is $eyears_bp_ini Earth years according to \"run_PEM.def\"."
+# Get the number of Earth years before present to start the PEM run
+eyears_bp_ini=$(grep 'year_earth_bp_ini=' $date_file | cut -d '=' -f 2 | tr -d '[:space:]')
+echo "In \"$date_file\":"
+echo "The starting date is $eyears_bp_ini Earth years."
 
 # Get the new values for the orbital parameters
@@ -58 +62 @@
         fi
         new_Lsp=$(echo "($lsp2 - $lsp1)/($y2 - $y1)*($yearlask - $y1) + $lsp1" | bc -l)
-        echo "New obliquity    = $new_obl"
-        echo "New eccentricity = $new_ecc"
-        echo "New Lsp          = $new_Lsp"
-        echo "Done!"
+        echo "In \"$orb_data\":"
+        echo "Found obliquity    = $new_obl"
+        echo "Found eccentricity = $new_ecc"
+        echo "Found Lsp          = $new_Lsp"
         break
     fi
@@ -95 +99 @@
 peri_day=$(echo "$year_day*(1. - ($zx0 - $new_ecc*s($zx0))/(2.*$pi))" | bc -l)
 
-ztheta=$(echo "($new_iniLs - $new_Lsp)/$degrad" | bc -l)
-tan=$(echo "s(0.5*$ztheta)/c(0.5*$ztheta)" | bc -l)
-zx0=$(echo "2.*a($tan*sqrt((1. - $new_ecc)/(1. + $new_ecc)))" | bc -l)
-xref=$(echo "$zx0 - $new_ecc*s($zx0)" | bc -l)
-new_inisol=$(echo "$peri_day + $xref*$year_day/(2.*$pi)" | bc -l)
-if [ $(echo "$new_inisol < 0." | bc -l) -eq 1 ]; then
-    new_inisol=$(echo "$new_inisol + $year_day" | bc -l)
-fi
-if [ $(echo "$new_inisol >= $year_day" | bc -l) -eq 1 ]; then
-    new_inisol=$(echo "$new_inisol - $year_day" | bc -l)
-fi
-
 # Update the netCDF file
 # controle(15) = periheli ! min. Sun-Mars distance (Mkm)  ̃206.66
@@ -117 +109 @@
          -s "controle(15)=$aphelie" \
          -s "controle(16)=$peri_day" \
-         -s "controle(2)=$new_inisol" \
          $name_file $name_file
 
@@ -123 +114 @@
 echo "New obliquit     = $new_obl"
 echo "New eccentricity = $new_ecc -> new periheli = $periheli"
-echo "                              -> new aphelie  = $aphelie"
+echo "                                         -> new aphelie  = $aphelie"
 echo "New Lsp          = $new_Lsp -> new peri_day = $peri_day"
-echo "New initial Ls   = $new_iniLs -> New initial sol = $new_inisol"
 echo "Done!"

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

@@ -181 +181 @@
         else # Mode: submitting jobs
             cp PCMrun.job PCMrun${iPCM}.job
-            sed -i -E "s/($name_job[^0-9]*)[0-9]+([^0-9]*)$/\1${iPCM}\2/" PCMrun${iPCM}.job
+            sed -i -E "/^$name_job/s/(.*[^0-9])([0-9]+)(_[^0-9]*)?$/\1${iPCM}\3/" PCMrun${iPCM}.job
             sed -i "s/^k=[0-9]\+$/k=$(echo "$ii - $3 + 2" | bc)/" PCMrun${iPCM}.job
             jobID=$(eval "$submit_job PCMrun${iPCM}.job")
@@ -208 +208 @@
             else # Mode: submitting jobs
                 cp PCMrun.job PCMrun${iPCM}.job
-                sed -i -E "s/($name_job[^0-9]*)[0-9]+([^0-9]*)$/\1${iPCM}\2/" PCMrun${iPCM}.job
+                sed -i -E "/^$name_job/s/(.*[^0-9])([0-9]+)(_[^0-9]*)?$/\1${iPCM}\3/" PCMrun${iPCM}.job
                 sed -i "s/^k=[0-9]\+$/k=$(echo "$i - $3 + 2" | bc)/" PCMrun${iPCM}.job
                 jobID=$(eval "$submit_dependjob=afterok:${jobID} PCMrun${iPCM}.job")
@@ -234 +234 @@
             fi
         else # Mode: submitting jobs
-            sed -i -E "s/($name_job[^0-9]*)[0-9]+([^0-9]*)$/\1${iPEM}\2/" PEMrun.job
+            sed -i -E "/^$name_job/s/(.*[^0-9])([0-9]+)(_[^0-9]*)?$/\1${iPEM}\3/" PEMrun.job
             jobID=$(eval "$submit_job PEMrun.job")
             # Create a file to cancel the dependent jobs of the cycle
@@ -264 +264 @@
             fi
         else # Mode: submitting jobs
-            sed -i -E "s/($name_job[^0-9]*)[0-9]+([^0-9]*)$/\1${iPEM}\2/" PEMrun.job
+            sed -i -E "/^$name_job/s/(.*[^0-9])([0-9]+)(_[^0-9]*)?$/\1${iPEM}\3/" PEMrun.job
             jobID=$(eval "$submit_dependjob=afterok:${jobID} PEMrun.job")
             echo $kill_job $jobID >> kill_launchPEM.sh

trunk/LMDZ.COMMON/libf/evolution/deftank/visu_evol_layering.py

@@ -151 +151 @@
 ### Processing
 stratif_data, max_top_elevation, longitude, latitude = process_files(folder_path,base_name)
+if dz > max_top_elevation:
+    print('The discretization step is higher than the maximum top elevation: please provide a correct value!')
+    exit()
 ref_grid, gridded_stratif_data = interpolate_data(stratif_data,max_top_elevation,dz)
 date_time = read_infofile(infofile)