Changeset 2859

Timestamp:

Jan 3, 2023, 4:42:14 PM (2 years ago)

Author:

emillour

Message:

PEM:
Follow-up of r2854: remove added stuff in conf_gcm and make a conf_pem instead in order to preserve a clean seperation between dynamics and PEM.
EM

Location:

trunk/LMDZ.COMMON/libf

Files:

• dyn3d/conf_gcm.F90 (modified) (2 diffs)
• evolution/conf_pem.F90 (added)
• evolution/pem.F90 (modified) (2 diffs)

trunk/LMDZ.COMMON/libf/dyn3d/conf_gcm.F90

@@ -30 +30 @@
                 alphax,alphay,taux,tauy
   USE temps_mod, ONLY: calend
-  USE temps_mod_evol, ONLY: year_bp_ini, dt_pem, alpha_criterion, Max_iter_pem, &
-                evol_orbit_pem
-  USE comsoil_h_pem, only: soil_pem
 
   IMPLICIT NONE
@@ -638 +635 @@
   endif
 !----------------------------------------
-
-!PEM parameter
-  year_bp_ini=0.
-  CALL getin('year_bp_ini', year_bp_ini)
-
-  dt_pem=1
-  CALL getin('dt_pem', dt_pem)
-
-  alpha_criterion=0.2
-  CALL getin('alpha_criterion', alpha_criterion)
-
-  evol_orbit_pem=.false.
-  CALL getin('evol_orbit_pem', evol_orbit_pem)
-
-  Max_iter_pem=99999999
-  CALL getin('Max_iter_pem', Max_iter_pem)
-
-  soil_pem=.true.
-  CALL getin('soil_pem', soil_pem)
 
 !----------------------------------------

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

@@ -84 +84 @@
       USE geometry_mod, only: latitude_deg 
 
+      use conf_pem_mod, only: conf_pem
       use pemredem, only:  pemdem1
       use co2glaciers_mod,only: co2glaciers_evol
@@ -321 +322 @@
 !----------------------------READ run.def ---------------------
       CALL conf_gcm( 99, .TRUE. )
+      CALL conf_pem
 
       call infotrac_init