Changeset 3989 for trunk/LMDZ.COMMON/libf/evolution/layered_deposits.F90

Timestamp:

Dec 11, 2025, 12:56:05 PM (6 weeks ago)

Author:

jbclement

Message:

PEM:
Massive structural refactor of the PEM codebase for improved readability, consistency and maintainability. The goal is to modernize, standardize and consolidate the code while removing legacy complexity. In detail, this change:

• Performs large-scale cleanup removing unused code, obsolete routines, duplicated functionality and deprecated initialization logic;
• Removes "*_mod" wrappers;
• Replaces mixed naming conventions with clearer variable names, domain-based file/module names and purpose-based routine names;
• Adds native reading/writing capabilities to the PEM removing the cumbersome dependency on Mars PCM subroutines;
• Centralizes soil/ice/orbital/PEM configuration logic into dedicated modules;
• Simplifies routines and updates calls/interfaces to match the new structure.

This refactor significantly clarifies the codebase and provides a cleaner foundation for forthcoming developments.
JBC

File:

• trunk/LMDZ.COMMON/libf/evolution/layered_deposits.F90 (moved) (moved from trunk/LMDZ.COMMON/libf/evolution/layering_mod.F90) (13 diffs)

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

@@ -1 @@
-MODULE layering_mod
+MODULE layered_deposits
 
 !=======================================================================
@@ -8 +8 @@
 !=======================================================================
 
-use glaciers_mod, only: rho_co2ice, rho_h2oice
+use surf_ice, only: rho_co2ice, rho_h2oice
 
 implicit none
@@ -76 +76 @@
 !     > print_layering
 !     > get_nb_str_max
-!     > stratif2array
-!     > array2stratif
+!     > map2array
+!     > array2map
 !     > print_layerings_map
 ! Procedures to get information about a stratum:
@@ -277 +277 @@
 SUBROUTINE ini_layering(this)
 
-use comsoil_h_PEM, only: soil_pem, nsoilmx_PEM, layer_PEM, index_breccia, index_bedrock
+use soil, only: do_soil, nsoilmx_PEM, layer_PEM, index_breccia, index_bedrock
 
 implicit none
@@ -290 +290 @@
 !---- Code
 ! Creation of strata at the bottom of the layering to describe the sub-surface
-if (soil_pem) then
+if (do_soil) then
     do i = nsoilmx_PEM,index_bedrock,-1
         h_soil = layer_PEM(i) - layer_PEM(i - 1) ! No porosity
@@ -391 +391 @@
 !=======================================================================
 ! To convert the layerings map into an array able to be outputted
-SUBROUTINE stratif2array(layerings_map,ngrid,nslope,stratif_array)
+SUBROUTINE map2array(layerings_map,ngrid,nslope,layerings_array)
 
 implicit none
@@ -398 +398 @@
 integer,                                 intent(in) :: ngrid, nslope
 type(layering), dimension(ngrid,nslope), intent(in) :: layerings_map
-real, dimension(:,:,:,:), allocatable, intent(inout) :: stratif_array
+real, dimension(:,:,:,:), allocatable, intent(inout) :: layerings_array
 
 !---- Local variables
@@ -405 +405 @@
 
 !---- Code
-stratif_array = 0.
+layerings_array = 0.
 do islope = 1,nslope
     do ig = 1,ngrid
@@ -411 +411 @@
         k = 1
         do while (associated(current))
-            stratif_array(ig,islope,k,1) = current%top_elevation
-            stratif_array(ig,islope,k,2) = current%h_co2ice
-            stratif_array(ig,islope,k,3) = current%h_h2oice
-            stratif_array(ig,islope,k,4) = current%h_dust
-            stratif_array(ig,islope,k,5) = current%h_pore
-            stratif_array(ig,islope,k,6) = current%poreice_volfrac
+            layerings_array(ig,islope,k,1) = current%top_elevation
+            layerings_array(ig,islope,k,2) = current%h_co2ice
+            layerings_array(ig,islope,k,3) = current%h_h2oice
+            layerings_array(ig,islope,k,4) = current%h_dust
+            layerings_array(ig,islope,k,5) = current%h_pore
+            layerings_array(ig,islope,k,6) = current%poreice_volfrac
             current => current%up
             k = k + 1
@@ -423 +423 @@
 enddo
 
-END SUBROUTINE stratif2array
+END SUBROUTINE map2array
 
 !=======================================================================
 ! To convert the stratification array into the layerings map
-SUBROUTINE array2stratif(stratif_array,ngrid,nslope,layerings_map)
+SUBROUTINE array2map(layerings_array,ngrid,nslope,layerings_map)
 
 implicit none
@@ -433 +433 @@
 !---- Arguments
 integer,                               intent(in) :: ngrid, nslope
-real, dimension(:,:,:,:), allocatable, intent(in) :: stratif_array
+real, dimension(:,:,:,:), allocatable, intent(in) :: layerings_array
 type(layering), dimension(ngrid,nslope), intent(inout) :: layerings_map
 
@@ -442 +442 @@
 do islope = 1,nslope
     do ig = 1,ngrid
-        do k = 1,size(stratif_array,3)
-            call add_stratum(layerings_map(ig,islope),stratif_array(ig,islope,k,1),stratif_array(ig,islope,k,2),stratif_array(ig,islope,k,3),stratif_array(ig,islope,k,4),stratif_array(ig,islope,k,5),stratif_array(ig,islope,k,6))
+        do k = 1,size(layerings_array,3)
+            call add_stratum(layerings_map(ig,islope),layerings_array(ig,islope,k,1),layerings_array(ig,islope,k,2),layerings_array(ig,islope,k,3),layerings_array(ig,islope,k,4),layerings_array(ig,islope,k,5),layerings_array(ig,islope,k,6))
         enddo
     enddo
 enddo
 
-END SUBROUTINE array2stratif
+END SUBROUTINE array2map
 
 !=======================================================================
@@ -1018 +1018 @@
 END SUBROUTINE make_layering
 
-END MODULE layering_mod
+END MODULE layered_deposits