Changeset 3634

Timestamp:

Feb 19, 2025, 3:54:06 PM (5 months ago)

Author:

jbclement

Message:

PEM:
Few small adjustments in the script files.
JBC

Location:

trunk/LMDZ.COMMON/libf/evolution

Files:

• changelog.txt (modified) (1 diff)
• deftank/PCMrun.job (modified) (1 diff)
• deftank/PEMrun.job (modified) (1 diff)
• deftank/launchPEM.sh (modified) (1 diff)
• deftank/lib_launchPEM.sh (modified) (5 diffs)
• reshape_XIOS_output.F90 (modified) (3 diffs)

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

@@ -597 +597 @@
 == 18/02/2025 == JBC
 Bug correction about pressure rewriting in the "start.nc".
+
+== 19/02/2025 == JBC
+Few small adjustments in the script files.

trunk/LMDZ.COMMON/libf/evolution/deftank/PCMrun.job

@@ -35 +35 @@
 # Running the PCM
 read i_myear n_myear convert_years iPCM iPEM nPCM nPCM_ini < info_PEM.txt
-echo "Run PCM $iPCM is starting."
+echo "Run \"PCM $iPCM\" is starting."
 cp run_PCM.def run.def
 eval "$exe_cmd > out_runPCM${iPCM} 2>&1"

trunk/LMDZ.COMMON/libf/evolution/deftank/PEMrun.job

@@ -42 +42 @@
 # Running the PEM
 read i_myear n_myear convert_years iPCM iPEM nPCM nPCM_ini < info_PEM.txt
-echo "Run PEM $iPEM is starting."
+echo "Run \"PEM $iPEM\" is starting."
 cp run_PEM.def run.def
 eval "./$exePEM $arg_pem > out_runPEM${iPEM} 2>&1"

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

@@ -110 +110 @@
         exec >> log_launchPEM.txt 2>&1
         echo
-        echo "This is a relaunch for the PEM simulation from the run $relaunch$irelaunch."
+        echo "This is a relaunch for the PEM simulation from the run \"$relaunch $irelaunch\"."
         date
         checklaunch

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

@@ -172 +172 @@
     fi
     if [ $(echo "$i_myear < $n_myear" | bc -l) -eq 1 ]; then
-        echo "Run PCM $iPCM: call $ii/$3..."
+        echo "Run \"PCM $iPCM\": call $ii/$3..."
         if [ $1 -eq 0 ]; then # Mode: processing scripts
             sed -i "s/^k=[0-9]\+$/k=$(echo "3 - $nPCM_ini" | bc)/" PCMrun.job
@@ -199 +199 @@
     for ((i = $ii; i <= $3; i++)); do
         if [ $(echo "$i_myear < $n_myear" | bc -l) -eq 1 ]; then
-            echo "Run PCM $iPCM: call $i/$3..."
+            echo "Run \"PCM $iPCM\": call $i/$3..."
             if [ $1 -eq 0 ]; then # Mode: processing scripts
                 sed -i "s/^k=[0-9]\+$/k=$(echo "$i + 2 - $nPCM_ini" | bc)/" PCMrun.job
@@ -227 +227 @@
 submitPEM() {
     if [ $(echo "$i_myear < $n_myear" | bc -l) -eq 1 ]; then
-        echo "Run PEM $iPEM"
+        echo "Run \"PEM $iPEM\""
         if [ $1 -eq 0 ]; then # Mode: processing scripts
             ./PEMrun.job
@@ -257 +257 @@
     # PEM run
     if [ $(echo "$i_myear < $n_myear" | bc -l) -eq 1 ]; then
-        echo "Run PEM $iPEM"
+        echo "Run \"PEM $iPEM\""
         if [ $1 -eq 0 ]; then # Mode: processing scripts
             ./PEMrun.job
@@ -348 +348 @@
         il=$(echo "($irelaunch - $nPCM_ini + 1)%$nPCM + 1" | bc)
         if [ $2 -ne 0 ]; then # Counting: PCM runs taken into account
-            i_myear=$(($(awk "NR==$iPEM {printf \"%s\n\", \$3}" "info_PEM.txt") + $il))
+            i_myear=$(echo "$(awk "NR==$iPEM {printf \"%s\n\", \$3}" "info_PEM.txt") + $il" | bc -l)
         else # Counting: only PEM runs count
             i_myear=$(awk "NR==$iPEM {printf \"%s\n\", \$3}" "info_PEM.txt")

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

@@ -43 +43 @@
 do numyear = 1,2
     write(str,'(i1.1)') numyear
-    write(*,*) 'Reshaping of variables from "data2reshape_Y'//str//'.nc"...'
+    write(*,*) '> Reshaping of variables from "data2reshape_Y'//str//'.nc"...'
 
     state = nf90_open(path = "data2reshape_Y"//str//".nc",mode = nf90_nowrite,ncid = ncid1)
@@ -98 +98 @@
     do i = 1,nvars
         state = nf90_inquire_variable(ncid1,varids(i),name = namevar,xtype = xtype_var,ndims = numdims,natts = numatts)
-        write(*,*) '> Treatment of '//namevar
+        write(*,*) 'Treatment of '//namevar
         if (state /= nf90_noerr) call handle_err(state)
         allocate(dimid_var(numdims))
@@ -219 +219 @@
 
     deallocate(dimids,varids,dimids_2,varids_2)
-    write(*,*) 'Done!'
+    write(*,*) '> "data2reshape_Y'//str//'.nc" processed!'
 enddo