Changeset 7254 for branches

Timestamp:

2021-07-21T19:32:17+02:00 (3 years ago)

Author:

agnes.ducharne

Message:

Reversion de la r7252 qui empeche de compiler avec xios et libIGCM.

File:

• branches/ORCHIDEE_2_2/ORCHIDEE/src_sechiba/routing_simple.f90 (modified) (12 diffs)

branches/ORCHIDEE_2_2/ORCHIDEE/src_sechiba/routing_simple.f90

@@ -342 +342 @@
 
   SUBROUTINE routing_simple_xios_initialize
-!    USE xios
+    USE xios
     USE routing, ONLY : routing_names
     IMPLICIT NONE     
@@ -350 +350 @@
     LOGICAL :: file_exists
 
-#ifdef XIOS
     IF (is_omp_root) THEN   
        CALL xios_get_axis_attr("basins", n_glo=basins_out)    ! get nb basins to output
@@ -359 +358 @@
        IF (file_exists) CALL xios_set_file_attr("routing_start", enabled=.TRUE.)  
     ENDIF
-#endif
+
   END SUBROUTINE routing_simple_xios_initialize
 
@@ -380 +379 @@
 
   SUBROUTINE routing_simple_init_2(nbpt, contfrac)
-!    USE xios
+    USE xios
     USE grid, ONLY : area
     IMPLICIT NONE
@@ -410 +409 @@
 
 !_ ================================================================================================================================
-#ifdef XIOS
+
     split_routing=1
     CALL getin_p("SPLIT_ROUTING",split_routing)
@@ -658 +657 @@
 
     ENDIF
-#endif
+
   END SUBROUTINE routing_simple_init_2
 
@@ -734 +733 @@
                                  coastalflow_omp, hydrographs, slowflow_diag, flood_frac, flood_res)
     
-!    USE xios
+    USE xios
     USE grid, ONLY : area
     IMPLICIT NONE
@@ -855 +854 @@
     !
 
-#ifdef XIOS
+
     irrig_netereq(:) = zero
     totarea(:) = zero
@@ -1168 +1167 @@
     irrigation(:) = zero
 
-#endif
+
   END SUBROUTINE routing_simple_flow
 
@@ -1712 +1711 @@
 
   SUBROUTINE routing_simple_finalize( kjit, nbpt, rest_id, flood_frac, flood_res )
-!    USE xios
+    USE xios
     IMPLICIT NONE
 
@@ -1728 +1727 @@
     !_ ================================================================================================================================
 
-#ifdef XIOS
     IF (is_omp_root) THEN
        CALL xios_send_field("fast_reservoir_restart",fast_reservoir_r)
@@ -1734 +1732 @@
        CALL xios_send_field("stream_reservoir_restart",stream_reservoir_r)
     ENDIF
-#endif
+
   END SUBROUTINE routing_simple_finalize