Changeset 3851 for LMDZ6/branches/LMDZ-tracers/libf/phylmd/conf_phys_m.F90

Timestamp:

Feb 22, 2021, 12:44:07 PM (4 years ago)

Author:

dcugnet

Message:

Update the branch to the current trunk.

Location:

LMDZ6/branches/LMDZ-tracers

Files:

• . (modified) (1 prop)
• libf/phylmd/conf_phys_m.F90 (modified) (8 diffs)

LMDZ6/branches/LMDZ-tracers/libf/phylmd/conf_phys_m.F90

@@ -29 +29 @@
     USE mod_grid_phy_lmdz, ONLY: klon_glo
     USE print_control_mod, ONLY: lunout
+    use config_ocean_skin_m, only: config_ocean_skin
     USE phys_state_var_mod, ONLY: phys_tstep
 
@@ -86 +87 @@
     CHARACTER (len = 10),SAVE  :: type_veget_omp
     CHARACTER (len = 8), SAVE  :: aer_type_omp
-    LOGICAL, SAVE       :: ok_snow_omp
+    INTEGER, SAVE       :: landice_opt_omp
+    INTEGER, SAVE       :: n_dtis_omp
+    INTEGER, SAVE       :: iflag_tsurf_inlandsis_omp
+    INTEGER, SAVE       :: iflag_albzenith_omp    
+    LOGICAL, SAVE       :: SnoMod_omp,BloMod_omp,ok_outfor_omp
     LOGICAL, SAVE       :: ok_newmicro_omp
     LOGICAL, SAVE       :: ok_all_xml_omp
@@ -318 +323 @@
     !
 
-    ! Martin
-    !Config Key  = ok_snow
-    !Config Desc = Flag to activate snow model SISVAT
-    !Config Def  = .FALSE.
-    ok_snow_omp = .FALSE.
-    CALL getin('ok_snow', ok_snow_omp)
-    ! Martin
-
+    ! INLANDSIS
+    !==================================================================
+    ! Martin et Etienne
+    !Config Key  = landice_opt
+    !Config Desc = which landice snow model (BULK, SISVAT or INLANDSIS)
+    !Config Def  = 0
+    landice_opt_omp = 0
+    CALL getin('landice_opt', landice_opt_omp)
+    ! Martin et Etienne
+
+    !Etienne
+    !Config Key  = iflag_tsurf_inlandsis
+    !Config Desc = which method to calculate tsurf in INLANDSIS
+    !Config Def  = 0
+    iflag_tsurf_inlandsis_omp = 0
+    CALL getin('iflag_tsurf_inlandsis', iflag_tsurf_inlandsis_omp)
+
+    !Etienne
+    !Config Key  = iflag_albzenith
+    !Config Desc = method to account for albedo sensitivity to solar zenith angle
+    !Config Def  = 0
+    iflag_albzenith_omp = 0
+    CALL getin('iflag_albzenith', iflag_albzenith_omp)
+
+    !Etienne
+    !Config Key  = n_dtis
+    !Config Desc = number of subtimesteps for INLANDSIS
+    !Config Def  = 1
+    n_dtis_omp = 1
+    CALL getin('n_dtis', n_dtis_omp)
+
+    !Etienne
+    !Config Key  = SnoMod
+    !Config Desc = activation of snow modules in inlandsis
+    !Config Def  = 1
+    SnoMod_omp = .TRUE.
+    CALL getin('SnoMod', SnoMod_omp)
+
+    !Etienne
+    !Config Key  = BloMod
+    !Config Desc = activation of blowing snow in inlandsis
+    !Config Def  = 1
+    BloMod_omp = .FALSE.
+    CALL getin('BloMod', BloMod_omp)
+
+    !Etienne
+    !Config Key  = ok_outfor
+    !Config Desc = activation of output ascii file in inlandsis
+    !Config Def  = 1
+   ok_outfor_omp = .FALSE.
+    CALL getin('ok_outfor', ok_outfor_omp)
+
+
+
+    !==================================================================
+    
     !Config Key  = OK_journe
     !Config Desc = Pour des sorties journalieres 
@@ -2291 +2344 @@
        ok_veget=.FALSE.
     ENDIF
-    ! Martin
-    ok_snow = ok_snow_omp
-    ! Martin
-
+    ! SISVAT and INLANDSIS
+    !=================================================
+    landice_opt = landice_opt_omp
+    iflag_tsurf_inlandsis = iflag_tsurf_inlandsis_omp
+    iflag_albzenith = iflag_albzenith_omp
+    n_dtis=n_dtis_omp
+    SnoMod=SnoMod_omp
+    BloMod=BloMod_omp
+    ok_outfor=ok_outfor_omp
+    !=================================================
     ok_all_xml = ok_all_xml_omp
     ok_lwoff = ok_lwoff_omp
@@ -2486 +2545 @@
     ENDIF
 
-    ! Test sur new_aod. Ce flag permet de retrouver les resultats de l'AR4
-    ! il n'est utilisable que lors du couplage avec le SO4 seul 
+    ! Flag_aerosol cannot be set to zero if aerosol direct effect (ade) or aerosol indirect effect (aie) are activated
     IF (ok_ade .OR. ok_aie) THEN 
        IF ( flag_aerosol .EQ. 0 ) THEN
@@ -2494 +2552 @@
     ENDIF
 
-    ! Flag_aerosol cannot be to zero if we are in coupled mode for aerosol
+    ! Flag_aerosol cannot be set to zero if we are in coupled mode for aerosol
     IF (aerosol_couple .AND. flag_aerosol .EQ. 0 ) THEN
        CALL abort_physic('conf_phys', 'flag_aerosol cannot be to zero if aerosol_couple=y ', 1)
     ENDIF
 
-    ! Read_climoz need to be zero if we are in couple mode for chemistry 
+    ! Read_climoz needs to be set zero if we are in couple mode for chemistry 
     IF (chemistry_couple .AND. read_climoz .ne. 0) THEN 
        CALL abort_physic('conf_phys', 'read_climoz need to be to zero if chemistry_couple=y ', 1) 
@@ -2555 +2613 @@
     WRITE(lunout,*) ' Version ocean = ', version_ocean
     WRITE(lunout,*) ' Config veget = ', ok_veget,type_veget
-    WRITE(lunout,*) ' Snow model SISVAT : ok_snow = ', ok_snow
+    WRITE(lunout,*) ' Snow model landice : landice_opt = ', landice_opt
     WRITE(lunout,*) ' Config xml pour XIOS : ok_all_xml = ', ok_all_xml
     WRITE(lunout,*) ' Sortie journaliere = ', ok_journe
@@ -2754 +2812 @@
     WRITE(lunout,*) ' carbon_cycle_rad = ', carbon_cycle_rad
     WRITE(lunout,*) ' level_coupling_esm = ', level_coupling_esm
+    WRITE(lunout,*) ' iflag_tsurf_inlandsis = ', iflag_tsurf_inlandsis
+    WRITE(lunout,*) ' iflag_albzenith = ', iflag_albzenith
+    WRITE(lunout,*) ' n_dtis = ', n_dtis
+    WRITE(lunout,*) ' SnoMod = ', SnoMod
+    WRITE(lunout,*) ' BloMod = ', BloMod
+    WRITE(lunout,*) ' ok_outfor = ', ok_outfor
+
 
     !$OMP END MASTER
-
-    RETURN
+    call config_ocean_skin
 
   END SUBROUTINE conf_phys