Changeset 5624 for branches/2015/dev_r5151_UKMO_ISF/NEMOGCM/NEMO/OPA_SRC/DYN/sshwzv.F90

Timestamp:

2015-07-21T20:47:42+02:00 (9 years ago)

Author:

mathiot

Message:

UKMO_ISF : fix conservation issue based on the work of Jerome on runoff, simplification of trasbc (isf part only) and remove option to apply isf melting as volume flux or not

File:

• branches/2015/dev_r5151_UKMO_ISF/NEMOGCM/NEMO/OPA_SRC/DYN/sshwzv.F90 (modified) (1 diff)

branches/2015/dev_r5151_UKMO_ISF/NEMOGCM/NEMO/OPA_SRC/DYN/sshwzv.F90

@@ -268 +268 @@
       ELSE                                         !** Leap-Frog time-stepping: Asselin filter + swap
          sshb(:,:) = sshn(:,:) + atfp * ( sshb(:,:) - 2 * sshn(:,:) + ssha(:,:) )     ! before <-- now filtered
-         IF( lk_vvl ) sshb(:,:) = sshb(:,:) - atfp * rdt / rau0 * ( emp_b(:,:) - emp(:,:) - rnf_b(:,:) + rnf(:,:) ) * ssmask(:,:)
-         !IF( lk_vvl ) sshb(:,:) = sshb(:,:) - atfp * rdt / rau0 * ( (emp_b(:,:) - emp(:,:)) - (rnf_b(:,:) - rnf(:,:))  &
-         !                 &                                       + (fwfisf_b(:,:) - fwfisf(:,:))) * ssmask(:,:)
+         IF( lk_vvl ) sshb(:,:) = sshb(:,:) - atfp * rdt / rau0 * ( (emp_b(:,:) - emp(:,:))      &
+                          &                                       - (rnf_b(:,:) - rnf(:,:))      &
+                          &                                       + (fwfisf_b(:,:) - fwfisf(:,:))) * ssmask(:,:)
          sshn(:,:) = ssha(:,:)                           ! now <-- after
       ENDIF