Changeset 11931 for NEMO/branches/2019/ENHANCE-02_ISF_nemo/src/OCE/DYN

Timestamp:

2019-11-19T18:30:57+01:00 (5 years ago)

Author:

mathiot

Message:

ENHANCE-02_ISF_nemo: add comments, improve memory usage of ln_isfcpl_cons option, fix issue in ISOMIP+ configuration

Location:

NEMO/branches/2019/ENHANCE-02_ISF_nemo/src/OCE/DYN

Files:

• dynnxt.F90 (modified) (3 diffs)
• sshwzv.F90 (modified) (1 diff)

NEMO/branches/2019/ENHANCE-02_ISF_nemo/src/OCE/DYN/dynnxt.F90

@@ -26 +26 @@
    !!-------------------------------------------------------------------------
    USE oce            ! ocean dynamics and tracers
-   USE isf
    USE dom_oce        ! ocean space and time domain
    USE sbc_oce        ! Surface boundary condition: ocean fields
    USE sbcrnf         ! river runoffs
-   USE isfnxt
    USE phycst         ! physical constants
    USE dynadv         ! dynamics: vector invariant versus flux form
@@ -42 +40 @@
    USE trddyn         ! trend manager: dynamics
    USE trdken         ! trend manager: kinetic energy
+   USE isf       , ONLY: ln_isf     ! ice shelf
+   USE isfdynnxt , ONLY: isf_dynnxt ! ice shelf 
    !
    USE in_out_manager ! I/O manager
@@ -243 +243 @@
             END IF
             !
-            ! ice shelf melting
+            ! ice shelf melting (deal separatly as it can be in depth)
+            ! PM: we could probably define a generic subroutine to do the in depth correction
+            !     to manage rnf, isf and possibly in the futur icb, tide water glacier (...)
             IF ( ln_isf ) CALL isf_dynnxt( kt, atfp * rdt )
             !

NEMO/branches/2019/ENHANCE-02_ISF_nemo/src/OCE/DYN/sshwzv.F90

@@ -260 +260 @@
                &                             + fwfisf_cav_b(:,:) - fwfisf_cav(:,:)   &
                &                             + fwfisf_par_b(:,:) - fwfisf_par(:,:)   ) * ssmask(:,:)
+
+            ! ice sheet coupling
+            IF ( ln_isf .AND. ln_isfcpl .AND. kt == nit000+1) sshb(:,:) = sshb(:,:) - atfp * rdt * ( risfcpl_ssh(:,:) - 0.0 ) * ssmask(:,:)
+
          ENDIF
-
-         ! ice sheet coupling
-         IF ( ln_isf .AND. ln_isfcpl .AND. kt == nit000+1) sshb(:,:) = sshb(:,:) - atfp * rdt * ( risfcpl_ssh(:,:) - 0.0 ) * ssmask(:,:)
 
          sshn(:,:) = ssha(:,:)                              ! now <-- after