Changeset 6989 for branches/2016/dev_v3_6_STABLE_r6506_AGRIF_LIM3/NEMOGCM/NEMO/LIM_SRC_3/limdyn.F90

Timestamp:

2016-10-05T09:43:42+02:00 (8 years ago)

Author:

clem

Message:

use a namelist parameter to choose between the different advection schemes

File:

• branches/2016/dev_v3_6_STABLE_r6506_AGRIF_LIM3/NEMOGCM/NEMO/LIM_SRC_3/limdyn.F90 (modified) (6 diffs)

branches/2016/dev_v3_6_STABLE_r6506_AGRIF_LIM3/NEMOGCM/NEMO/LIM_SRC_3/limdyn.F90

@@ -26 +26 @@
    USE prtctl           ! Print control
    USE lib_fortran      ! glob_sum
-   USE timing          ! Timing
-   USE limcons        ! conservation tests
+   USE timing           ! Timing
+   USE limcons          ! conservation tests
    USE limvar
 
@@ -33 +33 @@
    PRIVATE
 
-   PUBLIC   lim_dyn   ! routine called by ice_step
+   PUBLIC   lim_dyn        ! routine called by sbcice_lim.F90
+   PUBLIC   lim_dyn_init   ! routine called by sbcice_lim.F90
 
    !! * Substitutions
@@ -64 +65 @@
 
       CALL lim_var_agg(1)                      ! aggregate ice categories
-
-      IF( kt == nit000 )   CALL lim_dyn_init   ! Initialization (first time-step only)
       !
       ! conservation test
@@ -147 +146 @@
       !!-------------------------------------------------------------------
       INTEGER  ::   ios                 ! Local integer output status for namelist read
-      NAMELIST/namicedyn/ nn_icestr, ln_icestr_bvf, rn_pe_rdg, rn_pstar, rn_crhg, rn_cio,  rn_creepl, rn_ecc, &
+      NAMELIST/namicedyn/ nn_limadv, nn_limadv_ord,  &
+         &                nn_icestr, ln_icestr_bvf, rn_pe_rdg, rn_pstar, rn_crhg, rn_cio, rn_creepl, rn_ecc, &
          &                nn_nevp, rn_relast, ln_landfast, rn_gamma, rn_icebfr, rn_lfrelax
       !!-------------------------------------------------------------------
@@ -164 +164 @@
          WRITE(numout,*) 'lim_dyn_init : ice parameters for ice dynamics '
          WRITE(numout,*) '~~~~~~~~~~~~'
+         ! limtrp
+         WRITE(numout,*)'    choose the advection scheme (-1=Prather, 0=Ulimate-Macho)   nn_limadv     = ', nn_limadv 
+         WRITE(numout,*)'    choose the order of the scheme (if ultimate)                nn_limadv_ord = ', nn_limadv_ord  
+         ! limrhg
          WRITE(numout,*)'    ice strength parameterization (0=Hibler 1=Rothrock)         nn_icestr     = ', nn_icestr 
          WRITE(numout,*)'    Including brine volume in ice strength comp.                ln_icestr_bvf = ', ln_icestr_bvf
@@ -180 +184 @@
       ENDIF
       !
-      usecc2 = 1._wp / ( rn_ecc * rn_ecc )
-      rhoco  = rau0  * rn_cio
-      !
    END SUBROUTINE lim_dyn_init