Changeset 12077 for NEMO/branches/2019/UKMO_MERGE_2019/src/OCE/DIA/diawri.F90

Timestamp:

2019-12-05T18:41:39+01:00 (4 years ago)

Author:

mathiot

Message:

include ENHANCE-02_ISF_nemo in UKMO merge branch

File:

• NEMO/branches/2019/UKMO_MERGE_2019/src/OCE/DIA/diawri.F90 (modified) (4 diffs)

NEMO/branches/2019/UKMO_MERGE_2019/src/OCE/DIA/diawri.F90

@@ -26 +26 @@
    !!----------------------------------------------------------------------
    USE oce            ! ocean dynamics and tracers 
-   USE isf
+   USE isf_oce
    USE isfcpl
    USE dom_oce        ! ocean space and time domain
@@ -911 +911 @@
       CALL iom_rstput( 0, 0, inum, 'risfdep', risfdep            )    ! now k-velocity
       CALL iom_rstput( 0, 0, inum, 'ht'     , ht                 )    ! now water column height
+
       IF ( ln_isf ) THEN
          IF (ln_isfcav_mlt) THEN
@@ -918 +919 @@
             CALL iom_rstput( 0, 0, inum, 'misfkb_cav', REAL(misfkb_cav,8)    )    ! now k-velocity
             CALL iom_rstput( 0, 0, inum, 'misfkt_cav', REAL(misfkt_cav,8)    )    ! now k-velocity
+            CALL iom_rstput( 0, 0, inum, 'mskisf_cav', REAL(mskisf_cav,8), ktype = jp_i1 )
          END IF
          IF (ln_isfpar_mlt) THEN
@@ -926 +928 @@
             CALL iom_rstput( 0, 0, inum, 'misfkb_par', REAL(misfkb_par,8)    )    ! now k-velocity
             CALL iom_rstput( 0, 0, inum, 'misfkt_par', REAL(misfkt_par,8)    )    ! now k-velocity
+            CALL iom_rstput( 0, 0, inum, 'mskisf_par', REAL(mskisf_par,8), ktype = jp_i1 )
          END IF
       END IF
 
-      IF ( ln_isf ) THEN
-         IF (ln_isfcav_mlt) CALL iom_rstput( 0, 0, inum, 'mskisf_cav', REAL(mskisf_cav,8), ktype = jp_i1 )
-         IF (ln_isfpar_mlt) CALL iom_rstput( 0, 0, inum, 'mskisf_par', REAL(mskisf_par,8), ktype = jp_i1 )
-      END IF
-      
       IF( ALLOCATED(ahtu) ) THEN
          CALL iom_rstput( 0, 0, inum,  'ahtu', ahtu              )    ! aht at u-point