Changeset 7508 for branches/ORCHIDEE_2_2/ORCHIDEE/src_sechiba/thermosoil.f90

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.

File:

• branches/ORCHIDEE_2_2/ORCHIDEE/src_sechiba/thermosoil.f90 (modified) (7 diffs)

branches/ORCHIDEE_2_2/ORCHIDEE/src_sechiba/thermosoil.f90

@@ -154 +154 @@
   REAL(r_std), ALLOCATABLE, SAVE, DIMENSION (:)   :: QZ                       !! quartz content [-]
 !$OMP THREADPRIVATE(QZ)
-  REAL(r_std), ALLOCATABLE, SAVE, DIMENSION (:)   :: so_capa_dry_ns           !! Dry soil Heat capacity of soils,J.m^{-3}.K^{-1} 
-!$OMP THREADPRIVATE(so_capa_dry_ns)
+  REAL(r_std), ALLOCATABLE, SAVE, DIMENSION (:)   :: so_capa_dry              !! Dry soil Heat capacity of soils,J.m^{-3}.K^{-1} 
+!$OMP THREADPRIVATE(so_capa_dry)
   REAL(r_std), ALLOCATABLE, SAVE, DIMENSION (:)   :: so_capa_ice              !! Heat capacity of saturated frozen soil (J/K/m3)
 !$OMP THREADPRIVATE(so_capa_ice)   
@@ -372 +372 @@
     IF (ier /= 0) CALL ipslerr_p(3,'thermosoil_initialize', 'Error in allocation of QZ','','')
 
-    ALLOCATE (so_capa_dry_ns(nscm),stat=ier)
-    IF (ier /= 0) CALL ipslerr_p(3,'thermosoil_initialize', 'Error in allocation of so_capa_dry_ns','','')
+    ALLOCATE (so_capa_dry(nscm),stat=ier)
+    IF (ier /= 0) CALL ipslerr_p(3,'thermosoil_initialize', 'Error in allocation of so_capa_dry','','')
     
     ALLOCATE (so_capa_ice(kjpindex),stat=ier)
@@ -381 +381 @@
     !! Soil texture choose : Now useless since njsc defines the dominant texture within 13 classes whichever the soil map
     QZ(:) = QZ_usda(:)
-    so_capa_dry_ns(:) = so_capa_dry_ns_usda(:)
-    
+    so_capa_dry(:) = so_capa_dry_usda(:)
+    
+    !Config Key   = DRY_SOIL_HEAT_CAPACITY
+    !Config Desc  = Dry soil Heat capacity of soils
+    !Config If    = OK_SECHIBA
+    !Config Def   = (1.47, 1.41, 1.34, 1.27, 1.21, 1.21, 1.18, 1.32, 1.23, 1.18, 1.15, 1.09, 1.09)*e+6
+    !Config Help  = Values taken from : Pielke [2002, 2013]
+    !Config Units = [J.m^{-3}.K^{-1}] 
+    CALL getin_p("DRY_SOIL_HEAT_CAPACITY",so_capa_dry)
+    
+    !! Check parameter value (correct range)
+    IF ( MINVAL(so_capa_dry(:)) <= zero ) THEN
+       CALL ipslerr_p(3, "thermosoil_initialize", &
+            "Wrong parameter value for DRY_SOIL_HEAT_CAPACITY.", &
+            "This parameter should be positive. ", &
+            "Please, check parameter value in run.def or orchidee.def. ")
+    END IF
+
+
     !! 2. Initialize variable from restart file or with default values 
     
@@ -1627 +1644 @@
       DO jg = 1, ngrnd
          jst = njsc(ji)
-         pcapa_tmp(ji, jg) = so_capa_dry_ns(jst) * (1-mcs(ji)) + water_capa * tmc_layt(ji,jg)/mille/dlt(jg)
+         pcapa_tmp(ji, jg) = so_capa_dry(jst) * (1-mcs(ji)) + water_capa * tmc_layt(ji,jg)/mille/dlt(jg)
          !
          ! 2. Calculate volumetric heat capacity with allowance for permafrost
@@ -1638 +1655 @@
             profil_froz(ji,jg) = 1.
             pcappa_supp(ji,jg)= 0.
-            pcapa(ji, jg) = so_capa_dry_ns(jst) * (1-mcs(ji)) + so_capa_ice(ji) * tmc_layt(ji,jg) / mille / dlt(jg)
+            pcapa(ji, jg) = so_capa_dry(jst) * (1-mcs(ji)) + so_capa_ice(ji) * tmc_layt(ji,jg) / mille / dlt(jg)
             rho_tot = rho_soil * (1-mcs(ji)) + rho_ice * tmc_layt(ji,jg) / mille / dlt(jg) 
             pcapa_spec(ji, jg) = pcapa(ji, jg) / rho_tot
@@ -1655 +1672 @@
 
            IF (ok_freeze_thaw_latent_heat) THEN
-              pcapa(ji, jg) = so_capa_dry_ns(jst) * (1-mcs(ji)) + &
+              pcapa(ji, jg) = so_capa_dry(jst) * (1-mcs(ji)) + &
                 water_capa * tmc_layt(ji,jg)/mille / dlt(jg) * xx + &
                 so_capa_ice(ji) * tmc_layt(ji,jg) / mille/dlt(jg) * (1.-xx) + &
                 shum_ngrnd_perma(ji,jg)*mcs(ji)*lhf*rho_water/fr_dT
            ELSE
-              pcapa(ji, jg) = so_capa_dry_ns(jst) * (1-mcs(ji)) + &
+              pcapa(ji, jg) = so_capa_dry(jst) * (1-mcs(ji)) + &
                 water_capa * tmc_layt(ji,jg)/mille / dlt(jg) * xx + &
                 so_capa_ice(ji) * tmc_layt(ji,jg) / mille/dlt(jg) * (1.-xx)
@@ -1752 +1769 @@
          DO ji = 1,kjpindex
             jst = njsc(ji)
-            pcapa_tmp(ji, jg) = so_capa_dry_ns(jst) * (1-mcs(ji)) + water_capa * tmc_layt(ji,jg)/mille/dlt(jg)
+            pcapa_tmp(ji, jg) = so_capa_dry(jst) * (1-mcs(ji)) + water_capa * tmc_layt(ji,jg)/mille/dlt(jg)
             pcapa(ji,jg) = pcapa_tmp(ji, jg)
             pcapa_en(ji,jg) = pcapa_tmp(ji, jg)