Changeset 7257

Timestamp:

2021-07-27T15:29:46+02:00 (3 years ago)

Author:

agnes.ducharne

Message:

Updates for the new driver as in r6040 and r6041 of the trunk.

File:

• branches/ORCHIDEE_2_2/ORCHIDEE/src_driver/orchideedriver.f90 (modified) (5 diffs)

branches/ORCHIDEE_2_2/ORCHIDEE/src_driver/orchideedriver.f90

@@ -159 +159 @@
   REAL(r_std), DIMENSION(2) :: testpt=(/9999.99,9999.99/)
   INTEGER(i_std) :: ktest
+  INTEGER :: printlev_loc  !! local write level
 
   OFF_LINE_MODE = .TRUE. 
+
+  ! Set specific write level to orchideedriver using PRINTLEV_orchideedriver=[0-4] 
+  ! in run.def. The global printlev is used as default value. 
+  printlev_loc=get_printlev('orchideedriver')
 
   !-
@@ -264 +269 @@
   IF ( (zoom_lon(1)+180 < EPSILON(zoom_lon(1))) .AND. (zoom_lon(2)-180 < EPSILON(zoom_lon(2))) .AND.&
        &(zoom_lat(1)+90 < EPSILON(zoom_lat(1))) .AND. (zoom_lat(2)-90 < EPSILON(zoom_lat(2))) ) THEN
-     !
+
+     ! We are here only if zoom_lon and zoom_lat have there original values which
+     ! means that they have not been modified by the getin LIMIT_ above. 
+     ! Read WEST_EAST and SOUTH_NORTH from run.def.
+     
      !Config Key   = WEST_EAST
      !Config Desc  = Longitude interval to use from the forcing data
@@ -561 +570 @@
   !
   WRITE(*,*) "itau_offset : date0 : ", year_end, month_end, day_end, sec_end
-  !
+  
+  !!- Initialize module for output with XIOS
   CALL xios_orchidee_init( MPI_COMM_ORCH,                &
        date0,    year_end, month_end, day_end, julian_diff,  &
        lon,      lat,      znt)
-  !
+
+  CALL sechiba_xios_initialize 
+
+  CALL xios_orchidee_close_definition
+  IF (printlev_loc >= 2) WRITE(numout,*) 'After xios_orchidee_close_definition'
+
   !- Initialize IOIPSL sechiba output files
   itau_sechiba = itau+itau_offset
@@ -838 +853 @@
   !-
   !--
-  !
-  CALL xios_orchidee_context_finalize
+  ! Close IOIPSL history files
   CALL histclo
   IF(is_root_prc) THEN
+     ! Close restart files
      CALL restclo
      CALL getin_dump
@@ -874 +889 @@
   ENDIF
   !
+  ! Finalize MPI and XIOS
   CALL Finalize_mpi
   !