Changeset 3002 for trunk

Timestamp:

Jul 20, 2023, 11:01:17 AM (16 months ago)

Author:

llange

Message:

MARS PEM

• Fix a bug in conf_pem ("Flux_geo" was expected in the .def while it should be 'fluxgeo', corrected)
• Fix a bug in glaciers modules (the length for 'name_ice' was too large)
• Fix a bug when writing tsoil in the PEM (ngrid x nsoil_PEM x nslope was given, while it was expecting a ngrid x nsoil_GCM x nslope)

PEM runs correctly now
LL

Location:

trunk/LMDZ.COMMON/libf/evolution

Files:

• conf_pem.F90 (modified) (2 diffs)
• glaciers_mod.F90 (modified) (6 diffs)
• pem.F90 (modified) (3 diffs)

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

@@ -90 +90 @@
 
   fluxgeo = 0.
-  CALL getin('Fluxgeo_PEM',fluxgeo)
+  CALL getin('fluxgeo',fluxgeo)
   print*,'Flux Geothermal is set to',fluxgeo
    
@@ -108 +108 @@
    CALL getin('icetable_dynamic',icetable_dynamic)
    print*, 'Do we compute the ice table with the dynamic method?', icetable_dynamic
-
   if ((.not.soil_pem).and.((icetable_equilibrium).or.(icetable_dynamic))) then
        print*,'Ice table  must be used when soil_pem = T'

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

@@ -57 +57 @@
 
       call transfer_ice_duringflow(ngrid,nslope,iflat, subslope_dist,def_slope_mean,hmax,Tcond,"co2",co2ice,flag_co2flow,flag_co2flow_mesh)
-   RETURN
+   RETURN   
 end subroutine
 
@@ -96 +96 @@
 
       call compute_hmaxglaciers(ngrid,nslope,iflat,def_slope_mean,Tice,"h2o",hmax)
-
       call transfer_ice_duringflow(ngrid,nslope,iflat, subslope_dist,def_slope_mean,hmax,Tice,"h2o",h2oice,flag_h2oflow,flag_h2oflow_mesh)
 
@@ -127 +126 @@
       REAL,INTENT(IN) :: def_slope_mean(nslope) ! Slope field: Values of the subgrid slope angles [deg]
       REAL,INTENT(IN) :: Tice(ngrid,nslope)     ! Physical field:  ice temperature [K]
-      character(len=30), INTENT(IN) :: name_ice ! Nature of the ice
+      character(len=3), INTENT(IN) :: name_ice ! Nature of the ice
 ! Outputs
       REAL,INTENT(OUT) :: hmax(ngrid,nslope) ! Physical grid x Slope field: maximum  thickness before flaw [m]
@@ -135 +134 @@
       INTEGER :: ig,islope ! loop variables
       REAL :: slo_angle
-
 
 ! 1. Compute rho
@@ -198 +196 @@
       REAL, INTENT(IN) :: hmax(ngrid,nslope)            ! maximum height of the  glaciers before initiating flow [m]
       REAL, INTENT(IN) :: Tice(ngrid,nslope)            ! Ice temperature[K]
-      character(len=30), INTENT(IN) :: name_ice              ! Nature of the ice
+      character(len=3), INTENT(IN) :: name_ice              ! Nature of the ice
 
 ! Outputs
@@ -208 +206 @@
       REAL rho(ngrid,nslope) ! density of ice, temperature dependant [kg/m^3]
       INTEGER iaval ! ice will be transfered here
-
-
 
 ! 0. Compute rho

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

@@ -839 +839 @@
      enddo
      print *, 'Global average pressure old time step',global_ave_press_old
-
      call WRITEDIAGFI(ngrid,'ps_ave','Global average pressure','Pa',0,global_ave_press_new)
      
@@ -949 +948 @@
         call h2oglaciers_evol(timelen,ngrid,nslope,iflat,subslope_dist,def_slope_mean,tsurf_ave,qsurf(:,igcm_h2o_ice,:),flag_h2oflow,flag_h2oflow_mesh)
       endif
-
      DO islope=1, nslope
        write(str2(1:2),'(i2.2)') islope
@@ -1233 +1231 @@
    if(soil_pem) then
      call interpolate_TIPEM_TIGCM(ngrid,nslope,nsoilmx_PEM,nsoilmx,TI_PEM,inertiesoil)
-     tsoil(:,:,:) = tsoil_phys_PEM_timeseries(:,:,:,timelen)      
+     tsoil(:,:,:) = tsoil_phys_PEM_timeseries(:,1:nsoilmx,:,timelen)      
    endif !soil_pem