Changeset 12961 for NEMO/branches/2020/dev_12905_xios_restart/src/OCE/IOM

Timestamp:

2020-05-22T13:51:12+02:00 (4 years ago)

Author:

andmirek

Message:

Ticket #2462: read/write restart with XIOS in TOP (with debug print statements)

Location:

NEMO/branches/2020/dev_12905_xios_restart/src/OCE/IOM

Files:

• in_out_manager.F90 (modified) (1 diff)
• iom.F90 (modified) (14 diffs)
• iom_def.F90 (modified) (1 diff)
• restart.F90 (modified) (3 diffs)

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

@@ -177 +177 @@
    LOGICAL       ::   lwp      = .FALSE.    !: boolean : true on the 1st processor only .OR. sn_cfctl%l_oceout=T
    LOGICAL       ::   lsp_area = .TRUE.     !: to make a control print over a specific area
-   CHARACTER(lc) ::   cxios_context         !: context name used in xios
-   CHARACTER(lc) ::   crxios_context        !: context name used in xios to read restart
-   CHARACTER(lc) ::   cwxios_context        !: context name used in xios to write restart file
-   CHARACTER(lc) ::   crixios_context       !: context name used in xios to read SI3 restart
-   CHARACTER(lc) ::   cwixios_context       !: context name used in xios to write SI3 restart file
+   CHARACTER(LEN=lc) ::   cxios_context         !: context name used in xios
+   CHARACTER(LEN=lc) ::   crxios_context        !: context name used in xios to read OCE restart
+   CHARACTER(LEN=lc) ::   cwxios_context        !: context name used in xios to write OCE restart file
+   CHARACTER(LEN=lc) ::   crixios_context       !: context name used in xios to read SI3 restart
+   CHARACTER(LEN=lc) ::   cwixios_context       !: context name used in xios to write SI3 restart file
+   CHARACTER(LEN=lc) ::   crtxios_context       !: context name used in xios to read TOP restart
+   CHARACTER(LEN=lc) ::   cwtxios_context       !: context name used in xios to write TOP restart file
+   CHARACTER(LEN=lc) ::   crsxios_context       !: context name used in xios to read SEDIMENT restart
+   CHARACTER(LEN=lc) ::   cwsxios_context       !: context name used in xios to write SEDIMENT restart file
+
+
 
 

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

@@ -96 +96 @@
 CONTAINS
 
-   SUBROUTINE iom_init( cdname, fname, ld_tmppatch, ld_closedef ) 
+   SUBROUTINE iom_init( cdname, fname, idfp, ld_tmppatch, ld_closedef ) 
       !!----------------------------------------------------------------------
       !!                     ***  ROUTINE   ***
@@ -105 +105 @@
       CHARACTER(len=*),           INTENT(in)  :: cdname
       CHARACTER(len=*), OPTIONAL, INTENT(in)  :: fname
+      INTEGER         , OPTIONAL, INTENT(in)  :: idfp         ! pointer to netcdf file for restart reading with XIOS
       LOGICAL         , OPTIONAL, INTENT(in)  :: ld_tmppatch
       LOGICAL         , OPTIONAL, INTENT(in)  :: ld_closedef
@@ -115 +116 @@
       INTEGER           :: ji
       LOGICAL           :: llrst_context              ! is context related to restart
+      LOGICAL           :: llrstr, llrstw 
       INTEGER           :: inum
       !
@@ -149 +151 @@
       CALL xios_context_initialize(TRIM(clname), mpi_comm_oce)
       CALL iom_swap( cdname )
-      llrst_context = (TRIM(cdname) == TRIM(crxios_context)) .OR. (TRIM(cdname) == TRIM(cwxios_context))
-      llrst_context = llrst_context .OR. (TRIM(cdname) == TRIM(crixios_context)) .OR. (TRIM(cdname) == TRIM(cwixios_context))
+
+      llrstr = (TRIM(cdname) == TRIM(crxios_context)) .OR. (TRIM(cdname) == TRIM(crixios_context))
+      llrstr = llrstr .OR. (TRIM(cdname) == TRIM(crtxios_context))
+      llrstr = llrstr .OR. (TRIM(cdname) == TRIM(crsxios_context))
+
+      llrstw = (TRIM(cdname) == TRIM(cwxios_context)) .OR. (TRIM(cdname) == TRIM(cwixios_context))
+      llrstw = llrstw .OR. (TRIM(cdname) == TRIM(cwtxios_context))
+      llrstw = llrstw .OR. (TRIM(cdname) == TRIM(cwsxios_context))
+
+      llrst_context = llrstr .OR. llrstw
 
       ! Calendar type is now defined in xml file 
@@ -266 +276 @@
       IF(lwp) write(numout, *) 'TEST IOM_INIT: ', TRIM(cdname), TRIM(cdname) == TRIM(crixios_context)
       IF(lwp) CALL FLUSH(numout)
-      IF( TRIM(cdname) == TRIM(crxios_context) .OR. TRIM(cdname) == TRIM(crixios_context)) THEN
-          IF(TRIM(cdname) == TRIM(crxios_context) ) THEN
-             inum = numror
-          ELSEIF(TRIM(cdname) == TRIM(crixios_context)) THEN
-             inum = numrir 
+      IF(llrstr) THEN
+          IF(PRESENT(idfp)) THEN
+             CALL iom_set_rst_context(.TRUE.)
+!set which fields will be read from restart file
+             CALL iom_set_rstr_active(fname, idfp)
           ELSE
-             CALL ctl_stop( 'iom_init:', 'restart read with XIOS: Unknown restart context' )
+             CALL ctl_stop( 'iom_init:', 'restart read with XIOS: missing pointer to NETCDF file' )
           ENDIF
-          CALL iom_set_rst_context(.TRUE.)
-!set which fields will be read from restart file
-          CALL iom_set_rstr_active(fname, inum)
-      ELSE IF( (TRIM(cdname) == TRIM(cwxios_context)) .OR. (TRIM(cdname) == TRIM(cwixios_context))) THEN
+      ELSE IF(llrstw) THEN
           CALL iom_set_rstw_file(fname)
       ELSE
@@ -314 +321 @@
       IF(lwp) write(numout, *) 'XIOS CLOSE definitions for: ', TRIM(cdname)
       llrstw = .FALSE.
-     IF(PRESENT(cdname)) THEN
-         IF((TRIM(cdname) == TRIM(cwxios_context)) .OR. (TRIM(cdname) == TRIM(cwixios_context))) THEN
-           llrstw = .TRUE.
-         ENDIF
+      IF(PRESENT(cdname)) THEN
+         llrstw = (TRIM(cdname) == TRIM(cwxios_context))
+         llrstw = llrstw .OR. (TRIM(cdname) == TRIM(cwixios_context))
+         llrstw = llrstw .OR. (TRIM(cdname) == TRIM(cwtxios_context))
+         llrstw = llrstw .OR. (TRIM(cdname) == TRIM(cwsxios_context))
       ENDIF
 
@@ -323 +331 @@
 !set names of the fields in restart file IF using XIOS to write data
           CALL iom_set_rst_context(.FALSE.)
-      ENDIF
-
-      CALL xios_close_context_definition()
-
-      IF(.NOT. llrstw)  CALL xios_update_calendar( 0 )
-
+          CALL xios_close_context_definition()
+      ELSE
+          CALL xios_close_context_definition()
+          CALL xios_update_calendar( 0 )
+      ENDIF
 #else
       IF( .FALSE. )   WRITE(numout,*) 'iom_init_closedef: should not see this'   ! useless statement to avoid compilation warnings
@@ -386 +393 @@
              output_freq=xios_timestep)
 
-        CALL iom_nf90_check( nf90_inquire( iom_file(idnum)%nfid, ndims, nvars, natts ), clinfo )
+        CALL iom_nf90_check( nf90_inquire(idnum, ndims, nvars, natts ), clinfo )
         ALLOCATE(indimlens(ndims), indimnames(ndims))
-        CALL iom_nf90_check( nf90_inquire( iom_file(idnum)%nfid, unlimitedDimId = unlimitedDimId ), clinfo )
+        CALL iom_nf90_check( nf90_inquire(idnum, unlimitedDimId = unlimitedDimId ), clinfo )
 
         DO idim = 1, ndims
-           CALL iom_nf90_check( nf90_inquire_dimension( iom_file(idnum)%nfid, idim, dimname, dimlen ), clinfo )
+           CALL iom_nf90_check( nf90_inquire_dimension(idnum, idim, dimname, dimlen ), clinfo )
            indimlens(idim) = dimlen
            indimnames(idim) = dimname
@@ -398 +405 @@
         DO jv =1, nvars
             lmeta = .FALSE.
-            CALL iom_nf90_check( nf90_inquire_variable( iom_file(idnum)%nfid, jv, varname, xtype, ndims, dimids, natts ), clinfo )
+            CALL iom_nf90_check( nf90_inquire_variable(idnum, jv, varname, xtype, ndims, dimids, natts ), clinfo )
             DO i = 1, NMETA
                IF(TRIM(varname) == TRIM(meta(i))) THEN
@@ -510 +517 @@
 
         IF(PRESENT(rd3)) THEN
+               IF(lwp) write(numout, *) TRIM(sdfield), ' 3D ', size(rd3,3)
+               IF(lwp) CALL FLUSH(numout)
                CALL xios_set_attr (field_hdl, enabled = .TRUE., name = TRIM(sdfield),   &
                             domain_ref="grid_N", axis_ref=TRIM(iom_axis(size(rd3, 3))), &
@@ -516 +525 @@
 
         IF(PRESENT(rd2)) THEN
+               IF(lwp) write(numout, *) TRIM(sdfield), ' 2D'
+               IF(lwp) CALL FLUSH(numout)
                CALL xios_set_attr (field_hdl, enabled = .TRUE., name = TRIM(sdfield), &
                                    domain_ref="grid_N", prec = 8, operation = "instant") 
@@ -521 +532 @@
 
         IF(PRESENT(rd1)) THEN
+               IF(lwp) write(numout, *) TRIM(sdfield), ' 1D ', size(rd1,1)
+               IF(lwp) CALL FLUSH(numout)
                CALL xios_set_attr (field_hdl, enabled = .TRUE., name = TRIM(sdfield), &
                                    axis_ref=TRIM(iom_axis(size(rd1, 1))), prec = 8, operation = "instant")
@@ -526 +539 @@
 
         IF(PRESENT(rd0)) THEN
+               IF(lwp) write(numout, *) TRIM(sdfield), ' 0D'
+               IF(lwp) CALL FLUSH(numout)
                CALL xios_set_attr (field_hdl, enabled = .TRUE., name = TRIM(sdfield), &
                                          scalar_ref = "grid_scalar", prec = 8, operation = "instant")
@@ -603 +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/IOM/iom_def.F90

@@ -45 +45 @@
    LOGICAL, PUBLIC            ::   lrxios          !: read single file restart using XIOS
    LOGICAL, PUBLIC            ::   lxios_sini = .FALSE. ! is restart in a single file
-   LOGICAL, PUBLIC            ::   lxios_set  = .FALSE. 
 
 

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

@@ -116 +116 @@
                   clpname = TRIM(Agrif_CFixed())//"_"//clname   
                ENDIF
-               CALL iom_init( cwxios_context, TRIM(clpath)//TRIM(clpname), .false., ld_closedef = .FALSE. )
+               CALL iom_init( cwxios_context, TRIM(clpath)//TRIM(clpname), ld_tmppatch = .false.,&
+                                                                           ld_closedef = .FALSE. )
                CALL iom_swap(      cxios_context          )
 #else
@@ -190 +191 @@
       !!                the file has already been opened
       !!----------------------------------------------------------------------
-      LOGICAL         ::   llok
-      CHARACTER(lc)   ::   clpath   ! full path to ocean output restart file
-      CHARACTER(lc+2) ::   clpname  ! file name including agrif prefix
+      LOGICAL             ::   llok
+      CHARACTER(len=lc)   ::   clpath   ! full path to ocean output restart file
+      CHARACTER(len=lc+2) ::   clpname  ! file name including agrif prefix
       !!----------------------------------------------------------------------
       !
@@ -209 +210 @@
 ! can handle checking if variable is in the restart file (there will be no need to open
 ! restart)
-         IF(.NOT.lxios_set) lrxios = lrxios.AND.lxios_sini
+         lrxios = lrxios.AND.lxios_sini
 
          IF( lrxios) THEN
              crxios_context = 'oce_rst'
-             IF( .NOT.lxios_set ) THEN
-                 IF(lwp) WRITE(numout,*) 'Enable restart reading by XIOS'
-                 IF( TRIM(Agrif_CFixed()) == '0' ) THEN
-                    clpname = cn_ocerst_in
-                 ELSE
-                    clpname = TRIM(Agrif_CFixed())//"_"//cn_ocerst_in   
-                 ENDIF
-                 CALL iom_init( crxios_context, fname = TRIM(clpath)//TRIM(clpname), ld_tmppatch = .TRUE. )
-                 lxios_set = .TRUE.
+             IF(lwp) WRITE(numout,*) 'Enable restart reading by XIOS'
+             IF( TRIM(Agrif_CFixed()) == '0' ) THEN
+                clpname = cn_ocerst_in
+             ELSE
+                clpname = TRIM(Agrif_CFixed())//"_"//cn_ocerst_in   
              ENDIF
+             CALL iom_init( crxios_context, fname = TRIM(clpath)//TRIM(clpname), &
+                              idfp = iom_file(numror)%nfid, ld_tmppatch = .TRUE. )
          ENDIF