Changeset 13954 for NEMO/branches/2020/r13916_ticket2377/src/OCE/IOM

Timestamp:

2020-12-01T20:41:49+01:00 (4 years ago)

Author:

smueller

Message:

Merging of changesets [12591,12602,12608,13082,13094,13096,13950] made in branch ^{/NEMO/branches/2020/ticket_2377 into} /NEMO/branches/2020/r13916_ticket2377 (ticket #2377)

Location:

NEMO/branches/2020/r13916_ticket2377/src/OCE/IOM

Files:

• iom.F90 (modified) (1 diff)
• iom_def.F90 (modified) (1 diff)

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

@@ -537 +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="a_fwb";          fields(i)%grid="grid_scalar"
 
         IF( i-1 > max_rst_fields) THEN

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

@@ -59 +59 @@
    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 = 96 !: 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