Changeset 3995 for trunk

Timestamp:

Jan 5, 2026, 5:00:27 PM (3 weeks ago)

Author:

emillour

Message:

Generic PCM:
Enable using XIOS with rcm1d. This implies compiling with MPI (makelmdz_fcm ...
-parallel mpi -io xios ... rcm1d) and having adequate xml files at hand.
While at it cleaned up turbdiff_mod.F90 to use write_output() instead of
calls to writediagfi() and updated reference field_def_physics.xml
EM

Location:

trunk/LMDZ.GENERIC

Files:

• changelog.txt (modified) (1 diff)
• deftank/xios/field_def_physics.xml (modified) (2 diffs)
• libf/phystd/dyn1d/mod_const_mpi.F90 (added)
• libf/phystd/dyn1d/parallel_lmdz.F90 (added)
• libf/phystd/dyn1d/rcm1d.F (modified) (2 diffs)
• libf/phystd/turbdiff_mod.F90 (modified) (2 diffs)
• libf/phystd/writediagfi.F (modified) (6 diffs)
• libf/phystd/wstats_mod.F90 (modified) (2 diffs)

trunk/LMDZ.GENERIC/changelog.txt

@@ -2151 +2151 @@
 by the master thread). While at it turned ave_stelspec and setspv into modules.
 
+== 05/01/2026 == EM
+Enable using XIOS with rcm1d. This implies compiling with MPI (makelmdz_fcm ...
+-parallel mpi -io xios ... rcm1d) and having adequate xml files at hand.
+While at it cleaned up turbdiff_mod.F90 to use write_output() instead of
+calls to writediagfi() and updated reference field_def_physics.xml

trunk/LMDZ.GENERIC/deftank/xios/field_def_physics.xml

@@ -308 +308 @@
                    long_name="latent heat flux"
                    unit="w.m^-2" />
+            
+            <!-- diagnostics from turbdiff-->
+            <field id="beta"
+                   long_name="Dryness coefficient"
+                   unit=" " />
+            <field id="evap_surf_flux"
+                   long_name="surface latent heat flux"
+                   unit="W.m-2" />
+            <field id="fluxsurf_rad"
+                   long_name="total IR and VIS surface flux"
+                   unit="W.m-2" />
+            
         </field_group>
 
@@ -451 +463 @@
                    unit="K" />
 
-
+            <!-- diagnostics from turbdiff-->
+            <field id="dqevap"
+                   long_name="evaporated water vapor specific concentration"
+                   unit="s-1" />
+ 
             <!--Tracers-->
             <field id="h2o_vap"

trunk/LMDZ.GENERIC/libf/phystd/dyn1d/rcm1d.F

@@ -46 +46 @@
       !use inichim_1D_mod, only: inichim_1D
       !use initracer_1D_mod, only: initracer_1D
+#ifdef CPP_XIOS
+      use mod_const_mpi, only: init_const_mpi
+      use parallel_lmdz, only: init_parallel
+#endif
 
       implicit none
@@ -202 +206 @@
         call system("echo 'INCLUDEDEF=rcm1d.def' >> run.def")
       endif
+
+#ifdef CPP_XIOS
+      CALL init_const_mpi
+      CALL init_parallel
+#endif
 
 ! Check restart

trunk/LMDZ.GENERIC/libf/phystd/turbdiff_mod.F90

@@ -20 +20 @@
       use callkeys_mod, only: water,tracer,nosurf,kmixmin
       use turb_mod, only : ustar
+      use write_output_mod, only: write_output
 #ifdef MESOSCALE
       use comm_wrf, only : comm_LATENT_HF
@@ -744 +745 @@
       if(water)then
 #ifndef MESOSCALE
-         call writediagfi(ngrid,'beta','Dryness coefficient',' ',2,dryness)
+         call write_output('beta','Dryness coefficient',' ',dryness)
 #endif
          if (tracer) then
 #ifndef MESOSCALE
-            call writediagfi(ngrid,'evap_surf_flux','surface latent heat flux','W.m-2',2,RLVTT*dqsdif_total/ptimestep)
-            call writediagfi(ngrid,'fluxsurf_rad','total IR and VIS surface flux','W.m-2',2,pfluxsrf)
-            call writediagfi(ngrid,'dqevap','evaporated water vapor specific concentration','s-1',3,pdqevap)
+            call write_output('evap_surf_flux','surface latent heat flux','W.m-2',RLVTT*dqsdif_total/ptimestep)
+            call write_output('fluxsurf_rad','total IR and VIS surface flux','W.m-2',pfluxsrf)
+            call write_output('dqevap','evaporated water vapor specific concentration','s-1',pdqevap)
 #else
             comm_LATENT_HF(:)=0.0

trunk/LMDZ.GENERIC/libf/phystd/writediagfi.F

@@ -334 +334 @@
         if (dim.eq.3) then
 
+          IF (klon_glo>1) THEN ! General case
 #ifdef CPP_PARA
           ! Gather field on a "global" (without redundant longitude) array
@@ -349 +350 @@
 !         Passage variable physique -->  variable dynamique
 !         recast (copy) variable from physics grid to dynamics grid
-          IF (klon_glo>1) THEN ! General case
            DO l=1,nbp_lev
              DO i=1,nbp_lon+1
@@ -363 +363 @@
              ENDDO
            ENDDO
+#endif
           ELSE ! 1D model case
            dx3_1d(1,1:nbp_lev)=px(1,1:nbp_lev)
           ENDIF
-#endif
 !         Ecriture du champs
 
@@ -438 +438 @@
         else if (dim.eq.2) then
 
+          IF (klon_glo>1) THEN ! General case
 #ifdef CPP_PARA
           ! Gather field on a "global" (without redundant longitude) array
@@ -455 +456 @@
 !         Passage variable physique -->  physique dynamique
 !         recast (copy) variable from physics grid to dynamics grid
-          IF (klon_glo>1) THEN ! General case
              DO i=1,nbp_lon+1
                 dx2(i,1)=px(1,1)
@@ -467 +467 @@
                 dx2(nbp_lon+1,j)=dx2(1,j)
              ENDDO
+#endif
           ELSE ! 1D model case
             dx2_1d=px(1,1)
           ENDIF
-#endif
 
           if (is_master) then

trunk/LMDZ.GENERIC/libf/phystd/wstats_mod.F90

@@ -174 +174 @@
   if (is_mpi_root) then
     call Grid1Dto2D_glo(px3_glop,px3_glo)
-    ! copy dx3_glo() to dx3(:) and add redundant longitude
-    dx3(1:nbp_lon,:,:)=px3_glo(1:nbp_lon,:,:)
-    dx3(nbp_lon+1,:,:)=dx3(1,:,:)
+    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
@@ -187 +189 @@
           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,:)
+            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