Changeset 8812

Timestamp:

2017-11-24T17:34:50+01:00 (6 years ago)

Author:

andmirek

Message:

#1953 and #1962 enable restart read/write with XIOS in SAS

Location:

branches/2017/dev_r8600_xios_read_write_v2/NEMOGCM/NEMO

Files:

• OPA_SRC/DOM/domain.F90 (modified) (3 diffs)
• OPA_SRC/IOM/iom.F90 (modified) (2 diffs)
• OPA_SRC/nemogcm.F90 (modified) (1 diff)
• SAO_SRC/nemogcm.F90 (modified) (1 diff)
• SAS_SRC/daymod.F90 (modified) (3 diffs)
• SAS_SRC/nemogcm.F90 (modified) (2 diffs)

branches/2017/dev_r8600_xios_read_write_v2/NEMOGCM/NEMO/OPA_SRC/DOM/domain.F90

@@ -64 +64 @@
 CONTAINS
 
-   SUBROUTINE dom_init
+   SUBROUTINE dom_init(cdstr)
       !!----------------------------------------------------------------------
       !!                  ***  ROUTINE dom_init  ***
@@ -82 +82 @@
       INTEGER ::   iconf = 0    ! local integers
       CHARACTER (len=64) ::   cform = "(A12, 3(A13, I7))" 
+      CHARACTER (len=*), INTENT(IN) :: cdstr                  ! model  
       INTEGER , DIMENSION(jpi,jpj) ::   ik_top , ik_bot       ! top and bottom ocean level
       REAL(wp), DIMENSION(jpi,jpj) ::   z1_hu_0, z1_hv_0
@@ -135 +136 @@
 !define names for restart write and set core output (restart.F90)
          CALL iom_set_rst_vars(rst_wfields)
-         CALL iom_set_rstw_core()
+         CALL iom_set_rstw_core(cdstr)
       ENDIF
       !

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

@@ -311 +311 @@
    END SUBROUTINE iom_set_rstr_active
 
-   SUBROUTINE iom_set_rstw_core()
+   SUBROUTINE iom_set_rstw_core(cdmdl)
+   CHARACTER (len=*), INTENT (IN) :: cdmdl
+   
+   IF(cdmdl == "OPA") THEN
 !from restart.F90
    CALL iom_set_rstw_var_active("rdt")
@@ -343 +346 @@
          CALL iom_set_rstw_var_active('sbc_hc_b')
          CALL iom_set_rstw_var_active('sbc_sc_b')
+   ENDIF
    END SUBROUTINE iom_set_rstw_core
 

branches/2017/dev_r8600_xios_read_write_v2/NEMOGCM/NEMO/OPA_SRC/nemogcm.F90

@@ -422 +422 @@
       IF( lk_c1d        )   CALL     c1d_init   ! 1D column configuration
                             CALL     wad_init   ! Wetting and drying options
-                            CALL     dom_init   ! Domain
+                            CALL     dom_init("OPA")   ! Domain
       IF( ln_crs        )   CALL     crs_init   ! coarsened grid: domain initialization 
       IF( ln_nnogather )    CALL nemo_northcomms! northfold neighbour lists (must be done after the masks are defined)

branches/2017/dev_r8600_xios_read_write_v2/NEMOGCM/NEMO/SAO_SRC/nemogcm.F90

@@ -271 +271 @@
                             CALL     phy_cst    ! Physical constants
                             CALL     eos_init   ! Equation of state
-                            CALL     dom_init   ! Domain
+                            CALL     dom_init('SAO')   ! Domain
 
       IF( ln_nnogather )    CALL nemo_northcomms   ! Initialise the northfold neighbour lists (must be done after the masks are defined)

branches/2017/dev_r8600_xios_read_write_v2/NEMOGCM/NEMO/SAS_SRC/daymod.F90

@@ -33 +33 @@
    USE timing         ! Timing
    USE restart        ! restart
-   USE iom_def, ONLY : lrxios
+   USE iom_def, ONLY : lrxios, lwxios
    IMPLICIT NONE
    PRIVATE
@@ -142 +142 @@
       ! call day to set the calendar parameters at the begining of the current simulaton. needed by iom_init
       CALL day( nit000 )
+      IF( lwxios ) THEN
+        CALL iom_set_rstw_var_active('kt')
+        CALL iom_set_rstw_var_active('ndastp')
+        CALL iom_set_rstw_var_active('adatrj')
+        CALL iom_set_rstw_var_active('ntime')
+      ENDIF
       !
    END SUBROUTINE day_init
@@ -399 +405 @@
          ENDIF
          ! calendar control
-         CALL iom_rstput( kt, nitrst, numrow, 'kt'     , REAL( kt    , wp) )   ! time-step
-         CALL iom_rstput( kt, nitrst, numrow, 'ndastp' , REAL( ndastp, wp) )   ! date
-         CALL iom_rstput( kt, nitrst, numrow, 'adatrj' , adatrj            )   ! number of elapsed days since
+         IF( lwxios ) CALL iom_swap(      cwxios_context          )
+         CALL iom_rstput( kt, nitrst, numrow, 'kt'     , REAL( kt    , wp), ldxios = lwxios )   ! time-step
+         CALL iom_rstput( kt, nitrst, numrow, 'ndastp' , REAL( ndastp, wp), ldxios = lwxios )   ! date
+         CALL iom_rstput( kt, nitrst, numrow, 'adatrj' , adatrj, ldxios = lwxios            )   ! number of elapsed days since
          !                                                                     ! the begining of the run [s]
-    CALL iom_rstput( kt, nitrst, numrow, 'ntime'  , REAL( nn_time0, wp) ) ! time
+    CALL iom_rstput( kt, nitrst, numrow, 'ntime'  , REAL( nn_time0, wp), ldxios = lwxios ) ! time
+         IF( lwxios ) CALL iom_swap(      cxios_context          )
       ENDIF
       !

branches/2017/dev_r8600_xios_read_write_v2/NEMOGCM/NEMO/SAS_SRC/nemogcm.F90

@@ -41 +41 @@
    USE xios           ! xIOserver
 #endif
+   USE in_out_manager, ONLY : ln_xios_read, nn_wxios
 
    IMPLICIT NONE
@@ -359 +360 @@
                             CALL phy_cst    ! Physical constants
                             CALL eos_init   ! Equation of state
-                            CALL dom_init   ! Domain
-
+                            CALL dom_init('SAS')   ! Domain
      IF( ln_nnogather )     CALL nemo_northcomms   ! Initialise the northfold neighbour lists (must be done after the masks are defined)