Changeset 7264

Timestamp:

2021-07-30T13:50:32+02:00 (3 years ago)

Author:

agnes.ducharne

Message:

Makes all keywords related to SPREAD_PREC include an A in spreAd, cf ticket #730, comment 5 and on. All forms with SPRED_PREC get deprecated. The file orchidee.default is adapted, and now includes info on SPREAD_PREC_SEC and SPREAD_PREC_CONT (only used by new driver). The configurations, however, have not yet been updated (the only committed configuration affected is FG3nd with SPRED_PREC_SEC = 5400).

Location:

branches/ORCHIDEE_2_2/ORCHIDEE

Files:

• orchidee.default (modified) (1 diff)
• src_driver/dim2_driver.f90 (modified) (2 diffs)
• src_driver/forcing_tools.f90 (modified) (4 diffs)

branches/ORCHIDEE_2_2/ORCHIDEE/orchidee.default

@@ -51 +51 @@
 RELAX_A =  1.0 
 
-# SPRED_PREC ([-]) :  Spread the precipitation.         {[-]}
-SPRED_PREC =  Half of the forcing time step or uniform, depending on dt_force and dt_sechiba 
-
-# ATM_CO2 ([ppm]) :  Value to precribe atmosoheric CO2  {[FORCE_CO2_VEG=y or Offline mode]}
+# SPREAD_PREC ([-]) :  On how long we spread the precipitation, value in nb of dt_sechiba       {[-]}
+SPREAD_PREC =  Half of the forcing time step or uniform, depending on dt_force (greater than 3h or not, respectively)
+
+# SPREAD_PREC_SEC ([s]) : On how long we spread the precipitation, value in seconds {NEW_DRIVER}
+# If this keyword is not set, SPREAD_PREC is used, whether defined in run.def or by default
+SPREAD_PREC_SEC = 3600
+
+# SPREAD_PREC_CONT ([s]) : Makes the spreading uniform if it still rains at following forcing time step {NEW_DRIVER}
+SPREAD_PREC_CONT = n
+
+# ATM_CO2 ([ppm]) :  Value to precribe atmospheric CO2  {[FORCE_CO2_VEG=y or Offline mode]}
 ATM_CO2 =  350. 
 

branches/ORCHIDEE_2_2/ORCHIDEE/src_driver/dim2_driver.f90

@@ -623 +623 @@
   ENDIF
 
-  !Config Key   = SPRED_PREC
+  !Config Key   = SPREAD_PREC
   !Config Desc  = Spread the precipitation.
   !Config If    = [-]
   !Config Def   = Half of the forcing time step or uniform, depending on dt_force and dt_sechiba
-  !Config Help  = Spread the precipitation over SPRED_PREC steps of the splited forcing 
+  !Config Help  = Spread the precipitation over SPREAD_PREC steps of the splited forcing 
   !Config         time step. This ONLY applied if the forcing time step has been splited.
   !Config         If the value indicated is greater than SPLIT_DT, SPLIT_DT is used for it.
@@ -640 +640 @@
   END IF
 
-  CALL getin_p('SPRED_PREC', nb_spread)  
+  CALL getin_p('SPREAD_PREC', nb_spread)  
   IF (nb_spread > split) THEN
     WRITE(numout,*) 'WARNING : nb_spread is too large it will be '

branches/ORCHIDEE_2_2/ORCHIDEE/src_driver/forcing_tools.f90

@@ -987 +987 @@
 !>\BRIEF      Spreads the precipitation over the interval chosen based on the interval chosen by the user.
 !!
-!! DESCRIPTION: The behaviour of this routine is controlled by the parameter SPRED_PREC_SEC in the run.def.
+!! DESCRIPTION: The behaviour of this routine is controlled by the parameter SPREAD_PREC_SEC in the run.def.
 !!              The time in second specified by the user will be the one over which the precipitation will last
 !!              where the forcing interval has rain or snow.
@@ -1026 +1026 @@
     !
     IF ( first_call_spreadprec ) THEN
-       !Config Key   = SPRED_PREC
+       !Config Key   = SPREAD_PREC
        !Config Desc  = Spread the precipitation.
        !Config If    = [-]
        !Config Def   = Half of the forcing time step or uniform, depending on dt_force and dt_sechiba
-       !Config Help  = Spread the precipitation over SPRED_PREC steps of the splited forcing 
+       !Config Help  = Spread the precipitation over SPREAD_PREC steps of the splited forcing 
        !Config         time step. This ONLY applied if the forcing time step has been splited.
        !Config         If the value indicated is greater than SPLIT_DT, SPLIT_DT is used for it.
@@ -1036 +1036 @@
        !-
        nb_spread = -1
-       CALL getin_p('SPRED_PREC', nb_spread)
+       CALL getin_p('SPREAD_PREC', nb_spread)
        !
        ! Test if we have read the number of time steps to spread in run.def
@@ -1046 +1046 @@
           !Config Def   = 3600
           !Config Help  = Spread the precipitation over n seconds of the forcing time step
-          !Config         interval. This ONLY applies when the SPRED_PREC_SEC is smaller than
-          !Config         the forcing time step. Should the user set SPRED_PREC_SEC=0 we will 
+          !Config         interval. This ONLY applies when the SPREAD_PREC_SEC is smaller than
+          !Config         the forcing time step. Should the user set SPREAD_PREC_SEC=0 we will 
           !Config         assume that the rainfall is uniformely distributed over the forcing interval.
           !Config Units = seconds
           !
-          ! This is the default should 'SPRED_PREC' not be present in the run.def
+          ! This is the default should 'SPREAD_PREC' not be present in the run.def
           !
           time_to_spread = forcing_tstep_ave/2.0
           !
-          CALL getin_p('SPRED_PREC_SEC', time_to_spread)
-          IF ( time_to_spread == forcing_tstep_ave/2.0 ) THEN
-             ! If we still have the default value, check if the
-             ! keyword does not exist with the right spelling.
-             CALL getin_p('SPREAD_PREC_SEC', time_to_spread)
-          ENDIF
+          CALL getin_p('SPREAD_PREC_SEC', time_to_spread)
+          !
        ELSE
           time_to_spread = dt_sechiba_keep * nb_spread