Changeset 3000

Timestamp:

Jul 19, 2023, 11:55:56 AM (16 months ago)

Author:

jbclement

Message:

Mars PCM:
Some adaptations to make the 1D model run with XIOS and MPICH for use with 1D PEM.
JBC

Location:

trunk

Files:

• LMDZ.COMMON/libf/evolution/init_phys_1d_mod.F90 (modified) (2 diffs)
• LMDZ.MARS/changelog.txt (modified) (1 diff)
• LMDZ.MARS/libf/phymars/dyn1d/testphys1d.F (modified) (3 diffs)
• LMDZ.MARS/libf/phymars/dyn1d/write_profile.F90 (modified) (3 diffs)
• LMDZ.MARS/libf/phymars/physiq_mod.F (modified) (1 diff)

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

@@ -54 +54 @@
       use physics_distribution_mod, only: init_physics_distribution
       use iostart, only: open_startphy,get_var, close_startphy
-
+#ifdef CPP_XIOS
+      use mod_const_mpi, only: COMM_LMDZ
+#endif
       include "dimensions.h"
       integer, parameter :: ngrid = 1 !(2+(jjm-1)*iim - 1/jjm)
@@ -261 +263 @@
 
       call init_physics_distribution(regular_lonlat,4,&
-                                    1,1,1,nlayer,1)
+                                    1,1,1,nlayer,COMM_LMDZ)
 
       call open_startphy("startfi_evol.nc")

trunk/LMDZ.MARS/changelog.txt

@@ -4103 +4103 @@
 but the model should then be run using a single core, i.e. without mpirun
 
+== 19/07/2023 == JBC
+Some adaptations to make the 1D model run with XIOS and MPICH for use with 1D PEM.

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

@@ -43 +43 @@
       use write_output_mod, only: write_output
 #ifdef CPP_XIOS
-      use mod_const_mpi, only: init_const_mpi
+      use mod_const_mpi, only: init_const_mpi, COMM_LMDZ
       use parallel_lmdz, only: init_parallel
 #endif
@@ -358 +358 @@
 
       call init_physics_distribution(regular_lonlat,4,
-     &                               1,1,1,nlayer,1)
+     &                               1,1,1,nlayer,COMM_LMDZ)
 
       if(.not. startfile_1D ) then
@@ -988 +988 @@
       call getin("write_prof",write_prof)
       IF (write_prof) then
-              DO iq = 1, nq
-                call writeprofile(nlayer,q(:,iq),noms(iq),iq,qsurf)
+              DO iq = 1,nq
+                call writeprofile(nlayer,q(:,iq),noms(iq),qsurf)
               ENDDO
       ENDIF
-
 
 c    ========================================================

trunk/LMDZ.MARS/libf/phymars/dyn1d/write_profile.F90

@@ -1 @@
-SUBROUTINE writeprofile(nlev,data,name2,iq,qsurf)
+SUBROUTINE writeprofile(nlev,data,name2,qsurf)
 
 
@@ -5 +5 @@
 
 ! arguments:
-INTEGER nlev,iq
+INTEGER nlev
 REAL data(nlev)
 REAL qsurf
@@ -14 +14 @@
 
 !write the data
-OPEN(iq,file='profile_out_'//trim(name2),form='formatted')
-write(iq,*) qsurf
+OPEN(1,file='profile_out_'//trim(name2),form='formatted')
+write(1,*) qsurf
 DO il=1,nlev
-        write(iq,*) data(il)
+    write(1,*) data(il)
 ENDDO
-CLOSE(iq)
+CLOSE(1)
 RETURN
 END

trunk/LMDZ.MARS/libf/phymars/physiq_mod.F

@@ -3830 +3830 @@
         call write_output('zdqcloud_vap','cloud vap',
      &            'kg.m-2.s-1',zdqcloud(:,:,igcm_h2o_vap))
-        call write_output('zdqcloud','cloud ice',
+        call write_output('zdqcloud','cloud',
      &            'kg.m-2.s-1',zdqcloud(:,:,igcm_h2o_ice)
      &                          +zdqcloud(:,:,igcm_h2o_vap))