Changeset 7709 for branches/ORCHIDEE_2_2/ORCHIDEE/src_sechiba/routing_wrapper.f90

Timestamp:

2022-07-20T11:30:43+02:00 (2 years ago)

Author:

josefine.ghattas

Message:

Integrated new irrigation scheme developed by Pedro Arboleda. See ticket #857
This corresponds to revsion 7708 of version pedro.arboleda/ORCHIDEE. Following differences were made but were not made on the pedro.arboleda/ORCHIDEE :

• argumet place in call to routing_wrapper_intialize changed order
• lines with only change in space were not taken
• some indentation changed
• set irrigation output as enalbled false if not do_irrigation

File:

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

branches/ORCHIDEE_2_2/ORCHIDEE/src_sechiba/routing_wrapper.f90

@@ -35 +35 @@
   USE routing_highres
   USE routing_simple
+  USE constantes_soil
 
   IMPLICIT NONE
@@ -100 +101 @@
        rest_id,     hist_id,        hist2_id,   lalo,      &
        neighbours,  resolution,     contfrac,   stempdiag, &
+       soiltile,    irrig_frac,     veget_max,  irrigated_next, &    
        returnflow,  reinfiltration, irrigation, riverflow, &
        coastalflow, flood_frac,     flood_res )
+       
 
 
@@ -118 +121 @@
     REAL(r_std), INTENT(in)        :: contfrac(nbpt)       !! Fraction of land in each grid box (unitless;0-1)
     REAL(r_std), INTENT(in)        :: stempdiag(nbpt,nslm) !! Diagnostic soil temperature profile
+    REAL(r_std), INTENT(in)        :: soiltile(nbpt,nstm)  !! Fraction of each soil tile within vegtot (0-1, unitless)
+    REAL(r_std), INTENT(in)        :: veget_max(nbpt,nvm)  !! Maximal fraction of vegetation (unitless;0-1) !
+    REAL(r_std), INTENT(in)        :: irrigated_next (nbpt)!! Dynamic irrig. area, calculated in slowproc and passed to routing!
+    REAL(r_std), INTENT(in)        :: irrig_frac(nbpt)     !! Irrig. fraction interpolated in routing, and saved to pass to slowproc if irrigated_soiltile = .TRUE.
+
 
     !! 0.2 Output variables
@@ -153 +161 @@
                                  neighbours,  resolution,     contfrac,   stempdiag, &
                                  returnflow,  reinfiltration, irrigation, riverflow, &
-                                 coastalflow, flood_frac,     flood_res )
+                                 coastalflow, flood_frac,     flood_res,  soiltile,  &
+                                 irrig_frac,  veget_max,      irrigated_next)
 
     ELSE IF (routing_method == 'highres') THEN
@@ -206 +215 @@
        lalo, neighbours, resolution, contfrac, totfrac_nobio, veget_max, floodout, runoff, &
        drainage, transpot, precip_rain, humrel, k_litt, flood_frac, flood_res, &
-       stempdiag, reinf_slope, returnflow, reinfiltration, irrigation, riverflow, coastalflow, rest_id, hist_id, hist2_id)
-
+       stempdiag, reinf_slope, returnflow, reinfiltration, irrigation, riverflow, coastalflow, rest_id, hist_id, hist2_id, &
+       soiltile, root_deficit, irrigated_next, irrig_frac, fraction_aeirrig_sw) 
 
 
@@ -234 +243 @@
     REAL(r_std), INTENT(in)        :: stempdiag(nbpt,nslm) !! Diagnostic soil temperature profile
     REAL(r_std), INTENT(in)        :: reinf_slope(nbpt)    !! Coefficient which determines the reinfiltration ratio in the grid box due to flat areas (unitless;0-1)
+    REAL(r_std), INTENT(in)        :: root_deficit(nbpt)   !! soil water deficit
+    REAL(r_std), INTENT(in)        :: soiltile(nbpt,nstm)  !! Fraction of each soil tile within vegtot (0-1, unitless)
+    REAL(r_std), INTENT(in)        :: irrig_frac(nbpt)     !! Irrig. fraction interpolated in routing, and saved to pass to slowproc if irrigated_soiltile = .TRUE.
+    REAL(r_std), INTENT(in)        :: irrigated_next (nbpt)!! Dynamic irrig. area, calculated in slowproc and passed to routing
+    REAL(r_std), INTENT(in)        :: fraction_aeirrig_sw(nbpt) !! Fraction of area equipped for irrigation from surface water, of irrig_frac
 
     !! 0.2 Output variables
@@ -254 +268 @@
             lalo, neighbours, resolution, contfrac, totfrac_nobio, veget_max, floodout, runoff, &
             drainage, transpot, precip_rain, humrel, k_litt, flood_frac, flood_res, &
-            stempdiag, reinf_slope, returnflow, reinfiltration, irrigation, riverflow, coastalflow, rest_id, hist_id, hist2_id)
+            stempdiag, reinf_slope, returnflow, reinfiltration, irrigation, riverflow, coastalflow, rest_id, hist_id, hist2_id, &
+            soiltile, root_deficit, irrigated_next, irrig_frac, fraction_aeirrig_sw)
 
     ELSE IF (routing_method=='highres') THEN