Changeset 4616 for branches/2014/dev_CNRS0_NOC1_LDF/NEMOGCM/NEMO/OPA_SRC/ICB/icbthm.F90

Timestamp:

2014-04-06T17:28:25+02:00 (10 years ago)

Author:

gm

Message:

#1260 : see the associated wiki page for explanation

File:

• branches/2014/dev_CNRS0_NOC1_LDF/NEMOGCM/NEMO/OPA_SRC/ICB/icbthm.F90 (modified) (6 diffs)

branches/2014/dev_CNRS0_NOC1_LDF/NEMOGCM/NEMO/OPA_SRC/ICB/icbthm.F90

@@ -1 +1 @@
 MODULE icbthm
-
    !!======================================================================
    !!                       ***  MODULE  icbthm  ***
@@ -11 +10 @@
    !!            -    !  2011-05  (Alderson)       Use tmask instead of tmask_i
    !!----------------------------------------------------------------------
-   !!----------------------------------------------------------------------
-   !!   icb_thm : initialise
-   !!             reference for equations - M = Martin + Adcroft, OM 34, 2010
+   
+   !!----------------------------------------------------------------------
+   !!   icb_thm : initialise (reference for equations - M = Martin + Adcroft, OM 34, 2010)
    !!----------------------------------------------------------------------
    USE par_oce        ! NEMO parameters
@@ -21 +20 @@
    USE phycst         ! NEMO physical constants
    USE sbc_oce
-
+   !
    USE icb_oce        ! define iceberg arrays
    USE icbutl         ! iceberg utility routines
@@ -31 +30 @@
    PUBLIC   icb_thm ! routine called in icbstp.F90 module
 
+   !!----------------------------------------------------------------------
+   !! NEMO/OPA 3.7 , NEMO Consortium (2014)
+   !! $Id: cla.F90 4596 2014-03-26 11:02:30Z gm $
+   !! Software governed by the CeCILL licence     (NEMOGCM/NEMO_CeCILL.txt)
+   !!----------------------------------------------------------------------
 CONTAINS
 
@@ -155 +159 @@
          ! 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
@@ -194 +198 @@
             !
          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)