Changeset 8152 for branches/2016/v3_6_CMIP6_ice_diagnostics/NEMOGCM/NEMO/LIM_SRC_3/limitd_me.F90

Timestamp:

2017-06-08T12:43:44+02:00 (7 years ago)

Author:

vancop

Message:

SIMIP diagnostics, phase 2, commit#3

File:

• branches/2016/v3_6_CMIP6_ice_diagnostics/NEMOGCM/NEMO/LIM_SRC_3/limitd_me.F90 (modified) (2 diffs)

branches/2016/v3_6_CMIP6_ice_diagnostics/NEMOGCM/NEMO/LIM_SRC_3/limitd_me.F90

@@ -670 +670 @@
                &                 + rhosn * vsrft(ij) * ( 1._wp - rn_fsnowrft ) ) * r1_rdtice  ! fresh water source for ocean
 
-            wfx_snw_dyn(ji,jj) = wfx_snw(ji,jj) + zwfx_snw
-            wfx_snw(ji,jj)     = wfx_snw(ji,jj) + zwfx_snw
-
-            ! SIMIP diagnostic
-            diag_dms_dyn(ji,jj) = - wfx_dyn(ji,jj)     + diag_trp_vi(ji,jj)
-            diag_dmi_dyn(ji,jj) = - wfx_snw_dyn(ji,jj) + diag_trp_vs(ji,jj)
+            wfx_snw_dyn(ji,jj)  =   wfx_snw_dyn(ji,jj) + zwfx_snw
+            wfx_snw(ji,jj)      =   wfx_snw(ji,jj)     + zwfx_snw
 
             hfx_dyn(ji,jj) = hfx_dyn(ji,jj) + ( - esrdg(ij) * ( 1._wp - rn_fsnowrdg )         & 
@@ -774 +770 @@
       END DO ! jl1 (deforming categories)
 
+      ! SIMIP diagnostics
+      diag_dmi_dyn(:,:) = - wfx_dyn(:,:)     + rhoic * diag_trp_vi(:,:)
+      diag_dms_dyn(:,:) = - wfx_snw_dyn(:,:) + rhosn * diag_trp_vs(:,:)
+      
       !
       CALL wrk_dealloc( jpij,        indxi, indxj )