Changeset 3213 for trunk/LMDZ.MARS

Timestamp:

Feb 12, 2024, 3:05:15 PM (9 months ago)

Author:

jbclement

Message:

Mars PCM:
Correction of a bug in "writediagsoil.F90": the case of using the 1D model with parallelization was not anticipated so that the "diagsoil.nc" file was filled with meaningless data.
JBC

Location:

trunk/LMDZ.MARS

Files:

• changelog.txt (modified) (1 diff)
• deftank/launch_1Dchained.sh (modified) (2 diffs)
• deftank/launch_orb_1Dchained.sh (modified) (2 diffs)
• libf/phymars/writediagsoil.F90 (modified) (6 diffs)

trunk/LMDZ.MARS/changelog.txt

@@ -4487 +4487 @@
 - Update the computation of qsat for frost at high temperatures; following
 what is done in the Generic PCM
+
+== 12/02/2024 == JBC
+Correction of a bug in "writediagsoil.F90": the case of using the 1D model with parallelization was not anticipated so that the "diagsoil.nc" file was filled with meaningless data.

trunk/LMDZ.MARS/deftank/launch_1Dchained.sh

@@ -74 +74 @@
     ./$exePCM > out_runPCM${iPCM} 2>&1
     if [ ! -f "restartfi.nc" ]; then # Check if run ended abnormally
-        echo "Error: the run PCM $iPCM has crashed!"
+        echo "Error: the run PCM $iPCM crashed!"
         exit 1
     fi
@@ -104 +104 @@
 
 date
-echo "The launching script has terminated."
+echo "The launching script ended."

trunk/LMDZ.MARS/deftank/launch_orb_1Dchained.sh

@@ -159 +159 @@
     ./$exePCM > out_runPCM${iPCM} 2>&1
     if [ ! -f "restartfi.nc" ]; then # Check if run ended abnormally
-        echo "Error: the run PCM $iPCM has crashed!"
+        echo "Error: the run PCM $iPCM crashed!"
         exit 1
     fi
@@ -189 +189 @@
 
 date
-echo "The launching script has terminated."
+echo "The launching script ended."

trunk/LMDZ.MARS/libf/phymars/writediagsoil.F90

@@ -206 +206 @@
 if (dimpx.eq.3) then ! Case of a 3D variable
   ! A. Recast data along 'dynamics' grid
+  if (klon_glo>1) then ! General case
 #ifdef CPP_PARA
   ! gather field on a "global" (without redundant longitude) array
@@ -219 +220 @@
 !$OMP BARRIER
 #else
-  if (klon_glo>1) then ! General case
    do l=1,nsoilmx
     ! handle the poles
@@ -235 +235 @@
     enddo
    enddo
+#endif
   else ! 1D model case
    data3_1d(1,1:nsoilmx)=px(1,1:nsoilmx)
   endif
-#endif
   
   ! B. Write (append) the variable to the NetCDF file
@@ -292 +292 @@
 
   ! A. Recast data along 'dynamics' grid
+  if (klon_glo>1) then ! General case
 #ifdef CPP_PARA
   ! gather field on a "global" (without redundant longitude) array
@@ -306 +307 @@
 !$OMP BARRIER
 #else
-  if (klon_glo>1) then ! general case
     ! handle the poles
     do i=1,nbp_lon+1
@@ -320 +320 @@
       data2(nbp_lon+1,j)=data2(1,j) ! extra (modulo) longitude
     enddo
+#endif
   else ! 1D model case
     data2_1d=px(1,1)
   endif
-#endif
 
   ! B. Write (append) the variable to the NetCDF file