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

Timestamp:

2022-04-14T10:01:23+02:00 (2 years ago)

Author:

josefine.ghattas

Message:

Integrate routing scheme "highres" developped by Jan Polcher, tested and integrated in ORCHIDEE_2_2 by Lucia Rinchiuso. This corresponds to the revision 7574 of perso/lucia.rinchiuso/myORCHIDEE_2_2_r7481. The developements of the routing scheme from branches/ORCHIDEE-ROUTING at revision 7545 are taken into account.

See also ticket #842

File:

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

branches/ORCHIDEE_2_2/ORCHIDEE/src_sechiba/routing_wrapper.f90

@@ -15 +15 @@
 !!                available routing modules: 
 !!                - ROUTING_METOD=standard for the standard routing scheme available in module routing. 
-!!                - ROUTING_METHOD=simple for the routing scheme in module routing_simple. 
+!!                - ROUTING_METHOD=simple for the routing scheme in module routing_simple.
+!!                - ROUTING_METHOD=highres for the high resolution routing scheme in module routing_highres.
 !!
 !! REFERENCE(S) : None
@@ -32 +33 @@
   USE grid
   USE routing
+  USE routing_highres
   USE routing_simple
 
   IMPLICIT NONE
 
-  CHARACTER(LEN=255), SAVE :: routing_method                      !! 'standard' or 'simple': Character string used to switch between routing modules
+  CHARACTER(LEN=255), SAVE :: routing_method                      !! 'standard', 'highres' or 'simple': Character string used to switch between routing modules
   !$OMP THREADPRIVATE(routing_method) 
 
@@ -67 +69 @@
     routing_method='standard'
     CALL getin_p("ROUTING_METHOD",routing_method)
-    IF(routing_method=='simple') THEN  
+    IF(routing_method=='standard') THEN
+       CALL routing_xios_initialize
+    ELSEIF(routing_method=='highres') THEN
+       CALL routing_highres_xios_initialize
+    ELSEIF(routing_method=='simple') THEN  
        CALL routing_simple_xios_initialize
     ENDIF
@@ -144 +150 @@
 
        CALL routing_initialize(  kjit,        nbpt,           index,                 &
+                                 rest_id,     hist_id,        hist2_id,   lalo,      &
+                                 neighbours,  resolution,     contfrac,   stempdiag, &
+                                 returnflow,  reinfiltration, irrigation, riverflow, &
+                                 coastalflow, flood_frac,     flood_res )
+
+    ELSE IF (routing_method == 'highres') THEN
+
+       CALL routing_highres_initialize(  kjit,        nbpt,           index,                 &
                                  rest_id,     hist_id,        hist2_id,   lalo,      &
                                  neighbours,  resolution,     contfrac,   stempdiag, &
@@ -242 +256 @@
             stempdiag, reinf_slope, returnflow, reinfiltration, irrigation, riverflow, coastalflow, rest_id, hist_id, hist2_id)
 
+    ELSE IF (routing_method=='highres') THEN
+
+       CALL routing_highres_main (kjit, nbpt, index, &
+            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)
+
     ELSE IF(routing_method=='simple') THEN 
 
@@ -287 +308 @@
        CALL routing_finalize( kjit, nbpt, rest_id, flood_frac, flood_res )
 
+    ELSE IF (routing_method=='highres') THEN
+
+       CALL routing_highres_finalize( kjit, nbpt, rest_id, flood_frac, flood_res )
+
     ELSE IF(routing_method=='simple') THEN 
 
@@ -316 +341 @@
        CALL routing_clear
 
+    ELSE IF (routing_method=='highres') THEN
+
+       CALL routing_highres_clear
+
     ELSE IF(routing_method=='simple') THEN