Changeset 7508 for branches/ORCHIDEE_2_2/ORCHIDEE/src_parameters

Timestamp:

2022-03-04T12:18:30+01:00 (2 years ago)

Author:

josefine.ghattas

Message:

• Removed DRY_SOIL_HEAT_COND and related variable so_cond_dry
• Replaced previous scalar variable so_capa_dry with vector variable so_capa_dry_ns and moved read from run.def to thermosoil. In the end, so_capa_dry_ns is renamed so_capa_dry.

See ticket #780

No change in results.

Location:

branches/ORCHIDEE_2_2/ORCHIDEE/src_parameters

Files:

• constantes_soil.f90 (modified) (1 diff)
• constantes_soil_var.f90 (modified) (2 diffs)

branches/ORCHIDEE_2_2/ORCHIDEE/src_parameters/constantes_soil.f90

@@ -70 +70 @@
     ! Following initializations are only done for option impose_param
     IF ( ok_sechiba .AND. impose_param ) THEN
-
-       !Config Key   = DRY_SOIL_HEAT_CAPACITY
-       !Config Desc  = Dry soil Heat capacity of soils
-       !Config If    = OK_SECHIBA 
-       !Config Def   = 1.80e+6
-       !Config Help  = Values taken from : PIELKE,'MESOSCALE METEOROLOGICAL MODELING',P.384.
-       !Config Units = [J.m^{-3}.K^{-1}] 
-       CALL getin_p("DRY_SOIL_HEAT_CAPACITY",so_capa_dry)
-
-       !! Check parameter value (correct range)
-       IF ( so_capa_dry <= zero ) THEN
-          CALL ipslerr_p(error_level, "config_soil_parameters.", &
-               &     "Wrong parameter value for DRY_SOIL_HEAT_CAPACITY.", &
-               &     "This parameter should be positive. ", &
-               &     "Please, check parameter value in run.def. ")
-       END IF
-
-
-       !Config Key   = DRY_SOIL_HEAT_COND
-       !Config Desc  = Dry soil Thermal Conductivity of soils
-       !Config If    = OK_SECHIBA
-       !Config Def   = 0.40 
-       !Config Help  = Values taken from : PIELKE,'MESOSCALE METEOROLOGICAL MODELING',P.384.
-       !Config Units = [W.m^{-2}.K^{-1}] 
-       CALL getin_p("DRY_SOIL_HEAT_COND",so_cond_dry)
-
-       !! Check parameter value (correct range)
-       IF ( so_cond_dry <= zero ) THEN
-          CALL ipslerr_p(error_level, "config_soil_parameters.", &
-               &     "Wrong parameter value for DRY_SOIL_HEAT_COND.", &
-               &     "This parameter should be positive. ", &
-               &     "Please, check parameter value in run.def. ")
-       END IF
-
 
        !Config Key   = SNOW_HEAT_COND

branches/ORCHIDEE_2_2/ORCHIDEE/src_parameters/constantes_soil_var.f90

@@ -75 +75 @@
 
   !! Parameters for soil thermodynamics
-
-  REAL(r_std), SAVE :: so_capa_dry = 1.80e+6            !! Dry soil Heat capacity of soils 
-                                                        !! @tex $(J.m^{-3}.K^{-1})$ @endtex 
-!$OMP THREADPRIVATE(so_capa_dry)
-  REAL(r_std), SAVE :: so_cond_dry = 0.40               !! Dry soil Thermal Conductivity of soils
-                                                        !! @tex $(W.m^{-2}.K^{-1})$ @endtex
-!$OMP THREADPRIVATE(so_cond_dry)
   REAL(r_std), SAVE :: sn_cond = 0.3                    !! Thermal Conductivity of snow 
                                                         !! @tex $(W.m^{-2}.K^{-1})$ @endtex  
@@ -206 +199 @@
 &     0.25_r_std /)  ! oxisols                 
 
-  REAL(r_std),PARAMETER,DIMENSION(nscm_usda) :: so_capa_dry_ns_usda = &  !! Dry soil Heat capacity of soils,J.m^{-3}.K^{-1}
+  REAL(r_std),PARAMETER,DIMENSION(nscm_usda) :: so_capa_dry_usda = &     !! Dry soil Heat capacity of soils,J.m^{-3}.K^{-1}
  & (/ 1.47e+6_r_std, 1.41e+6_r_std, 1.34e+6_r_std, 1.27e+6_r_std, &      !! Pielke [2002, 2013]
  &    1.21e+6_r_std, 1.21e+6_r_std, 1.18e+6_r_std, 1.32e+6_r_std, &