Changeset 7265 for branches/ORCHIDEE_2_2/ORCHIDEE/src_parallel/xios_orchidee.f90

Timestamp:

2021-07-30T18:36:29+02:00 (3 years ago)

Author:

agnes.ducharne

Message:

Integrated r5705 (solay now in meters in output files), and small changes with no impact on code (r6220, r6565, r6567) from the trunk. Checked with a 5d run.

File:

• branches/ORCHIDEE_2_2/ORCHIDEE/src_parallel/xios_orchidee.f90 (modified) (3 diffs)

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,   soilth_lev )
+       lon_mpi,  lat_mpi )
 
     USE grid, ONLY : grid_type, unstructured, regular_lonlat, regular_xy, nvertex, &
                      longitude, latitude, bounds_lon, bounds_lat, ind_cell_glo
+
+    USE vertical_soil_var, ONLY : znt, znh
+
     IMPLICIT NONE
     !
@@ -141 +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),DIMENSION (ngrnd), INTENT(in)             :: soilth_lev       !! Vertical soil levels for thermal scheme (m)
     !
     !! 0.2 Local variables
@@ -357 +359 @@
        CALL xios_set_axis_attr("nparts",n_glo=nparts,VALUE=(/(REAL(i,r_std),i=1,nparts)/))
        CALL xios_set_axis_attr("nlaip1", n_glo=nlai+1,VALUE=(/(REAL(i,r_std),i=1,nlai+1)/))
-       CALL xios_set_axis_attr("ngrnd",n_glo=ngrnd ,VALUE=soilth_lev(:))
+       CALL xios_set_axis_attr("ngrnd",n_glo=ngrnd ,VALUE=znt(:))
        CALL xios_set_axis_attr("nstm", n_glo=nstm,VALUE=(/(REAL(i,r_std),i=1,nstm)/))
        CALL xios_set_axis_attr("ncsm", n_glo=nscm,VALUE=(/(REAL(i,r_std),i=1,nscm)/))
        CALL xios_set_axis_attr("nnobio", n_glo=nnobio,VALUE=(/(REAL(i,r_std),i=1,nnobio)/))
        CALL xios_set_axis_attr("albtyp", n_glo=2,VALUE=(/(REAL(i,r_std),i=1,2)/))
-       CALL xios_set_axis_attr("nslm", n_glo=nslm,VALUE=(/(REAL(i,r_std),i=1,nslm)/))
+       CALL xios_set_axis_attr("nslm", n_glo=nslm,VALUE=znh(:))
        CALL xios_set_axis_attr("P10", n_glo=10,VALUE=(/(REAL(i,r_std), i=1,10)/))
        CALL xios_set_axis_attr("P100", n_glo=100,VALUE=(/(REAL(i,r_std), i=1,100)/))