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

Timestamp:

2024-03-27T13:02:01+01:00 (3 months ago)

Author:

josefine.ghattas

Message:

Integrated correction done in the trunk [8503] for compilation without XIOS.

Location:

branches/ORCHIDEE_2_2/ORCHIDEE

Files:

• . (modified) (1 prop)
• src_sechiba/routing_wrapper.f90 (modified) (10 diffs)

branches/ORCHIDEE_2_2/ORCHIDEE/src_sechiba/routing_wrapper.f90

@@ -76 +76 @@
        CALL routing_highres_xios_initialize
     ELSEIF(routing_method=='simple') THEN  
+#ifdef XIOS
        CALL routing_simple_xios_initialize
     ELSEIF(routing_method=='native') THEN
        CALL routing_native_xios_initialize
+#else
+       CALL ipslerr_p(3,'routing_wrapper_xios_inititalize','ROUTING_METHOD simple and native needs XIOS',&
+                        'You must compile XIOS and then ORCHIDEE with cpp key XIOS','')
+#endif
     ENDIF
 
@@ -176 +181 @@
 
     ELSE IF(routing_method== 'simple') THEN 
-
+#ifdef XIOS
        CALL routing_simple_initialize(    kjit,        nbpt,           index,                 &
                                           rest_id,     hist_id,        hist2_id,   lalo,      &
@@ -182 +187 @@
                                           returnflow,  reinfiltration, irrigation, riverflow, &
                                           coastalflow, flood_frac,     flood_res )
-
+#endif
        riverflow(:) = zero
        coastalflow(:) = zero
@@ -192 +197 @@
    
     ELSE IF(routing_method== 'native') THEN
-
+#ifdef XIOS
        CALL routing_native_initialize(    kjit,        nbpt,           index,                 &
                                           rest_id,     hist_id,        hist2_id,   lalo,      &
@@ -198 +203 @@
                                           returnflow,  reinfiltration, irrigation, riverflow, &
                                           coastalflow, flood_frac,     flood_res , irrigated_next)
-
+#endif
        riverflow(:) = zero
        coastalflow(:) = zero
@@ -298 +303 @@
 
     ELSE IF(routing_method=='simple') THEN 
-
+#ifdef XIOS
        CALL routing_simple_main (kjit, nbpt, index, &
             lalo, neighbours, resolution, contfrac, totfrac_nobio, veget_max, floodout, runoff, &
@@ -304 +309 @@
             stempdiag, reinf_slope, returnflow, reinfiltration, irrigation, riverflow, coastalflow, &
             rest_id, hist_id, hist2_id) 
-
+#endif
     ELSE IF(routing_method=='native') THEN
-
+#ifdef XIOS
        CALL routing_native_main (kjit, nbpt, index, &
             lalo, neighbours, resolution, contfrac, totfrac_nobio, veget_max, floodout, runoff, &
@@ -313 +318 @@
             rest_id, hist_id, hist2_id, &
             soiltile, root_deficit, irrigated_next, irrig_frac, fraction_aeirrig_sw) 
+#endif
     ENDIF
 
@@ -356 +362 @@
 
     ELSE IF(routing_method=='simple') THEN 
-
+#ifdef XIOS
        CALL routing_simple_finalize( kjit, nbpt, rest_id, flood_frac, flood_res )
-
+#endif
     ELSE IF(routing_method=='native') THEN
-
+#ifdef XIOS
        CALL routing_native_finalize( kjit, nbpt, rest_id, flood_frac, flood_res )
-
+#endif
     ENDIF
 
@@ -393 +399 @@
 
     ELSE IF(routing_method=='simple') THEN 
-
+#ifdef XIOS
        CALL routing_simple_clear
-    
+#endif    
     ELSE IF(routing_method=='native') THEN
-
+#ifdef XIOS
        CALL routing_native_clear
+#endif
     ENDIF