Changeset 11541 for NEMO/branches/2019/ENHANCE-02_ISF_nemo/src/OCE/DYN/dynspg_ts.F90

Timestamp:

2019-09-12T18:41:17+02:00 (5 years ago)

Author:

mathiot

Message:

ENHANCE-02_ISF: simplify use of ln_isf, add extra comments + minor changes (ticket #2142)

File:

• NEMO/branches/2019/ENHANCE-02_ISF_nemo/src/OCE/DYN/dynspg_ts.F90 (modified) (3 diffs)

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

@@ -382 +382 @@
 !!gm  Is it correct to do so ?   I think so...
       
-      
+      !
       !                                   !* barotropic Coriolis trends (vorticity scheme dependent)
       !                                   ! --------------------------------------------------------
@@ -631 +631 @@
       !                                   !* Right-Hand-Side of the barotropic ssh equation
       !                                   ! -----------------------------------------------
-      !                                         ! Surface net water flux and rivers
+      !                                         ! Surface net water flux, rivers and ice shelves
       IF (ln_bt_fw) THEN
          zssh_frc(:,:) = r1_rau0 * ( emp(:,:) - rnf(:,:) + fwfisf_cav(:,:) + fwfisf_par(:,:) )
       ELSE
          zztmp = r1_rau0 * r1_2
-         zssh_frc(:,:) = zztmp * (  emp(:,:) + emp_b(:,:) - rnf(:,:) - rnf_b(:,:)   &
+         zssh_frc(:,:) = zztmp * (  emp(:,:)        + emp_b(:,:)                    &
+                &                 - rnf(:,:)        - rnf_b(:,:)                    &
                 &                 + fwfisf_cav(:,:) + fwfisf_cav_b(:,:)             &
                 &                 + fwfisf_par(:,:) + fwfisf_par_b(:,:)             )
@@ -645 +646 @@
       ENDIF
       !
-      IF( ll_isfcpl_cons ) THEN
-         zssh_frc(:,:) = zssh_frc(:,:) + risfcpl_cons_ssh(:,:)
-      END IF
-      !
-      IF( ln_isfcpl .AND. ln_rstart .AND. kt == nit000 ) THEN
-         zssh_frc(:,:) = zssh_frc(:,:) + risfcpl_ssh(:,:)
+      !                                         ! ice sheet coupling
+      IF ( ln_isf .AND. ln_isfcpl ) THEN
+         !
+         ! ice sheet coupling
+         IF( ln_rstart .AND. kt == nit000 ) THEN
+            zssh_frc(:,:) = zssh_frc(:,:) + risfcpl_ssh(:,:)
+         END IF
+         !
+         ! conservation option
+         IF( ln_isfcpl_cons ) THEN
+            zssh_frc(:,:) = zssh_frc(:,:) + risfcpl_cons_ssh(:,:)
+         END IF
+         !
       END IF
       !