Changeset 4145 for trunk/LMDZ.COMMON/libf/evolution

Timestamp:

Mar 19, 2026, 2:07:40 PM (3 weeks ago)

Author:

jbclement

Message:

PEM:

• Fix the writing of potential temperature and air mass in "start.nc".
• Add the checking of variable validity when writing a variable in a NetCDF file.

JBC

Location:

trunk/LMDZ.COMMON/libf/evolution

Files:

• atmosphere.F90 (modified) (1 diff)
• changelog.txt (modified) (1 diff)
• clim_state_rec.F90 (modified) (1 diff)
• io_netcdf.F90 (modified) (16 diffs)
• pem.F90 (modified) (1 diff)
• surface.F90 (modified) (1 diff)

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

@@ -470 +470 @@
     do i = 1,nlayer
         call compute_hybrid_sig(sig(i),pa,preff,newsig)
-        bp(i) = exp(1._dp - 1._dp/(newsig**2))
-        ap_l(i) = pa*(newsig - bp(i))
+        bp_l(i) = exp(1._dp - 1._dp/(newsig**2))
+        ap_l(i) = pa*(newsig - bp_l(i))
     end do
     ap_l(nlayer + 1) = 0._dp
-    bp(nlayer + 1) = 0._dp
+    bp_l(nlayer + 1) = 0._dp
 else
     call print_msg('> Defining sigma altitude coordinates',LVL_NFO)
     ap_l(:) = 0._dp
-    bp(1:nlayer) = sig(1:nlayer)
-    bp(nlayer + 1) = 0._dp
+    bp_l(1:nlayer) = sig(1:nlayer)
+    bp_l(nlayer + 1) = 0._dp
 end if
 

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

@@ -930 +930 @@
 == 18/03/2026 == JBC
 Fix to avoid building large temporary arrays in the arguments evaluation of "compute_tendice" which caused memory to stall.
+
+== 19/03/2026 == JBC
+- Fix the writing of potential temperature and air mass in "start.nc".
+- Add the checking of variable validity when writing a variable in a NetCDF file.

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

@@ -98 +98 @@
 
 ! Potential temperature
-call vect2dyngrd(nlon + 1,nlat,ngrid,teta4PCM,var_dyn)
+do l = 1,nlayer
+    call vect2dyngrd(nlon + 1,nlat,ngrid,teta4PCM,var_dyn(:,:,l))
+end do
 call put_var_nc('teta',var_dyn,1)
 
 ! Air mass
-call vect2dyngrd(nlon + 1,nlat,ngrid,air_mass4PCM,var_dyn)
+do l = 1,nlayer
+    call vect2dyngrd(nlon + 1,nlat,ngrid,air_mass4PCM,var_dyn(:,:,l))
+end do
 call put_var_nc('masse',var_dyn,1)
 

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

@@ -45 +45 @@
 integer(di), protected, private :: ncid_file              ! File ID
 integer(di), protected, private :: varid                  ! Variable ID
-integer(di)          :: ncid_diagevo           ! File ID specific to "diagevo.nc"
+integer(di)                     :: ncid_diagevo           ! File ID specific to "diagevo.nc"
 
 ! INTERFACES
@@ -340 +340 @@
 ! CODE
 ! ----
+! Read
 if (present(found)) then
     call check_nc(nf90_inq_varid(ncid_file,var_name,varid),'inquiring '//var_name,found)
@@ -347 +348 @@
     call check_nc(nf90_get_var(ncid_file,varid,var),'getting '//var_name)
 end if
+
+! Check the variable validity
 call check_valid_var_nc(var_name,var)
 
@@ -380 +383 @@
 ! CODE
 ! ----
+! Read
 if (present(found)) then
     call check_nc(nf90_inq_varid(ncid_file,var_name,varid),'inquiring '//var_name,found)
@@ -387 +391 @@
     call check_nc(nf90_get_var(ncid_file,varid,var),'getting '//var_name)
 end if
+
+! Check the variable validity
 call check_valid_var_nc(var_name,var)
 
@@ -420 +426 @@
 ! CODE
 ! ----
+! Read
 if (present(found)) then
     call check_nc(nf90_inq_varid(ncid_file,var_name,varid),'inquiring '//var_name,found)
@@ -427 +434 @@
     call check_nc(nf90_get_var(ncid_file,varid,var),'getting '//var_name)
 end if
+
+! Check the variable validity
 call check_valid_var_nc(var_name,var)
 
@@ -460 +469 @@
 ! CODE
 ! ----
+! Read
 if (present(found)) then
     call check_nc(nf90_inq_varid(ncid_file,var_name,varid),'inquiring '//var_name,found)
@@ -467 +477 @@
     call check_nc(nf90_get_var(ncid_file,varid,var),'getting '//var_name)
 end if
+
+! Check the variable validity
 call check_valid_var_nc(var_name,var)
 
@@ -500 +512 @@
 ! CODE
 ! ----
+! Read
 if (present(found)) then
     call check_nc(nf90_inq_varid(ncid_file,var_name,varid),'inquiring '//var_name,found)
@@ -507 +520 @@
     call check_nc(nf90_get_var(ncid_file,varid,var),'getting '//var_name)
 end if
+
+! Check the variable validity
 call check_valid_var_nc(var_name,var)
 
@@ -546 +561 @@
 ! CODE
 ! ----
+! Check the variable validity
+call check_valid_var_nc(var_name,var)
+
 ! Diagevol logic priority over standard logic
 if (open_diagevo) then
@@ -610 +628 @@
 ! CODE
 ! ----
+! Check the variable validity
+call check_valid_var_nc(var_name,var)
+
 ! Diagevol logic priority over standard logic
 if (open_diagevo) then
@@ -681 +702 @@
 ! CODE
 ! ----
+! Check the variable validity
+call check_valid_var_nc(var_name,var)
+
 ! Diagevol logic priority over standard logic
 if (open_diagevo) then
@@ -752 +776 @@
 ! CODE
 ! ----
+! Check the variable validity
+call check_valid_var_nc(var_name,var)
+
 ! Diagevol logic priority over standard logic
 if (open_diagevo) then
@@ -823 +850 @@
 ! CODE
 ! ----
+! Check the variable validity
+call check_valid_var_nc(var_name,var)
+
 ! Diagevol logic priority over standard logic
 if (open_diagevo) then

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

@@ -29 +29 @@
 use display,            only: print_ini, print_end, print_msg, LVL_NFO, LVL_WRN
 use evolution,          only: n_yr_run, n_yr_sim, ntot_yr_sim, nmax_yr_run, dt, idt, r_plnt2earth_yr, pem_ini_date
-use geometry,           only: ngrid, nslope, nday, nsoil_PCM, nsoil, cell_area, total_surface, nlayer
+use geometry,           only: ngrid, nslope, nday, nsoil_PCM, nsoil, cell_area, total_surface
 use glaciers,           only: h2oice_flow, co2ice_flow, flow_co2glaciers, flow_h2oglaciers
 use ice_table,          only: icetable_equilibrium, icetable_dynamic, evolve_ice_table

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

@@ -316 +316 @@
 ! LOCAL VARIABLES
 ! ---------------
-logical(k4)                         :: here, cst_h2oice_albedo
+logical(k4)                         :: cst_h2oice_albedo
 integer(di)                         :: i, nindex
 real(dp), dimension(:), allocatable :: controle