Changeset 3345 for trunk/LMDZ.COMMON

Timestamp:

May 23, 2024, 4:21:32 PM (6 months ago)

Author:

jbclement

Message:

PEM:
Making "writediagsoilpem.F90" work in 3D with the correct PEM soil depth dimension.
JBC

Location:

trunk/LMDZ.COMMON/libf/evolution

Files:

• changelog.txt (modified) (1 diff)
• glaciers_mod.F90 (modified) (1 diff)
• writediagpem.F90 (modified) (17 diffs)

trunk/LMDZ.COMMON/libf/evolution/changelog.txt

@@ -321 +321 @@
 == 22/05/2024 == JBC
 Correction of the way sublimating ice is identified at the beginning of the PEM + some updates for the default variables and the display of information.
+
+== 23/05/2024 == JBC
+Making "writediagsoilpem.F90" work in 3D with the correct PEM soil depth dimension.

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

@@ -55 +55 @@
 
 !-----------------------------
-write(*,*) "Flow of CO2 glacier"
+write(*,*) "Flow of CO2 glaciers"
     
 call computeTcondCO2(timelen,ngrid,nslope,vmr_co2_PEM,ps_PCM,global_avg_ps_PCM,global_avg_ps_PEM,Tcond)

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

@@ -294 +294 @@
 !---------------------
     if (dim == 3) then
+        IF (klon_glo>1) THEN ! General case
 #ifdef CPP_PARA
         ! Gather field on a "global" (without redundant longitude) array
@@ -309 +310 @@
 !         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
@@ -323 +323 @@
                 ENDDO
             ENDDO
+#endif
         ELSE ! 1D model case
             dx3_1d(1,1:nbp_lev)=px(1,1:nbp_lev)
         ENDIF
-#endif
 !       Ecriture du champs
         if (is_master) then
@@ -392 +392 @@
     else if (dim == 2) then
 
+        IF (klon_glo>1) THEN ! General case
 #ifdef CPP_PARA
         ! Gather field on a "global" (without redundant longitude) array
@@ -408 +409 @@
 !         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)
@@ -420 +420 @@
                 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
@@ -595 +595 @@
 ! Modifs: Aug.2010 Ehouarn: enforce outputs to be real*4
 
-use comsoil_h_PEM,      only: nsoilmx_PEM, inertiedat_PEM
+use comsoil_h_PEM,      only: mlayer_PEM, nsoilmx_PEM, inertiedat_PEM
 use geometry_mod,       only: cell_area
 use mod_phys_lmdz_para, only: is_mpi_root, is_master, gather
@@ -601 +601 @@
 use mod_grid_phy_lmdz,  only: grid_type, unstructured
 use time_evol_mod,      only: ecritpem, dt_pem
+use iniwritesoil_mod,   only: iniwritesoil
 
 implicit none
@@ -693 +694 @@
 
 #ifdef CPP_PARA
-   ! Gather inertiedat() soil thermal inertia on physics grid
+   ! Gather inertiedat_PEM() soil thermal inertia on physics grid
    call Gather(inertiedat_PEM,inertiafi_glo)
    ! Gather cell_area() mesh area on physics grid
@@ -726 +727 @@
    ! write "header" of file (longitudes, latitudes, geopotential, ...)
    if (klon_glo>1) then ! general 3D case
-     call iniwritesoil(nid,ngrid,inertia,area,nbp_lon+1,nbp_lat)
+     call iniwritesoil(nid,ngrid,inertia,area,nbp_lon+1,nbp_lat,nsoilmx_PEM,mlayer_PEM)
    else ! 1D model
-     call iniwritesoil(nid,ngrid,inertiafi_glo(1,:),areafi_glo(1),1,1)
+     call iniwritesoil(nid,ngrid,inertiafi_glo(1,:),areafi_glo(1),1,1,nsoilmx_PEM,mlayer_PEM)
    endif
 
@@ -776 +777 @@
 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
@@ -789 +791 @@
 !$OMP BARRIER
 #else
-  if (klon_glo>1) then ! General case
    do l=1,nsoilmx_PEM
     ! handle the poles
@@ -805 +806 @@
     enddo
    enddo
+#endif
   else ! 1D model case
    data3_1d(1,1:nsoilmx_PEM)=px(1,1:nsoilmx_PEM)
   endif
-#endif
   
   ! B. Write (append) the variable to the NetCDF file
@@ -862 +863 @@
 
   ! 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
@@ -876 +878 @@
 !$OMP BARRIER
 #else
-  if (klon_glo>1) then ! general case
     ! handle the poles
     do i=1,nbp_lon+1
@@ -890 +891 @@
       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
@@ -989 +990 @@
 END SUBROUTINE writediagsoilpem
 
-
 END MODULE writediagpem_mod
-