Changeset 3190 for trunk/LMDZ.COMMON

Timestamp:

Jan 30, 2024, 10:14:19 AM (10 months ago)

Author:

llange

Message:

PEM
Fixing bug in writediagpem: soil layers written in the diagpem where those of the PCM and not the PEM.
LL

Location:

trunk/LMDZ.COMMON/libf/evolution

Files:

• changelog.txt (modified) (1 diff)
• pemetat0.F90 (modified) (1 diff)
• writediagpem.F90 (modified) (10 diffs)

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

@@ -213 +213 @@
 == 25/01/2023 == JBC
 Update of "launch_pem.sh" related to r3171 to move the "diagsoilpem.nc" in the intended output folder.
+
+== 29/01/2023 == LL
+Fixing bug when recomputing Tsoil for the startfi. It is now done with: Tsoil averaged + Delta T where delta T is tthe difference between the instantaneous soil temperature and the yearly averaged soil temperature in the original startfi.
+
+== 30/01/2023 == LL
+Fixing bug in writediagpem: soil layers written in the diagpem where those of the PCM and not the PEM.
+

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

@@ -253 +253 @@
                 tsoil_tmp_yr2(:,:,islope) = tsoil_tmp_yr1(:,:,islope)
                 call compute_tsoil_pem(ngrid,nsoil_PEM,.false.,TI_PEM(:,:,islope),timestep,tsurf_avg_yr2(:,islope),tsoil_tmp_yr2(:,:,islope))
-
+                
                 do iloop = nsoil_PCM+1,nsoil_PEM
                     tsoil_PEM(:,iloop,islope) = tsoil_tmp_yr2(:,iloop,islope)

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

@@ -593 +593 @@
 ! Modifs: Aug.2010 Ehouarn: enforce outputs to be real*4
 
-use comsoil_h, only: nsoilmx, inertiedat
+use comsoil_h_PEM, only: nsoilmx_PEM, inertiedat_PEM
 use geometry_mod, only: cell_area
 use time_phylmdz_mod, only: ecritphy, day_step, iphysiq
@@ -611 +611 @@
 character(len=*),intent(in) :: units ! 'units' attribute of the variable
 integer,intent(in) :: dimpx ! dimension of the variable (3,2 or 0)
-real,dimension(ngrid,nsoilmx),intent(in) :: px ! variable
+real,dimension(ngrid,nsoilmx_PEM),intent(in) :: px ! variable
 
 ! Local variables:
-real*4,dimension(nbp_lon+1,nbp_lat,nsoilmx) :: data3 ! to store 3D data
+real*4,dimension(nbp_lon+1,nbp_lat,nsoilmx_PEM) :: data3 ! to store 3D data
 real*4,dimension(nbp_lon+1,nbp_lat) :: data2 ! to store 2D data
 real*4 :: data0 ! to store 0D data
-real*4 :: data3_1d(1,nsoilmx) ! to store a profile in 1D model
+real*4 :: data3_1d(1,nsoilmx_PEM) ! to store a profile in 1D model
 real*4 :: data2_1d ! to store surface value with 1D model
 integer :: i,j,l ! for loops
@@ -624 +624 @@
 real*4,save :: date ! time counter (in elapsed days)
 
-real :: inertia((nbp_lon+1),nbp_lat,nsoilmx)
+real :: inertia((nbp_lon+1),nbp_lat,nsoilmx_PEM)
 real :: area((nbp_lon+1),nbp_lat)
 
-real :: inertiafi_glo(klon_glo,nsoilmx)
+real :: inertiafi_glo(klon_glo,nsoilmx_PEM)
 real :: areafi_glo(klon_glo)
 
@@ -647 +647 @@
 #ifdef CPP_PARA
 ! Added to work in parallel mode
-real dx3_glop(klon_glo,nsoilmx)
-real dx3_glo(nbp_lon,nbp_lat,nsoilmx) ! to store a global 3D data set
+real dx3_glop(klon_glo,nsoilmx_PEM)
+real dx3_glo(nbp_lon,nbp_lat,nsoilmx_PEM) ! to store a global 3D data set
 real dx2_glop(klon_glo)
 real dx2_glo(nbp_lon,nbp_lat)     ! to store a global 2D (surface) data set
@@ -693 +693 @@
 #ifdef CPP_PARA
    ! Gather inertiedat() soil thermal inertia on physics grid
-   call Gather(inertiedat,inertiafi_glo)
+   call Gather(inertiedat_PEM,inertiafi_glo)
    ! Gather cell_area() mesh area on physics grid
    call Gather(cell_area,areafi_glo)
 #else
-         inertiafi_glo(:,:)=inertiedat(:,:)
+         inertiafi_glo(:,:)=inertiedat_PEM(:,:)
          areafi_glo(:)=cell_area(:)
 #endif
@@ -705 +705 @@
    if (klon_glo>1) then
     do i=1,nbp_lon+1 ! poles
-     inertia(i,1,1:nsoilmx)=inertiafi_glo(1,1:nsoilmx)
-     inertia(i,nbp_lat,1:nsoilmx)=inertiafi_glo(klon_glo,1:nsoilmx)
+     inertia(i,1,1:nsoilmx_PEM)=inertiafi_glo(1,1:nsoilmx_PEM)
+     inertia(i,nbp_lat,1:nsoilmx_PEM)=inertiafi_glo(klon_glo,1:nsoilmx_PEM)
      ! for area, divide at the poles by nbp_lon
      area(i,1)=areafi_glo(1)/nbp_lon
@@ -714 +714 @@
      ig0= 1+(j-2)*nbp_lon
      do i=1,nbp_lon
-        inertia(i,j,1:nsoilmx)=inertiafi_glo(ig0+i,1:nsoilmx)
+        inertia(i,j,1:nsoilmx_PEM)=inertiafi_glo(ig0+i,1:nsoilmx_PEM)
         area(i,j)=areafi_glo(ig0+i)
      enddo
      ! handle redundant point in longitude
-     inertia(nbp_lon+1,j,1:nsoilmx)=inertia(1,j,1:nsoilmx)
+     inertia(nbp_lon+1,j,1:nsoilmx_PEM)=inertia(1,j,1:nsoilmx_PEM)
      area(nbp_lon+1,j)=area(1,j)
     enddo
@@ -791 +791 @@
 #else
   if (klon_glo>1) then ! General case
-   do l=1,nsoilmx
+   do l=1,nsoilmx_PEM
     ! handle the poles
     do i=1,nbp_lon+1
@@ -807 +807 @@
    enddo
   else ! 1D model case
-   data3_1d(1,1:nsoilmx)=px(1,1:nsoilmx)
+   data3_1d(1,1:nsoilmx_PEM)=px(1,1:nsoilmx_PEM)
   endif
 #endif
@@ -841 +841 @@
   endif
   edges(2)=nbp_lat
-  edges(3)=nsoilmx
+  edges(3)=nsoilmx_PEM
   edges(4)=1