Changeset 675 for trunk/NEMO

Timestamp:

2007-06-01T19:40:03+02:00 (17 years ago)

Author:

ctlod

Message:

nemo_v2_bugfix_046 : CT : move the ln_limdmp ice namelist parameter into namicerun instead namiceini section to allow damping even when making restart

Location:

trunk/NEMO/LIM_SRC

Files:

• iceini.F90 (modified) (3 diffs)
• limistate.F90 (modified) (2 diffs)

trunk/NEMO/LIM_SRC/iceini.F90

@@ -16 +16 @@
    !!----------------------------------------------------------------------
    USE dom_oce
+   USE dom_ice
    USE in_out_manager
    USE ice_oce         ! ice variables
@@ -98 +99 @@
       !! ** input   :   Namelist namicerun
       !!-------------------------------------------------------------------
-      NAMELIST/namicerun/ ln_limdyn, acrit, hsndif, hicdif
+      NAMELIST/namicerun/ ln_limdyn, ln_limdmp, acrit, hsndif, hicdif
       !!-------------------------------------------------------------------
       !                    
@@ -111 +112 @@
          WRITE(numout,*) ' ~~~~~~'
          WRITE(numout,*) '   switch for ice dynamics (1) or not (0)      ln_limdyn   = ', ln_limdyn
+         WRITE(numout,*) '   Ice damping                                 ln_limdmp   = ', ln_limdmp
          WRITE(numout,*) '   minimum fraction for leads in the NH (SH)  acrit(1/2)   = ', acrit(:)
          WRITE(numout,*) '   computation of temp. in snow (=0) or not (=9999) hsndif = ', hsndif

trunk/NEMO/LIM_SRC/limistate.F90

@@ -220 +220 @@
       INTEGER :: ji,jj
 
-      NAMELIST/namiceini/ ln_limini, ln_limdmp, ttest, hninn, hginn, alinn, &
+      NAMELIST/namiceini/ ln_limini, ttest, hninn, hginn, alinn, &
          &                hnins, hgins, alins
       !!-------------------------------------------------------------------
@@ -253 +253 @@
                WRITE(numout,*) '~~~~~~~~~~~~~~~'
                WRITE(numout,*) '         Ice state initialization using input file    ln_limini  = ', ln_limini
-               WRITE(numout,*) '         Ice damping                                  ln_limdmp  = ', ln_limdmp
                WRITE(numout,*) ' '
             ENDIF