Changeset 4157 for trunk/LMDZ.COMMON/libf/evolution/xios_data.F90

Timestamp:

Mar 26, 2026, 4:29:10 PM (12 days ago)

Author:

jbclement

Message:

PEM:

• Separate variables ownership between the module "planet" for persistent climate state and the program "pem" for transient workflow logic. It provides a meaningful structure.
• Add lifecycle helpers for clear allocation/deallocation logic.
• Simplify string suffix for slopes variables.

JBC

File:

• trunk/LMDZ.COMMON/libf/evolution/xios_data.F90 (modified) (8 diffs)

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

@@ -72 +72 @@
 real(dp), dimension(:,:,:),   allocatable    :: var_read_3d
 real(dp), dimension(:,:,:,:), allocatable    :: var_read_4d
-character(:),                 allocatable    :: num ! To read slope variables
+character(8)                                 :: num ! Slope suffix to read variables
 
 ! CODE
@@ -81 +81 @@
 minPCM_h2ofrost(:,:,:) = 0._dp
 minPCM_co2frost(:,:,:) = 0._dp
-if (nslope == 1) then ! No slope
-    allocate(character(0) :: num)
-else ! Using slopes
-    allocate(character(8) :: num)
-end if
+num = ''
 
 !~~~~~~~~~~~~~~~~~~~~~~~~ Year 1 - Yearly data ~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -98 +94 @@
 allocate(var_read_2d(nlon,nlat),var_read_3d(nlon,nlat,nsoil_PCM))
 do islope = 1,nslope
-    if (nslope /= 1) then
-        num = '  '
-        write(num,'(i2.2)') islope
-        num = '_slope'//num
+    if (nslope == 1) then
+        num = ''
+    else
+        write(num,'("_slope",i2.2)') islope
     end if
-    call get_var_nc('co2ice'//num,var_read_2d)          ; call lonlat2vect(var_read_2d,minPCM_co2frost(:,islope,1))
-    call get_var_nc('h2o_ice_s'//num,var_read_2d)       ; call lonlat2vect(var_read_2d,minPCM_h2ofrost(:,islope,1))
-    call get_var_nc('watercap'//num,var_read_2d)        ; call lonlat2vect(var_read_2d,minPCM_h2operice(:,islope,1))
-    call get_var_nc('perennial_co2ice'//num,var_read_2d); call lonlat2vect(var_read_2d,minPCM_co2perice(:,islope,1))
-    call get_var_nc('tsurf'//num,var_read_2d)           ; call lonlat2vect(var_read_2d,tsurf_avg_yr1(:,islope))
+    call get_var_nc('co2ice'//trim(num),var_read_2d)          ; call lonlat2vect(var_read_2d,minPCM_co2frost(:,islope,1))
+    call get_var_nc('h2o_ice_s'//trim(num),var_read_2d)       ; call lonlat2vect(var_read_2d,minPCM_h2ofrost(:,islope,1))
+    call get_var_nc('watercap'//trim(num),var_read_2d)        ; call lonlat2vect(var_read_2d,minPCM_h2operice(:,islope,1))
+    call get_var_nc('perennial_co2ice'//trim(num),var_read_2d); call lonlat2vect(var_read_2d,minPCM_co2perice(:,islope,1))
+    call get_var_nc('tsurf'//trim(num),var_read_2d)           ; call lonlat2vect(var_read_2d,tsurf_avg_yr1(:,islope))
 end do
 
@@ -123 +119 @@
 call get_var_nc('ps',var_read_2d); call lonlat2vect(var_read_2d,ps_avg)
 do islope = 1,nslope
-    if (nslope /= 1) then
-        num='  '
-        write(num,'(i2.2)') islope
-        num = '_slope'//num
+    if (nslope == 1) then
+        num = ''
+    else
+        write(num,'("_slope",i2.2)') islope
     end if
-    call get_var_nc('tsurf'//num,var_read_2d)           ; call lonlat2vect(var_read_2d,tsurf_avg(:,islope))
-    call get_var_nc('co2ice'//num,var_read_2d)          ; call lonlat2vect(var_read_2d,minPCM_co2frost(:,islope,2))
-    call get_var_nc('h2o_ice_s'//num,var_read_2d)       ; call lonlat2vect(var_read_2d,minPCM_h2ofrost(:,islope,2))
-    call get_var_nc('watercap'//num,var_read_2d)        ; call lonlat2vect(var_read_2d,minPCM_h2operice(:,islope,2))
-    call get_var_nc('perennial_co2ice'//num,var_read_2d); call lonlat2vect(var_read_2d,minPCM_co2perice(:,islope,2))
+    call get_var_nc('tsurf'//trim(num),var_read_2d)           ; call lonlat2vect(var_read_2d,tsurf_avg(:,islope))
+    call get_var_nc('co2ice'//trim(num),var_read_2d)          ; call lonlat2vect(var_read_2d,minPCM_co2frost(:,islope,2))
+    call get_var_nc('h2o_ice_s'//trim(num),var_read_2d)       ; call lonlat2vect(var_read_2d,minPCM_h2ofrost(:,islope,2))
+    call get_var_nc('watercap'//trim(num),var_read_2d)        ; call lonlat2vect(var_read_2d,minPCM_h2operice(:,islope,2))
+    call get_var_nc('perennial_co2ice'//trim(num),var_read_2d); call lonlat2vect(var_read_2d,minPCM_co2perice(:,islope,2))
     if (do_soil) then
-        call get_var_nc('soiltemp'//num,var_read_3d)
+        call get_var_nc('soiltemp'//trim(num),var_read_3d)
         do isoil = 1,nsoil_PCM
             call lonlat2vect(var_read_3d(:,:,isoil),tsoil_avg(:,isoil,islope))
@@ -141 +137 @@
             tsoil_avg(:,isoil,islope) = tsoil_avg(:,nsoil_PCM,islope) ! Explicit initialization because dimension with size nsoil > nsoil_PCM
         end do
-        call get_var_nc('waterdensity_surface'//num,var_read_2d); call lonlat2vect(var_read_2d,h2o_surfdensity_avg(:,islope))
+        call get_var_nc('waterdensity_surface'//trim(num),var_read_2d); call lonlat2vect(var_read_2d,h2o_surfdensity_avg(:,islope))
     end if
 end do
@@ -173 +169 @@
     h2o_soildensity_avg(:,:,:) = 0._dp
     do islope = 1,nslope
-        if (nslope /= 1) then
-            num='  '
-            write(num,'(i2.2)') islope
-            num = '_slope'//num
+        if (nslope == 1) then
+            num = ''
+        else
+            write(num,'("_slope",i2.2)') islope
         end if
-        call get_var_nc('soiltemp'//num,var_read_4d)
+        call get_var_nc('soiltemp'//trim(num),var_read_4d)
         do iday = 1,nday
             do isoil = 1,nsoil_PCM
@@ -187 +183 @@
             end do
         end do
-        call get_var_nc('waterdensity_soil'//num,var_read_4d)
+        call get_var_nc('waterdensity_soil'//trim(num),var_read_4d)
         do iday = 1,nday
             do isoil = 1,nsoil_PCM
@@ -200 +196 @@
     h2o_soildensity_avg(:,:,:) = h2o_soildensity_avg(:,:,:)/real(nday,dp)
 end if
-deallocate(var_read_1d,var_read_3d,var_read_4d,num)
+deallocate(var_read_1d,var_read_3d,var_read_4d)
 
 ! Close the NetCDF file of XIOS outputs