Changeset 2996

Timestamp:

Jul 18, 2023, 9:57:21 AM (16 months ago)

Author:

emillour

Message:

Common dynamics:
Adapt script and interface for the possibility of running 1D model with MPI
(will only be usefull for running 1D models with XIOS).
In anticipation of next commit also remove the link to dyn3d/mod_const_mpi.F90 in the Mars dyn1d directory.
EM

Location:

trunk

Files:

• LMDZ.COMMON/libf/dynphy_lonlat/mod_interface_dyn_phys.F90 (modified) (1 diff)
• LMDZ.COMMON/makelmdz_fcm (modified) (2 diffs)
• LMDZ.MARS/libf/phymars/dyn1d/mod_const_mpi.F90 (deleted)

trunk/LMDZ.COMMON/libf/dynphy_lonlat/mod_interface_dyn_phys.F90

@@ -26 +26 @@
       index_j(k)=1
       k=2
+      ! handle very specific case of 1D "parallel" setup
+      if (klon_mpi==1) k=1
     ELSE
       DO i=ii_begin,iim

trunk/LMDZ.COMMON/makelmdz_fcm

@@ -610 +610 @@
 then
 ## Sanity check: 1D models should be used in serial
-  if [[ $parallel != "none" ]]
-  then
+## unless compiled with xios and then it should be in mpi only
+  if [[ $io == xios ]]
+  then
+   echo "OK io xios"
+   if [[ $parallel != "mpi" ]]
+   then
+    echo "Error: a 1D model compiled with xios should also be compiled with "
+    echo "       -parallel mpi option!"
+    exit
+   fi
+  else
+  # no xios, check that it is in serial only
+   if [[ $parallel != "none" ]]
+   then
     echo "Error: a 1D model should not be compiled with "
     echo "       -parallel [mpi|omp|mpi_omp] option!"
     exit
-  fi
+   fi
+  fi # of if [[ $io == "xios" ]]
   CPP_KEY="$CPP_KEY CPP_1D"
 ##in 1D, add dyn3d to include path (because main prog is in physics)
@@ -682 +695 @@
 then
   SUFF_NAME=${SUFF_NAME}_para
-  DYN=dyn${dimc}d${paramem}
+  if (( $dimension == 1 ))
+  then
+    # dynamics-related routines in"dyn1d" subdirectory of phy${physique} 
+    DYN=phy${physique}/dyn1d
+  else
+    DYN=dyn${dimc}d${paramem}
+  fi
   if [[ "$paramem" == "mem" ]]
   then