Changeset 12977 for NEMO/branches/2020/dev_12905_xios_restart/src/OCE

Timestamp:

2020-05-27T09:35:03+02:00 (4 years ago)

Author:

andmirek

Message:

Ticket #2462 read restart with XIOS in SAS

Location:

NEMO/branches/2020/dev_12905_xios_restart/src/OCE

Files:

• DOM/domain.F90 (modified) (3 diffs)
• IOM/iom.F90 (modified) (1 diff)
• nemogcm.F90 (modified) (1 diff)
• step.F90 (modified) (1 diff)

NEMO/branches/2020/dev_12905_xios_restart/src/OCE/DOM/domain.F90

@@ -58 +58 @@
 CONTAINS
 
-   SUBROUTINE dom_init( Kbb, Kmm, Kaa, cdstr )
+   SUBROUTINE dom_init( Kbb, Kmm, Kaa )
       !!----------------------------------------------------------------------
       !!                  ***  ROUTINE dom_init  ***
@@ -74 +74 @@
       !!----------------------------------------------------------------------
       INTEGER          , INTENT(in) :: Kbb, Kmm, Kaa          ! ocean time level indices
-      CHARACTER (len=*), INTENT(in) :: cdstr                  ! model: NEMO or SAS. Determines core restart variables
       !
       INTEGER ::   ji, jj, jk, ik   ! dummy loop indices
@@ -122 +121 @@
       CALL dom_glo                     ! global domain versus local domain
       CALL dom_nam                     ! read namelist ( namrun, namdom )
-      !
-!reset namelist for SAS
-      IF(cdstr == 'SAS') THEN
-         IF(lrxios) THEN
-               IF(lwp) write(numout,*) 'Disable reading restart file using XIOS for SAS'
-               lrxios = .FALSE.
-         ENDIF
-      ENDIF
       !
       CALL dom_hgr                      ! Horizontal mesh

NEMO/branches/2020/dev_12905_xios_restart/src/OCE/IOM/iom.F90

@@ -618 +618 @@
 #if defined key_iomput
       TYPE(xios_context) :: nemo_hdl
-      IF(lwp) write(numout, *) 'SWAP TO: ', TRIM(cdname),' AGRIF: ', TRIM(Agrif_CFixed())
       IF( TRIM(Agrif_CFixed()) == '0' ) THEN
         CALL xios_get_handle(TRIM(cdname),nemo_hdl)

NEMO/branches/2020/dev_12905_xios_restart/src/OCE/nemogcm.F90

@@ -428 +428 @@
       IF( lk_c1d       )   CALL     c1d_init        ! 1D column configuration
                            CALL     wad_init        ! Wetting and drying options
-                           CALL     dom_init( Nbb, Nnn, Naa, "OPA") ! Domain
+                           CALL     dom_init( Nbb, Nnn, Naa ) ! Domain
       IF( ln_crs       )   CALL     crs_init(      Nnn )       ! coarsened grid: domain initialization 
       IF( sn_cfctl%l_prtctl )   &

NEMO/branches/2020/dev_12905_xios_restart/src/OCE/step.F90

@@ -351 +351 @@
       IF( kstp == nit000 ) THEN                          ! 1st time step only
                                         CALL iom_close( numror )   ! close input  ocean restart file
-         IF( lroxios )                   CALL iom_context_finalize(      crxios_context         )
+         IF( lroxios )                  CALL iom_context_finalize(      crxios_context         )
          IF(lwm)                        CALL FLUSH    ( numond )   ! flush output namelist oce
          IF(lwm .AND. numoni /= -1 )    CALL FLUSH    ( numoni )   ! flush output namelist ice (if exist)