Changeset 2997 for trunk

Timestamp:

Jul 18, 2023, 10:05:35 AM (17 months ago)

Author:

emillour

Message:

Mars PCM:
Some adaptations to enable running the 1D model with XIOS.
Note that this requires compiling with "-io xios -parallel mpi"
but the model should then be run using a single core, i.e. without mpirun
EM

Location:

trunk/LMDZ.MARS

Files:

• changelog.txt (modified) (1 diff)
• libf/phymars/dyn1d/mod_const_mpi.F90 (added)
• libf/phymars/dyn1d/parallel_lmdz.F90 (added)
• libf/phymars/dyn1d/testphys1d.F (modified) (2 diffs)
• libf/phymars/wstats_mod.F90 (modified) (2 diffs)

trunk/LMDZ.MARS/changelog.txt

@@ -4097 +4097 @@
 Update reference field_def_physics_mars.xml to take into account recently
 added outputs in improvedclouds.
+
+== 18/07/2023 == EM
+Some adaptations to enable running the 1D model with XIOS.
+Note that this requires compiling with "-io xios -parallel mpi"
+but the model should then be run using a single core, i.e. without mpirun
+

trunk/LMDZ.MARS/libf/phymars/dyn1d/testphys1d.F

@@ -42 +42 @@
       use iostart, only: open_startphy,get_var, close_startphy
       use write_output_mod, only: write_output
+#ifdef CPP_XIOS
+      use mod_const_mpi, only: init_const_mpi
+      use parallel_lmdz, only: init_parallel
+#endif
       IMPLICIT NONE
 
@@ -169 +173 @@
 c INITIALISATION
 c=======================================================================
+#ifdef CPP_XIOS
+      CALL init_const_mpi
+      CALL init_parallel
+#endif
+
 ! initialize "serial/parallel" related stuff
 !      CALL init_phys_lmdz(iim,jjp1,llm,1,(/(jjm-1)*iim+2/))

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

@@ -174 +174 @@
   if (is_mpi_root) then
     call Grid1Dto2D_glo(px3_glop,px3_glo)
+    if (klon_glo>1) then ! general case (unless in 1D)
     ! copy dx3_glo() to dx3(:) and add redundant longitude
     dx3(1:nbp_lon,:,:)=px3_glo(1:nbp_lon,:,:)
     dx3(nbp_lon+1,:,:)=dx3(1,:,:)
+    endif
   endif
 !$OMP END MASTER
@@ -185 +187 @@
   call Gather(px2,px2_glop)
 !$OMP MASTER
-          if (is_mpi_root) then
-            call Grid1Dto2D_glo(px2_glop,px2_glo)
-            ! copy px2_glo() to dx2(:) and add redundant longitude
-            dx2(1:nbp_lon,:)=px2_glo(1:nbp_lon,:)
-            dx2(nbp_lon+1,:)=dx2(1,:)
-          endif
+  if (is_mpi_root) then
+    call Grid1Dto2D_glo(px2_glop,px2_glo)
+    if (klon_glo>1) then ! general case (unless in 1D)
+      ! copy px2_glo() to dx2(:) and add redundant longitude
+      dx2(1:nbp_lon,:)=px2_glo(1:nbp_lon,:)
+      dx2(nbp_lon+1,:)=dx2(1,:)
+    endif
+  endif
 !$OMP END MASTER
 !$OMP BARRIER