Changeset 3932 for LMDZ6/trunk/libf

Timestamp:

Jun 11, 2021, 10:55:11 PM (3 years ago)

Author:

oboucher

Message:

Reinstating the reading of parameters for the interactive CO2 configuration that Etienne deleted by mistake :-(

File:

• LMDZ6/trunk/libf/phylmd/conf_phys_m.F90 (modified) (6 diffs)

LMDZ6/trunk/libf/phylmd/conf_phys_m.F90

@@ -27 +27 @@
     USE phys_cal_mod
     USE carbon_cycle_mod,  ONLY: carbon_cycle_tr, carbon_cycle_cpl, carbon_cycle_rad, level_coupling_esm
+    USE carbon_cycle_mod,  ONLY: read_fco2_ocean_cor,var_fco2_ocean_cor
+    USE carbon_cycle_mod,  ONLY: read_fco2_land_cor,var_fco2_land_cor
     USE mod_grid_phy_lmdz, ONLY: klon_glo
     USE print_control_mod, ONLY: lunout
@@ -240 +242 @@
     LOGICAL, SAVE :: carbon_cycle_rad_omp
     INTEGER, SAVE :: level_coupling_esm_omp
+    LOGICAL, SAVE :: read_fco2_ocean_cor_omp
+    REAL, SAVE    :: var_fco2_ocean_cor_omp
+    LOGICAL, SAVE :: read_fco2_land_cor_omp
+    REAL, SAVE    :: var_fco2_land_cor_omp
     LOGICAL, SAVE :: adjust_tropopause_omp
     LOGICAL, SAVE :: ok_daily_climoz_omp
@@ -2302 +2308 @@
     CALL getin('carbon_cycle_rad',carbon_cycle_rad_omp)
 
-    ! >> PC
+    read_fco2_ocean_cor_omp=.FALSE.
+    CALL getin('read_fco2_ocean_cor',read_fco2_ocean_cor_omp)
+
+    var_fco2_ocean_cor_omp=0. ! default value
+    CALL getin('var_fco2_ocean_cor',var_fco2_ocean_cor_omp)
+
+    read_fco2_land_cor_omp=.FALSE.
+    CALL getin('read_fco2_land_cor',read_fco2_land_cor_omp)
+
+    var_fco2_land_cor_omp=0. ! default value
+    CALL getin('var_fco2_land_cor',var_fco2_land_cor_omp)
+
     ! level_coupling_esm : level of coupling of the biogeochemical fields between LMDZ, ORCHIDEE and NEMO
     ! Definitions of level_coupling_esm in physiq.def
@@ -2315 +2332 @@
     level_coupling_esm_omp=0 ! default value
     CALL getin('level_coupling_esm',level_coupling_esm_omp)
-    ! << PC
 
     !$OMP END MASTER
@@ -2592 +2608 @@
     carbon_cycle_rad = carbon_cycle_rad_omp
     level_coupling_esm = level_coupling_esm_omp
+    read_fco2_ocean_cor = read_fco2_ocean_cor_omp
+    var_fco2_ocean_cor = var_fco2_ocean_cor_omp
+    read_fco2_land_cor = read_fco2_land_cor_omp
+    var_fco2_land_cor = var_fco2_land_cor_omp
 
     ! Test of coherence between type_ocean and version_ocean
@@ -2916 +2936 @@
     WRITE(lunout,*) ' carbon_cycle_rad = ', carbon_cycle_rad
     WRITE(lunout,*) ' level_coupling_esm = ', level_coupling_esm
+    WRITE(lunout,*) ' read_fco2_ocean_cor = ', read_fco2_ocean_cor
+    WRITE(lunout,*) ' var_fco2_ocean_cor = ', var_fco2_ocean_cor
+    WRITE(lunout,*) ' read_fco2_land_cor = ', read_fco2_land_cor
+    WRITE(lunout,*) ' var_fco2_land_cor = ', var_fco2_land_cor
     WRITE(lunout,*) ' iflag_tsurf_inlandsis = ', iflag_tsurf_inlandsis
     WRITE(lunout,*) ' iflag_temp_inlandsis = ', iflag_temp_inlandsis