Changeset 3933

Timestamp:

Oct 23, 2025, 3:27:07 PM (2 months ago)

Author:

jbclement

Message:

PEM:
Correction on dimensions for the new algoirthm introduced in r3907 to update of surface temperatue when ice disappeared.
JBC

Location:

trunk/LMDZ.COMMON/libf/evolution

Files:

• changelog.txt (modified) (1 diff)
• deftank/README (modified) (1 diff)
• pem.F90 (modified) (1 diff)
• surf_temp.F90 (modified) (5 diffs)

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

@@ -779 +779 @@
 == 07/10/2025 == JBC
 Updates of files in the deftank + parameter values for the layering algorithm.
+
+== 23/10/2025 == JBC
+Correction on dimensions for the new algoirthm introduced in r3907 to update of surface temperatue when ice disappeared.

trunk/LMDZ.COMMON/libf/evolution/deftank/README

@@ -45 +45 @@
       /!\ Do not forget to rename the PCM "run.def" into "run_PCM.def";
     > the starting files you want to run the PCM ("startfi.nc", "start.nc"/"start1D.txt"/profiles);
-    > the necessary PEM files ("launchPEM.sh", "lib_launchPEM.sh", "PCMrun.job", "PEMrun.job", "run_PEM.job" and "obl_ecc_lsp.asc";
+    > the necessary PEM files ("launchPEM.sh", "lib_launchPEM.sh", "PCMrun.job", "PEMrun.job", "run_PEM.def" and "obl_ecc_lsp.asc";
     > the optional PEM files "diagpem.def" to define the PEM variables to be ouputted and "startpem.nc" to set the initial state of the PEM.
 

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

@@ -836 +836 @@
 !------------------------
 ! II_d.1 Update Tsurf
-    call update_tsurf_nearest_baresoil(ngrid,nslope,iim,jjm,tsurf_avg,co2_ice,is_co2ice_ini,co2ice_disappeared)
+    call update_tsurf_nearest_baresoil(ngrid,nslope,iim,jjm_value,tsurf_avg,co2_ice,is_co2ice_ini,co2ice_disappeared)
 
     if (soil_pem) then

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

@@ -7 +7 @@
 !=======================================================================
 
-SUBROUTINE update_tsurf_nearest_baresoil(ngrid,nslope,im,jm,tsurf_avg,co2_ice,is_co2ice_ini,co2ice_disappeared)
+SUBROUTINE update_tsurf_nearest_baresoil(ngrid,nslope,iim_input,jjm_input,tsurf_avg,co2_ice,is_co2ice_ini,co2ice_disappeared)
 
 implicit none
 
 ! Inputs:
-integer,                          intent(in) :: im, jm, nslope, ngrid
+integer,                          intent(in) :: iim_input, jjm_input, nslope, ngrid
 real,    dimension(ngrid,nslope), intent(in) :: co2_ice
 logical, dimension(ngrid,nslope), intent(in) :: is_co2ice_ini
@@ -19 +19 @@
 logical, dimension(ngrid,nslope), intent(inout) :: co2ice_disappeared
 ! Local variables:
-real, parameter               :: eps = 1.e-10
-integer                       :: islope, i, j, k, radius, rmax, di, dj, ii, jj
-logical                       :: found
-real, dimension(im,jm,nslope) :: tsurf_ll, co2ice_ll, mask_co2ice_ini, co2ice_disappeared_ll
-real, dimension(ngrid)        :: tmp
+real, parameter                                     :: eps = 1.e-10
+integer                                             :: islope, i, j, k, radius, rmax, di, dj, ii, jj
+logical                                             :: found
+real, dimension(iim_input + 1,jjm_input + 1,nslope) :: tsurf_ll, co2ice_ll, mask_co2ice_ini, co2ice_disappeared_ll
+real, dimension(ngrid)                              :: tmp
+
+write(*,*) "> Updating surface temperature where ice disappeared"
 
 ! Convert from reduced grid to lon-lat grid
 #ifndef CPP_1D
 do islope = 1,nslope
-    call gr_fi_dyn(1,ngrid,im,jm,tsurf_avg(:,islope),tsurf_ll(:,:,islope))
-    call gr_fi_dyn(1,ngrid,im,jm,co2_ice(:,islope),co2ice_ll(:,:,islope))
-    call gr_fi_dyn(1,ngrid,im,jm,merge(1.,0.,is_co2ice_ini(:,islope)),mask_co2ice_ini(:,:,islope))
-    call gr_fi_dyn(1,ngrid,im,jm,merge(1.,0.,co2ice_disappeared(:,islope)),co2ice_disappeared_ll(:,:,islope))
+    call gr_fi_dyn(1,ngrid,iim_input + 1,jjm_input + 1,tsurf_avg(:,islope),tsurf_ll(:,:,islope))
+    call gr_fi_dyn(1,ngrid,iim_input + 1,jjm_input + 1,co2_ice(:,islope),co2ice_ll(:,:,islope))
+    call gr_fi_dyn(1,ngrid,iim_input + 1,jjm_input + 1,merge(1.,0.,is_co2ice_ini(:,islope)),mask_co2ice_ini(:,:,islope))
+    call gr_fi_dyn(1,ngrid,iim_input + 1,jjm_input + 1,merge(1.,0.,co2ice_disappeared(:,islope)),co2ice_disappeared_ll(:,:,islope))
 enddo
 #else
@@ -41 +43 @@
 
 ! For each point where ice disappeared
-rmax = max(im,jm)
-do j = 1,jm
-    do i = 1,im
+rmax = max(iim_input + 1,jjm_input + 1)
+do j = 1,jjm_input + 1
+    do i = 1,iim_input + 1
         do islope = 1,nslope
             if (mask_co2ice_ini(i,j,islope) > 0.5 .and. co2ice_ll(i,j,islope) < eps .and. co2ice_disappeared_ll(i,j,islope) < 0.5) then
@@ -63 +65 @@
                                 ii = i + di
                                 jj = j + dj
-                                if (ii >= 1 .and. ii <= im .and. jj >= 1 .and. jj <= jm) then
+                                if (ii >= 1 .and. ii <= iim_input + 1 .and. jj >= 1 .and. jj <= jjm_input + 1) then
                                     do k = 1,nslope
                                         if (mask_co2ice_ini(ii,jj,k) < 0.5) then
@@ -88 +90 @@
 #ifndef CPP_1D
 do islope = 1,nslope
-    call gr_dyn_fi(1,im,jm,ngrid,tsurf_ll(:,:,islope),tsurf_avg(:,islope))
-    call gr_dyn_fi(1,im,jm,ngrid,co2ice_disappeared_ll(:,:,islope),tmp)
+    call gr_dyn_fi(1,iim_input + 1,jjm_input + 1,ngrid,tsurf_ll(:,:,islope),tsurf_avg(:,islope))
+    call gr_dyn_fi(1,iim_input + 1,jjm_input + 1,ngrid,co2ice_disappeared_ll(:,:,islope),tmp)
     where (tmp > 0.5) co2ice_disappeared(:,islope) = .true.
 enddo