Changeset 3344 for trunk/LMDZ.MARS

Timestamp:

May 23, 2024, 4:17:52 PM (6 months ago)

Author:

jbclement

Message:

Mars PCM:
Modification of "iniwritesoil.F90": 'nsoilmx' and 'mlayer' are now arguments + making it as a module.
JBC

Location:

trunk/LMDZ.MARS

Files:

• changelog.txt (modified) (1 diff)
• libf/phymars/iniwritesoil.F90 (modified) (6 diffs)
• libf/phymars/writediagsoil.F90 (modified) (2 diffs)

trunk/LMDZ.MARS/changelog.txt

@@ -4649 +4649 @@
 == 23/05/2024 == LL
 Small correction of how qsurf of co2 is initialized in the south pole.
-Some correction for the albedo of co2 ice when using paleoclimate: a uniform value (albedo_co2_cap) is used for both hemisphere for CO2 frost, and a different (higher) value is used for perennial ice. 
+Some correction for the albedo of co2 ice when using paleoclimate: a uniform value (albedo_co2_cap) is used for both hemisphere for CO2 frost, and a different (higher) value is used for perennial ice.
+
+== 23/05/2024 == JBC
+Modification of "iniwritesoil.F90": 'nsoilmx' and 'mlayer' are now arguments + making it as a module.

trunk/LMDZ.MARS/libf/phymars/iniwritesoil.F90

@@ -1 @@
-subroutine iniwritesoil(nid,ngrid,inertia,area,nbplon,nbplat)
+module iniwritesoil_mod
+
+implicit none
+
+contains
+
+subroutine iniwritesoil(nid,ngrid,inertia,area,nbplon,nbplat,nsoilmx,mlayer)
 
 ! initialization routine for 'writediagoil'. Here we create/define
@@ -5 +11 @@
 ! (time-independent) parameters.
 
-use comsoil_h, only: mlayer, nsoilmx
 USE comcstfi_h, only: pi
 USE regular_lonlat_mod, ONLY: lon_reg, lat_reg
@@ -15 +20 @@
 
 ! Arguments:
-integer,intent(in) :: ngrid
-integer,intent(in) :: nid ! NetCDF output file ID
-real,intent(in) :: inertia(nbplon,nbplat,nsoilmx)
-real,intent(in) :: area(nbplon,nbp_lat) ! mesh area (m2)
-integer,intent(in) :: nbplon,nbplat ! sizes of area
+integer, intent(in) :: ngrid
+integer, intent(in) :: nid                  ! NetCDF output file ID
+integer, intent(in) :: nbplon, nbplat       ! sizes of area
+integer, intent(in) :: nsoilmx              ! number of subterranean layers
+real,    intent(in) :: inertia(nbplon,nbplat,nsoilmx)
+real,    intent(in) :: area(nbplon,nbp_lat) ! mesh area (m2)
+real,    intent(in) :: mlayer(nsoilmx)      ! soil mid-layer depths
 
 ! Local variables:
@@ -63 +70 @@
 endif
 ierr=NF_DEF_DIM(nid,"depth",nsoilmx,idim_depth)
-! nsoilmx known from comsoil_h
 if (ierr.ne.NF_NOERR) then
   write(*,*)"iniwritesoil: Error, could not define depth dimension"
@@ -174 +180 @@
 ierr=NF_PUT_VAR_REAL(nid,varid,mlayer)
 #endif
-! Note mlayer(0:nsoilmx-1) known from comsoil_h
 if (ierr.ne.NF_NOERR) then
   write(*,*)"iniwritesoil: Error, could not write depth variable"
@@ -271 +276 @@
 
 end subroutine iniwritesoil
+
+end module iniwritesoil_mod

trunk/LMDZ.MARS/libf/phymars/writediagsoil.F90

@@ -21 +21 @@
 ! Modifs: Aug.2010 Ehouarn: enforce outputs to be real*4
 
-use comsoil_h, only: nsoilmx, inertiedat
+use comsoil_h, only: mlayer, nsoilmx, inertiedat
 use geometry_mod, only: cell_area
 use time_phylmdz_mod, only: ecritphy, day_step, iphysiq
-use mod_phys_lmdz_para, only : is_mpi_root, is_master, gather
-use mod_grid_phy_lmdz, only : klon_glo, Grid1Dto2D_glo, nbp_lon, nbp_lat
-use mod_grid_phy_lmdz, only : grid_type, unstructured
+use mod_phys_lmdz_para, only: is_mpi_root, is_master, gather
+use mod_grid_phy_lmdz, only: klon_glo, Grid1Dto2D_glo, nbp_lon, nbp_lat
+use mod_grid_phy_lmdz, only: grid_type, unstructured
+use iniwritesoil_mod, only: iniwritesoil
 
 implicit none
@@ -154 +155 @@
    ! write "header" of file (longitudes, latitudes, geopotential, ...)
    if (klon_glo>1) then ! general 3D case
-     call iniwritesoil(nid,ngrid,inertia,area,nbp_lon+1,nbp_lat)
+     call iniwritesoil(nid,ngrid,inertia,area,nbp_lon+1,nbp_lat,nsoilmx,mlayer)
    else ! 1D model
-     call iniwritesoil(nid,ngrid,inertiafi_glo(1,:),areafi_glo(1),1,1)
+     call iniwritesoil(nid,ngrid,inertiafi_glo(1,:),areafi_glo(1),1,1,nsoilmx,mlayer)
    endif