Changeset 3173 for trunk/LMDZ.COMMON

Timestamp:

Jan 9, 2024, 10:55:18 AM (11 months ago)

Author:

jbclement

Message:

PEM:

• Correction of script "launch_orb_1Dchained.sh" which read orbital parameters missing one interval of years in two.
• Addition of the Martian date in "info_PEM.txt" for post-processing.

JBC

Location:

trunk/LMDZ.COMMON/libf/evolution

Files:

• changelog.txt (modified) (1 diff)
• deftank/launch_orb_1Dchained.sh (modified) (2 diffs)
• info_PEM_mod.F90 (modified) (2 diffs)

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

@@ -196 +196 @@
 Fixing bug when rewritting the startfi.nc for the PCM: fluxgeo, read in the run_PEM.def,  was not written in the startfi.
 
+== 09/01/2023 == JBC
+- Correction of script "launch_orb_1Dchained.sh" which read orbital parameters missing one interval of years in two.
+- Addition of the Martian date in "info_PEM.txt" for post-processing.

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

@@ -85 +85 @@
     yearlask=$(echo "$eyears_bp_ini + $i_myear*$convert_years" | bc -l)
     found=false
-    while read -r y1 obl1 ecc1 lsp1 && read -r y2 obl2 ecc2 lsp2; do
-        y1=$(echo "$y1*1000" | bc -l)
-        y2=$(echo "$y2*1000" | bc -l)
+    read -r y1 obl1 ecc1 lsp1 < "$orb_data"
+    while read -r y2 obl2 ecc2 lsp2; do
+        if [ "$first_line" = true ]; then
+            first_line=false
+            continue # Skip the first line as it's already read outside the loop
+        fi
         if [ "$(echo "$y1 >= $yearlask && $yearlask > $y2" | bc)" -eq 1 ]; then
             found=true
@@ -107 +110 @@
             break
         fi
+        y1=$y2
+        obl1=$obl2
+        ecc1=$ecc2
+        lsp1=$lsp2
     done < "$orb_data"
     if [ "$found" = false ]; then

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

@@ -17 +17 @@
 !=======================================================================
 
-use time_evol_mod, only: convert_years
+use time_evol_mod, only: convert_years, year_bp_ini
 
 implicit none
@@ -43 +43 @@
     endif
     open(1,file = 'info_PEM.txt',status = "old",position = "append",action = "write")
-    write(1,*) year_iter, i_myear, stopPEM
+    ! Martian date, Number of Martians years done by the PEM run, Number of Martians years done by the chainded simulation, Code of the stopping criterion
+    ! The conversion ratio from Planetary years to Earth years is given in the header of the file
+    write(1,*) year_bp_ini + i_myear, year_iter, i_myear, stopPEM
     close(1)
 else