Changeset 9535

Timestamp:

2018-05-01T13:22:33+02:00 (5 years ago)

Author:

andmirek

Message:

#1953 and #1962 disable XIOS related calls when key_iomput is not set

Location:

branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/IOM

Files:

• iom.F90 (modified) (15 diffs)
• restart.F90 (modified) (3 diffs)

branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/IOM/iom.F90

@@ -65 +65 @@
    PRIVATE set_grid, set_grid_bounds, set_scalar, set_xmlatt, set_mooring, iom_update_file_name, iom_sdate
    PRIVATE iom_set_rst_context, iom_set_rstw_active, iom_set_rstr_active
-   PUBLIC iom_set_rstw_var_active, iom_set_rst_vars
 # endif
+   PUBLIC iom_set_rstw_var_active, iom_set_rstw_core, iom_set_rst_vars
 
    INTERFACE iom_get
@@ -245 +245 @@
    INTEGER :: i
    LOGICAL :: llis_set
-
+   CHARACTER(LEN=256) :: clinfo    ! info character
+
+#if defined key_iomput
    llis_set = .FALSE.
 
@@ -263 +265 @@
         nstop = nstop + 1
    ENDIF
+#else
+        clinfo = 'key_iomput is needed to use XIOS restart read/write functionality'
+        CALL ctl_stop(TRIM(clinfo))
+#endif
 
    END SUBROUTINE iom_set_rstw_var_active
@@ -276 +282 @@
 !sets enabled = .TRUE. for each field in restart file
    CHARACTER(len=256) :: rst_file
+
+#if defined key_iomput
    TYPE(xios_field) :: field_hdl
    TYPE(xios_file) :: file_hdl
@@ -319 +327 @@
          ENDIF
         END DO
+#endif
    END SUBROUTINE iom_set_rstr_active
 
@@ -328 +337 @@
       !!---------------------------------------------------------------------
    CHARACTER (len=*), INTENT (IN) :: cdmdl ! model OPA or SAS
-   
+   CHARACTER(LEN=256)             :: clinfo    ! info character
+#if defined key_iomput
    IF(cdmdl == "OPA") THEN
 !from restart.F90
@@ -362 +372 @@
          CALL iom_set_rstw_var_active('sbc_sc_b')
    ENDIF
+#else
+        clinfo = 'key_iomput is needed to use XIOS restart read/write functionality'
+        CALL ctl_stop(TRIM(clinfo))
+#endif
    END SUBROUTINE iom_set_rstw_core
 
    SUBROUTINE iom_set_rst_vars(fields)
       !!---------------------------------------------------------------------
-      !!                   ***  SUBROUTINE  iom_set_rstr_active  ***
+      !!                   ***  SUBROUTINE iom_set_rst_vars   ***
       !!
       !! ** Purpose :  Fill array fields with the information about all 
@@ -373 +387 @@
       !!---------------------------------------------------------------------
    TYPE(RST_FIELD), INTENT(INOUT) :: fields(max_rst_fields)
-
    INTEGER :: i
+
         i = 0
         i = i + 1; fields(i)%vname="rdt";            fields(i)%grid="grid_scalar"
@@ -480 +494 @@
         nstop = nstop + 1
         ENDIF
-
    END SUBROUTINE iom_set_rst_vars
 
@@ -486 +499 @@
    SUBROUTINE iom_set_rstw_active(cdrst_file)
       !!---------------------------------------------------------------------
-      !!                   ***  SUBROUTINE  iom_set_rstr_active  ***
+      !!                   ***  SUBROUTINE iom_set_rstw_active   ***
       !!
       !! ** Purpose :  define file name in XIOS context for writing restart
@@ -539 +552 @@
    SUBROUTINE iom_set_rst_context( ) 
      !!---------------------------------------------------------------------
-      !!                   ***  SUBROUTINE  iom_set_rstr_active  ***
+      !!                   ***  SUBROUTINE  iom_set_rst_context  ***
       !!
       !! ** Purpose : Define domain, axis and grid for restart (read/write) 
@@ -929 +942 @@
          ENDIF
       ELSE
+#if defined key_iomput
          IF(lwp) WRITE(numout,*) 'XIOS RST READ (0D): ', trim(cdvar)
          CALL iom_swap( TRIM(crxios_context) )
          CALL xios_recv_field( trim(cdvar), pvar)
          CALL iom_swap( TRIM(cxios_context) )
+#else
+         nstop = nstop + 1 
+         clinfo = 'Can not use XIOS in iom_g0d, file: '//trim(clname)//', var:'//trim(cdvar)
+#endif
       ENDIF
    END SUBROUTINE iom_g0d
@@ -1292 +1310 @@
          CALL iom_swap( TRIM(crxios_context) ) 
          IF( PRESENT(pv_r3d) ) THEN
+            pv_r3d(:, :, :) = 0.
             if(lwp) write(numout,*) 'XIOS RST READ (3D): ',trim(cdvar)
             CALL xios_recv_field( trim(cdvar), pv_r3d)
@@ -1298 +1317 @@
             ENDIF
          ELSEIF( PRESENT(pv_r2d) ) THEN
+            pv_r2d(:, :) = 0.
             if(lwp) write(numout,*) 'XIOS RST READ (2D): ', trim(cdvar)
             CALL xios_recv_field( trim(cdvar), pv_r2d)
@@ -1304 +1324 @@
             ENDIF
          ELSEIF( PRESENT(pv_r1d) ) THEN
+            pv_r1d(:) = 0.
             if(lwp) write(numout,*) 'XIOS RST READ (1D): ', trim(cdvar)
             CALL xios_recv_field( trim(cdvar), pv_r1d)

branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/IOM/restart.F90

@@ -62 +62 @@
       CHARACTER(lc)       ::   clpath   ! full path to ocean output restart file
       CHARACTER(LEN=52)   ::   clpname   ! ocean output restart file name including prefix for AGRIF
+      CHARACTER(LEN=256)  ::   clinfo    ! info character
       !!----------------------------------------------------------------------
       !
@@ -110 +111 @@
                CALL iom_open( TRIM(clpath)//TRIM(clname), numrow, ldwrt = .TRUE., kiolib = jprstlib )
             ELSE
+#if defined key_iomput
                cwxios_context = "rstw_"//TRIM(ADJUSTL(clkt))
                IF( TRIM(Agrif_CFixed()) == '0' ) THEN
@@ -119 +121 @@
                CALL xios_update_calendar(nitrst)
                CALL iom_swap(      cxios_context          )
+#else
+               clinfo = 'Can not use XIOS in rst_opn'
+               CALL ctl_stop(TRIM(clinfo))
+#endif
             ENDIF
             lrst_oce = .TRUE.