Changeset 7503 for branches/ORCHIDEE_2_2

Timestamp:

2022-02-28T14:55:58+01:00 (3 years ago)

Author:

josefine.ghattas

Message:

Activate possibility to use forcing files on grid regular_xy such as Safran Lambert Conformal. Done by Jan Polcher and tested by Lucia Rinchiuso. See ticket #830

File:

• branches/ORCHIDEE_2_2/ORCHIDEE/src_parallel/xios_orchidee.f90 (modified) (1 diff)

branches/ORCHIDEE_2_2/ORCHIDEE/src_parallel/xios_orchidee.f90

@@ -302 +302 @@
           
        ELSE IF (grid_type==regular_xy ) THEN
-          ! Case not yet fully implemented
-          CALL ipslerr_p(3,'xios_orchidee_init', 'Implemention for grid_type=regular_xy is not finalized',&
-               'Initialization of the domain must be looked over in the code', '')
-
-! Following was done in previous version for case grid_type=regular_xy
-!         ! Local MPI domain
-!          CALL xios_set_domain_attr("domain_landpoints",type="curvilinear", ibegin=0, ni=iim_g, jbegin=jj_begin-1, nj=jj_nb)
-!
-!          ! 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)
-!          CALL xios_set_domain_attr("domain_landpoints",data_ni=nbp_mpi, data_i_index=kindex_mpi-1)     
-!
-!          ! Define longitudes and latitudes on local MPI domain depending on grid_type
-!          CALL xios_set_domain_attr("domain_landpoints",lonvalue_2d=lon_mpi,latvalue_2d=lat_mpi)
+         ! 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)
+
+          ! 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)
+          CALL xios_set_domain_attr("domain_landpoints",data_ni=nbp_mpi, data_i_index=kindex_mpi-1)     
+
+          ! Define longitudes and latitudes on local MPI domain depending on grid_type
+          CALL xios_set_domain_attr("domain_landpoints",lonvalue_2d=lon_mpi,latvalue_2d=lat_mpi)
 
        ELSE IF (grid_type==unstructured) THEN