Changeset 8227

Timestamp:

2023-10-11T15:11:36+02:00 (7 months ago)

Author:

yann.meurdesoif

Message:

New version of routing simple => become routing_native ; after validation routing_simple will be supress

• more robust routing scheme on native grid
• rearchitecturing of routing by spliting routing sub-process into separate file/module => smaller file
• works on global as well on regional (orchidee) grid.
• works on standard 50km routing grid and highres routing MERIT grid (1-2km), for regional studies
• integrate irrigation old scheme et new scheme (pedro arboleda)
• more water conservative (1e-16 Vs 1e-7 relative for simple routing)
• To be tested : ICOLMDZOR grid and ICOLAMDZ-LAM grid that are expeted to work also.

It is a first guess, not the definitive native routing package that will continue to evolve.
No side effect is expected on other configurations since it is just some files adding.
Native routing is activated using the run.def key :
ROUTING_METHOD=native

YM

Location:

branches/ORCHIDEE_2_2/ORCHIDEE/src_sechiba

Files:

• routing_native.f90 (added)
• routing_native_flood_pond.f90 (added)
• routing_native_flow.f90 (added)
• routing_native_irrig.f90 (added)
• routing_native_lake.f90 (added)
• routing_native_para.f90 (added)
• routing_wrapper.f90 (modified) (6 diffs)

branches/ORCHIDEE_2_2/ORCHIDEE/src_sechiba/routing_wrapper.f90

@@ -35 +35 @@
   USE routing_highres
   USE routing_simple
+  USE routing_native_mod
   USE constantes_soil
 
@@ -76 +77 @@
     ELSEIF(routing_method=='simple') THEN  
        CALL routing_simple_xios_initialize
+    ELSEIF(routing_method=='native') THEN
+       CALL routing_native_xios_initialize
     ENDIF
 
@@ -179 +182 @@
                                           returnflow,  reinfiltration, irrigation, riverflow, &
                                           coastalflow, flood_frac,     flood_res )
+
+       riverflow(:) = zero
+       coastalflow(:) = zero
+       returnflow(:) = zero
+       reinfiltration(:) = zero
+       irrigation(:) = zero
+       flood_frac(:) = zero
+       flood_res(:) = zero
+   
+    ELSE IF(routing_method== 'native') THEN
+
+       CALL routing_native_initialize(    kjit,        nbpt,           index,                 &
+                                          rest_id,     hist_id,        hist2_id,   lalo,      &
+                                          neighbours,  resolution,     contfrac,   stempdiag, &
+                                          returnflow,  reinfiltration, irrigation, riverflow, &
+                                          coastalflow, flood_frac,     flood_res , irrigated_next)
 
        riverflow(:) = zero
@@ -284 +303 @@
             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)
+            rest_id, hist_id, hist2_id) 
+
+    ELSE IF(routing_method=='native') THEN
+
+       CALL routing_native_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, &
+            soiltile, root_deficit, irrigated_next, irrig_frac, fraction_aeirrig_sw) 
     ENDIF
 
@@ -331 +359 @@
        CALL routing_simple_finalize( kjit, nbpt, rest_id, flood_frac, flood_res )
 
+    ELSE IF(routing_method=='native') THEN
+
+       CALL routing_native_finalize( kjit, nbpt, rest_id, flood_frac, flood_res )
+
     ENDIF
 
@@ -363 +395 @@
 
        CALL routing_simple_clear
-
+    
+    ELSE IF(routing_method=='native') THEN
+
+       CALL routing_native_clear
     ENDIF