Changeset 4666 for branches/2014/dev_r4650_UKMO2_ice_shelves/NEMOGCM/NEMO/OPA_SRC/DIA/diahsb.F90

Timestamp:

2014-06-11T14:52:23+02:00 (10 years ago)

Author:

mathiot

Message:

#1331 : add ISOMIP config files + ice shelf code

File:

• branches/2014/dev_r4650_UKMO2_ice_shelves/NEMOGCM/NEMO/OPA_SRC/DIA/diahsb.F90 (modified) (2 diffs)

branches/2014/dev_r4650_UKMO2_ice_shelves/NEMOGCM/NEMO/OPA_SRC/DIA/diahsb.F90

@@ -24 +24 @@
    USE lib_fortran     ! glob_sum
    USE restart         ! ocean restart
-   USE wrk_nemo         ! work arrays
-   USE sbcrnf         ! river runoffd
+   USE wrk_nemo        ! work arrays
+   USE sbcrnf          ! river runoff
+   USE sbcisf          ! ice shelves
 
    IMPLICIT NONE
@@ -84 +85 @@
       ! 1 - Trends due to forcing !
       ! ------------------------- !
-      z_frc_trd_v = r1_rau0 * glob_sum( - ( emp(:,:) - rnf(:,:) ) * surf(:,:) ) ! volume fluxes
+      z_frc_trd_v = r1_rau0 * glob_sum( - ( emp(:,:) - rnf(:,:) + rdivisf * fwfisf(:,:)) * surf(:,:) ) ! volume fluxes
       z_frc_trd_t =           glob_sum( sbc_tsc(:,:,jp_tem) * surf(:,:) )       ! heat fluxes
       z_frc_trd_s =           glob_sum( sbc_tsc(:,:,jp_sal) * surf(:,:) )       ! salt fluxes