Changeset 12521

Timestamp:

2020-03-09T11:16:28+01:00 (3 years ago)

Author:

andmirek

Message:

Ticket 2386: fixes in the code

Location:

NEMO/branches/2020/r12377_ticket2386/src/OCE

Files:

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

NEMO/branches/2020/r12377_ticket2386/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/r12377_ticket2386/src/OCE/IOM/iom.F90

@@ -478 +478 @@
         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"
@@ -549 +537 @@
         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/r12377_ticket2386/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/r12377_ticket2386/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
       !================
       !