Changeset 12914

Timestamp:

2020-05-12T15:59:32+02:00 (4 years ago)

Author:

andmirek

Message:

Ticket #2462: merge changes from ticket #2386 to fix XIOS write-read restart

Location:

NEMO/branches/2020/dev_12905_xios_restart/src/OCE

Files:

• DOM/domain.F90 (modified) (1 diff)
• IOM/in_out_manager.F90 (modified) (1 diff)
• IOM/iom.F90 (modified) (7 diffs)
• IOM/iom_def.F90 (modified) (1 diff)
• ISF/isfcav.F90 (modified) (1 diff)

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

@@ -115 +115 @@
          WRITE(numout,*)     '         cn_cfg = ', TRIM( cn_cfg ), '   nn_cfg = ', nn_cfg
       ENDIF
-      lwxios = .FALSE.
+      nn_wxios = 0
       ln_xios_read = .FALSE.
       !

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

@@ -178 +178 @@
    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) ::   crxios_context        !: context name used in xios to read restart
    CHARACTER(lc) ::   cwxios_context        !: context name used in xios to write restart file
 

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

@@ -119 +119 @@
       INTEGER ::   nldi_save, nlei_save    !:      and close boundaries in output files
       INTEGER ::   nldj_save, nlej_save    !:
-      LOGICAL ::   ll_closedef = .TRUE.
+      LOGICAL ::   ll_closedef
       !!----------------------------------------------------------------------
       !
@@ -134 +134 @@
          IF( njmpp + jpj - 1 == jpjglo ) nlej = jpj
       ENDIF
+      !
+      ll_closedef = .TRUE.
       IF ( PRESENT(ld_closedef) ) ll_closedef = ld_closedef
       !
@@ -363 +365 @@
            rst_file = TRIM(clpath)//TRIM(cn_ocerst_in)
         ELSE
-           rst_file = TRIM(clpath)//'1_'//TRIM(cn_ocerst_in)
+           rst_file = TRIM(clpath)//TRIM(Agrif_CFixed())//'_'//TRIM(cn_ocerst_in)
         ENDIF
 !set name of the restart file and enable available fields
-        if(lwp) WRITE(numout,*) 'Setting restart filename (for XIOS) to: ',rst_file
+        if(lwp) WRITE(numout,*) 'Setting restart filename (for XIOS) to: ', TRIM(rst_file)
         CALL xios_get_handle("file_definition", filegroup_hdl )
         CALL xios_add_child(filegroup_hdl, file_hdl, 'rrestart')
@@ -409 +411 @@
    IF(cdmdl == "OPA") THEN
 !from restart.F90
-   CALL iom_set_rstw_var_active("rn_Dt")
+   CALL iom_set_rstw_var_active("rdt")
    IF ( .NOT. ln_diurnal_only ) THEN
         CALL iom_set_rstw_var_active('ub'  )
@@ -447 +449 @@
 
         i = 0
-        i = i + 1; fields(i)%vname="rn_Dt";            fields(i)%grid="grid_scalar"
+        i = i + 1; fields(i)%vname="rdt";            fields(i)%grid="grid_scalar"
         i = i + 1; fields(i)%vname="un";             fields(i)%grid="grid_N_3D"
         i = i + 1; fields(i)%vname="ub";             fields(i)%grid="grid_N_3D"
@@ -475 +477 @@
         i = i + 1; fields(i)%vname="qsr_hc_b";       fields(i)%grid="grid_N_3D"
         i = i + 1; fields(i)%vname="fraqsr_1lev";    fields(i)%grid="grid_N"
-        i = i + 1; fields(i)%vname="greenland_icesheet_mass"
-                                               fields(i)%grid="grid_scalar"
-        i = i + 1; fields(i)%vname="greenland_icesheet_timelapsed"
-                                               fields(i)%grid="grid_scalar"
-        i = i + 1; fields(i)%vname="greenland_icesheet_mass_roc"
-                                               fields(i)%grid="grid_scalar"
-        i = i + 1; fields(i)%vname="antarctica_icesheet_mass"
-                                               fields(i)%grid="grid_scalar"
-        i = i + 1; fields(i)%vname="antarctica_icesheet_timelapsed"
-                                               fields(i)%grid="grid_scalar"
-        i = i + 1; fields(i)%vname="antarctica_icesheet_mass_roc"
-                                               fields(i)%grid="grid_scalar"
         i = i + 1; fields(i)%vname="frc_v";          fields(i)%grid="grid_scalar"
         i = i + 1; fields(i)%vname="frc_t";          fields(i)%grid="grid_scalar"
@@ -546 +536 @@
         i = i + 1; fields(i)%vname="hbli";           fields(i)%grid="grid_N"
         i = i + 1; fields(i)%vname="wn";             fields(i)%grid="grid_N_3D"
+        i = i + 1; fields(i)%vname="fwfisf_cav_b";   fields(i)%grid="grid_N"
+        i = i + 1; fields(i)%vname="isf_hc_cav_b";   fields(i)%grid="grid_N"
+        i = i + 1; fields(i)%vname="isf_sc_cav_b";   fields(i)%grid="grid_N"
 
         IF( i-1 > max_rst_fields) THEN

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

@@ -67 +67 @@
    END TYPE file_descriptor
    TYPE(file_descriptor), DIMENSION(jpmax_files), PUBLIC ::   iom_file !: array containing the info for all opened files
-   INTEGER, PARAMETER, PUBLIC                   :: max_rst_fields = 95 !: maximum number of restart variables defined in iom_set_rst_vars
+   INTEGER, PARAMETER, PUBLIC                   :: max_rst_fields = 105 !: maximum number of restart variables defined in iom_set_rst_vars
    TYPE, PUBLIC :: RST_FIELD  
     CHARACTER(len=30) :: vname = "NO_NAME" ! names of variables in restart file

NEMO/branches/2020/dev_12905_xios_restart/src/OCE/ISF/isfcav.F90

@@ -183 +183 @@
       ! cavity mask
       mskisf_cav(:,:)    = (1._wp - tmask(:,:,1)) * ssmask(:,:)
-      !
-      !================
-      ! 2: read restart
+      !================
+      ! 2: activate restart
+      !================
+      !
+      IF( lwxios ) THEN
+         CALL iom_set_rstw_var_active('fwfisf_cav_b')
+         CALL iom_set_rstw_var_active('isf_hc_cav_b')
+         CALL iom_set_rstw_var_active('isf_sc_cav_b')
+      ENDIF
+      !
+      !================
+      ! 3: read restart
       !================
       !