Changeset 5836 for trunk/NEMOGCM/NEMO/OPA_SRC/ICB

Timestamp:

2015-10-26T15:49:40+01:00 (9 years ago)

Author:

cetlod

Message:

merge the simplification branch onto the trunk, see ticket #1612

Location:

trunk/NEMOGCM/NEMO/OPA_SRC/ICB

Files:

• icbdia.F90 (modified) (1 diff)
• icbthm.F90 (modified) (2 diffs)

trunk/NEMOGCM/NEMO/OPA_SRC/ICB/icbdia.F90

@@ -191 +191 @@
 
          nbergs_end        = icb_utl_count()
-         zgrdd_berg_mass   = SUM( berg_mass (:,:)*e1e2t(:,:)*tmask_i(:,:) )
+         zgrdd_berg_mass   = SUM( berg_mass(:,:)*e1e2t(:,:)*tmask_i(:,:) )
          zgrdd_bits_mass   = SUM( bits_mass(:,:)*e1e2t(:,:)*tmask_i(:,:) )
 

trunk/NEMOGCM/NEMO/OPA_SRC/ICB/icbthm.F90

@@ -156 +156 @@
          ! use tmask rather than tmask_i when dealing with icebergs
          IF( tmask(ii,ij,1) /= 0._wp ) THEN    ! Add melting to the grid and field diagnostics
-            z1_e1e2    = 1._wp / e1e2t(ii,ij) * this%mass_scaling
+            z1_e1e2    = r1_e1e2t(ii,ij) * this%mass_scaling
             z1_dt_e1e2 = z1_dt * z1_e1e2
             zmelt    = ( zdM - ( zdMbitsE - zdMbitsM ) ) * z1_dt   ! kg/s
@@ -195 +195 @@
             !
          ELSE                            ! Diagnose mass distribution on grid
-            z1_e1e2 = 1._wp / e1e2t(ii,ij) * this%mass_scaling
+            z1_e1e2 = r1_e1e2t(ii,ij) * this%mass_scaling
             CALL icb_dia_size( ii, ij, zWn, zLn, zAbits,   &
             &                  this%mass_scaling, zMnew, znMbits, z1_e1e2)