Changeset 12914 for NEMO/branches/2020/dev_12905_xios_restart/src/OCE/IOM/iom.F90

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

File:

• NEMO/branches/2020/dev_12905_xios_restart/src/OCE/IOM/iom.F90 (modified) (7 diffs)

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