Changeset 8269 for branches/UKMO/test_moci_test_suite

Timestamp:

2017-07-03T17:39:41+02:00 (7 years ago)

Author:

andmirek

Message:

fix restart read with XIOS whne ln_restart is false

Location:

branches/UKMO/test_moci_test_suite/NEMOGCM/NEMO/OPA_SRC

Files:

• DOM/domain.F90 (modified) (1 diff)
• IOM/iom_def.F90 (modified) (1 diff)
• step.F90 (modified) (1 diff)

branches/UKMO/test_moci_test_suite/NEMOGCM/NEMO/OPA_SRC/DOM/domain.F90

@@ -212 +212 @@
       nwrite = nn_write
       neuler = nn_euler
-      lxios_read = ln_xios_read
+      lxios_read = ln_xios_read.and.ln_rstart
       IF ( neuler == 1 .AND. .NOT. ln_rstart ) THEN
          WRITE(ctmp1,*) 'ln_rstart =.FALSE., nn_euler is forced to 0 '

branches/UKMO/test_moci_test_suite/NEMOGCM/NEMO/OPA_SRC/IOM/iom_def.F90

@@ -82 +82 @@
 
    INTEGER, PARAMETER, PUBLIC                   :: max_rst_fields = 85  
-!  CHARACTER(len=30),DIMENSION(max_rst_fields), PUBLIC   :: rst_fields ! names of variables in restart file
 
    TYPE, PUBLIC :: RST_FIELD  

branches/UKMO/test_moci_test_suite/NEMOGCM/NEMO/OPA_SRC/step.F90

@@ -385 +385 @@
       IF( kstp == nitend .OR. indic < 0 ) THEN 
                       CALL iom_context_finalize(      cxios_context          ) ! needed for XIOS+AGRIF
-                      CALL iom_context_finalize(      rxios_context          )
+                      IF(lxios_read) CALL iom_context_finalize(      rxios_context          )
          IF( ln_crs ) CALL iom_context_finalize( trim(cxios_context)//"_crs" ) ! 
       ENDIF