Changeset 7576 for branches/ORCHIDEE_2_2/ORCHIDEE/src_parallel/xios_orchidee.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_parallel/xios_orchidee.f90 (modified) (7 diffs)

branches/ORCHIDEE_2_2/ORCHIDEE/src_parallel/xios_orchidee.f90

@@ -62 +62 @@
             xios_orchidee_close_definition, &
             xios_orchidee_send_field, xios_orchidee_recv_field, &
-            xios_orchidee_set_file_attr, xios_orchidee_set_field_attr, xios_orchidee_set_fieldgroup_attr, xios_orchidee_setvar
+            xios_orchidee_set_file_attr, xios_orchidee_set_field_attr, xios_orchidee_set_fieldgroup_attr, xios_orchidee_setvar, xios_orchidee_addaxis
 
 
@@ -302 +302 @@
           
        ELSE IF (grid_type==regular_xy ) THEN
-         ! Global domain
+
+          ! Global domain
           CALL xios_set_domain_attr("domain_landpoints", ni_glo=iim_g, nj_glo=jjm_g)
-         ! Local MPI domain
+          ! Local MPI domain
           CALL xios_set_domain_attr("domain_landpoints",type="curvilinear", ibegin=0, ni=iim_g, jbegin=jj_begin-1, nj=jj_nb)
 
@@ -387 +388 @@
           CALL xios_set_field_attr("riversret",enabled=.FALSE.)
           CALL xios_set_field_attr("hydrographs",enabled=.FALSE.)
+          CALL xios_set_field_attr("htuhgmon",enabled=.FALSE.)
           CALL xios_set_field_attr("fastr",enabled=.FALSE.)
           CALL xios_set_field_attr("slowr",enabled=.FALSE.)
@@ -414 +416 @@
        END IF
 
-
        IF (.NOT. ok_freeze_cwrr) THEN
           CALL xios_set_field_attr("profil_froz_hydro",enabled=.FALSE.)
@@ -432 +433 @@
           CALL xios_set_field_attr("floodmap",enabled=.FALSE.)
           CALL xios_set_field_attr("floodh",enabled=.FALSE.)       
-          CALL xios_set_field_attr("floodout",enabled=.FALSE.)       
+          CALL xios_set_field_attr("floodout",enabled=.FALSE.)
+          CALL xios_set_field_attr("flood_frac",enabled=.FALSE.)       
        END IF
 
@@ -606 +608 @@
        !! 6. Close context
        !
-       CALL xios_close_context_definition()      
+       CALL xios_close_context_definition()
+       WRITE(numout,*) 'Done xios_orchidee_close_context'      
 
        !
@@ -667 +670 @@
   END SUBROUTINE xios_orchidee_change_context
 
+  !!
+  !! ==============================================================================================================================
+  !! SUBROUTINE   : xios_orchidee_addaxis
+  !!
+  !>\BRIEF         Use this subroutine to add axes, needed for nbasmon and nbasmax in routing_highres.f90
+  !!
+  !!
+  !! DESCRIPTION  :\n
+  !!
+  !! \n
+  !_ ================================================================================================================================
+  SUBROUTINE xios_orchidee_addaxis(axname, axlen, axval)
+    !
+    ! INPUT variables
+    CHARACTER(LEN=*), INTENT(IN)             :: axname
+    INTEGER(i_std), INTENT(IN)                :: axlen
+    REAL(r_std), DIMENSION(axlen), INTENT(IN) :: axval
+    !
+    IF (xios_orchidee_ok .AND. is_omp_root) THEN
+       CALL xios_set_axis_attr(axname, n_glo=axlen, VALUE=axval)
+    ENDIF
+    !
+  END SUBROUTINE xios_orchidee_addaxis
+  !!
+
+
   !! ==============================================================================================================================
   !! SUBROUTINE   : xios_orchidee_update_calendar