Changeset 6102

Timestamp:

2019-07-05T14:52:05+02:00 (5 years ago)

Author:

josefine.ghattas

Message:

Added routing_simple module and routing_wrapper. No changes in defalut set up.

See ticket #581

Location:

branches/ORCHIDEE_2_2/ORCHIDEE/src_sechiba

Files:

• routing_simple.f90 (added)
• routing_wrapper.f90 (added)
• sechiba.f90 (modified) (6 diffs)

branches/ORCHIDEE_2_2/ORCHIDEE/src_sechiba/sechiba.f90

@@ -45 +45 @@
   USE sechiba_io_p
   USE slowproc
-  USE routing
+  USE routing_wrapper
   USE ioipsl_para
   USE chemistry
@@ -295 +295 @@
       CALL chemistry_xios_initialize
       CALL thermosoil_xios_initialize
+      CALL routing_wrapper_xios_initialize
     END IF
     IF (printlev_loc>=3) WRITE(numout,*) 'End sechiba_xios_initialize'
@@ -492 +493 @@
     !! 1.12 Initialize river routing
     IF ( river_routing .AND. nbp_glo .GT. 1) THEN
+
        !! 1.12.1 Initialize river routing
-       CALL routing_initialize( kjit,        kjpindex,       index,                 &
+       CALL routing_wrapper_initialize( &
+            kjit,        kjpindex,       index,                 &
             rest_id,     hist_id,        hist2_id,   lalo,      &
             neighbours,  resolution,     contfrac,   stempdiag, &
@@ -762 +765 @@
     IF ( river_routing .AND. nbp_glo .GT. 1) THEN
        !! 8.1 River routing
-       CALL routing_main (kjit, kjpindex, index, &
+       CALL routing_wrapper_main (kjit, kjpindex, index, &
             & lalo, neighbours, resolution, contfrac, totfrac_nobio, veget_max, floodout, runoff, &
             & drainage, transpot, precip_rain, humrel, k_litt, flood_frac, flood_res, &
@@ -1364 +1367 @@
     IF ( river_routing .AND. nbp_glo .GT. 1) THEN
        !! 6.1 Call river routing to write restart files 
-       CALL routing_finalize( kjit, kjpindex, rest_id, flood_frac, flood_res )
+       CALL routing_wrapper_finalize( kjit, kjpindex, rest_id, flood_frac, flood_res )
     ELSE
        !! 6.2 No routing, set variables to zero
@@ -1960 +1963 @@
     CALL thermosoil_clear
     CALL condveg_clear 
-    CALL routing_clear
+    CALL routing_wrapper_clear
 
   END SUBROUTINE sechiba_clear