Changeset 8377 for branches/ORCHIDEE_2_2/ORCHIDEE/src_parallel

Timestamp:

2024-01-14T15:15:57+01:00 (6 months ago)

Author:

jan.polcher

Message:

The modifications performed on the trunk for the coupling to WRF and the interpolation by XIOS on curviliean grids has been backported.

Location:

branches/ORCHIDEE_2_2/ORCHIDEE/src_parallel

Files:

• mod_orchidee_para.F90 (modified) (1 diff)
• xios_orchidee.f90 (modified) (4 diffs)

branches/ORCHIDEE_2_2/ORCHIDEE/src_parallel/mod_orchidee_para.F90

@@ -41 +41 @@
   !! \n
   !_ ============================================================================================================================== 
-  SUBROUTINE Init_orchidee_para(communicator)
+  SUBROUTINE Init_orchidee_para(communicator, usexios)
     IMPLICIT NONE
     INTEGER,OPTIONAL,INTENT(in) :: communicator 
-
+    LOGICAL,OPTIONAL,INTENT(in) :: usexios
+    
     CALL Init_orchidee_omp
 
-
     IF ( PRESENT(communicator) ) THEN
-       CALL Init_orchidee_mpi(communicator)
+       IF ( PRESENT(usexios) ) THEN
+          CALL Init_orchidee_mpi(communicator, usexios)
+       ELSE
+          CALL Init_orchidee_mpi(communicator)
+       ENDIF
     ELSE
        CALL Init_orchidee_mpi
     ENDIF
-
 
     IF (is_mpi_root .AND. is_omp_root) THEN

branches/ORCHIDEE_2_2/ORCHIDEE/src_parallel/xios_orchidee.f90

@@ -126 +126 @@
   SUBROUTINE xios_orchidee_init(MPI_COMM_ORCH,                   &
        date0,    year,      month,             day, julian_diff, &
-       lon_mpi,  lat_mpi )
+       lon_mpi,  lat_mpi, bounds2d_lon_mpi, bounds2d_lat_mpi )
 
     USE grid, ONLY : grid_type, unstructured, regular_lonlat, regular_xy, nvertex, &
-                     longitude, latitude, bounds_lon, bounds_lat, ind_cell_glo
+                     longitude, latitude, bounds_lon, bounds_lat, ind_cell_glo, NbSegments
 
     USE vertical_soil_var, ONLY : znt, znh
@@ -144 +144 @@
     REAL(r_std), INTENT(in)                               :: julian_diff      !! Current day in the year [1,365(366)]
     REAL(r_std),DIMENSION (iim_g,jj_nb), INTENT(in)       :: lon_mpi, lat_mpi !! Longitudes and latitudes on MPI local domain 2D domain
+    REAL(r_std), OPTIONAL, DIMENSION (NbSegments,iim_g,jj_nb), INTENT(in)  :: bounds2d_lon_mpi
+    REAL(r_std), OPTIONAL, DIMENSION (NbSegments,iim_g,jj_nb), INTENT(in)  :: bounds2d_lat_mpi
     !
     !! 0.2 Local variables
@@ -304 +306 @@
           ! Global domain
           CALL xios_set_domain_attr("domain_landpoints", ni_glo=iim_g, nj_glo=jjm_g)
-          ! Local MPI domain
-          CALL xios_set_domain_attr("domain_landpoints",type="curvilinear", ibegin=0, ni=iim_g, jbegin=jj_begin-1, nj=jj_nb)
-
+          ! Local MPI domain, nvertex is needed here so that XIOS recognises that it is a curvilieanr grid.
+          CALL xios_set_domain_attr("domain_landpoints",type="curvilinear", ibegin=0, ni=iim_g, jbegin=jj_begin-1, &
+               &                    nj=jj_nb, nvertex=NbSegments)
           ! Define how data is stored on memory : 1D array for only continental points
           CALL xios_set_domain_attr("domain_landpoints",data_dim=1, data_ibegin=0, data_ni=nbp_mpi)
@@ -314 +316 @@
           CALL xios_set_domain_attr("domain_landpoints",lonvalue_2d=lon_mpi,latvalue_2d=lat_mpi)
 
+          ! If the bounds are provided in the interface then they are used. If not then probably there is an issue.
+          IF (PRESENT(bounds2d_lon_mpi) .AND. PRESENT(bounds2d_lat_mpi)) THEN
+             ! Passing the bounds to XIOS so that the interpolations can be used.
+             CALL xios_set_domain_attr("domain_landpoints",bounds_lon_2d=bounds2d_lon_mpi)
+             CALL xios_set_domain_attr("domain_landpoints",bounds_lat_2d=bounds2d_lat_mpi)
+          ELSE
+             CALL ipslerr_p(3,'xios_orchidee_init', 'For this curvilinear grid the bounds are not provided.',&
+                  'This means that the interpolation of fields through XIOS is not possible.', '')
+          ENDIF
+          
        ELSE IF (grid_type==unstructured) THEN