Changeset 8512 for branches/2017/dev_r8183_ICEMODEL/NEMOGCM/NEMO/LIM_SRC_3/icerhg.F90

Timestamp:

2017-09-07T20:08:11+02:00 (7 years ago)

Author:

clem

Message:

changes in style - part5 - reaching the end

File:

• branches/2017/dev_r8183_ICEMODEL/NEMOGCM/NEMO/LIM_SRC_3/icerhg.F90 (modified) (5 diffs)

branches/2017/dev_r8183_ICEMODEL/NEMOGCM/NEMO/LIM_SRC_3/icerhg.F90

@@ -31 +31 @@
    PRIVATE
 
-   PUBLIC   ice_rhg        ! routine called by icestp.F90
-   PUBLIC   ice_rhg_init   ! routine called by icestp.F90
-
+   PUBLIC   ice_rhg        ! called by icestp.F90
+   PUBLIC   ice_rhg_init   ! called by icestp.F90
+   
    !! * Substitutions
 #  include "vectopt_loop_substitute.h90"
@@ -63 +63 @@
       IF( kt == nit000 .AND. lwp ) THEN
          WRITE(numout,*)
-         WRITE(numout,*)'ice_rhg : sea-ice rheology'
-         WRITE(numout,*)'~~~~~~~~'
+         WRITE(numout,*)'ice_rhg: sea-ice rheology'
+         WRITE(numout,*)'~~~~~~~'
       ENDIF
 
@@ -82 +82 @@
       ! Rheology (ice dynamics)
       ! -----------------------   
-      IF( nn_limdyn /= 0 ) THEN     ! -- Ice dynamics
+      IF( nn_icedyn /= 0 ) THEN     ! -- Ice dynamics
          !
-         CALL ice_rhg_evp( stress1_i, stress2_i, stress12_i, u_ice, v_ice, shear_i, divu_i, delta_i )
+         CALL ice_rhg_evp( kt, stress1_i, stress2_i, stress12_i, u_ice, v_ice, shear_i, divu_i, delta_i )
          !
       ELSE                          ! -- prescribed uniform velocity
@@ -110 +110 @@
       !!      dynamics
       !!
-      !! ** Method  :  Read the namicedyn namelist and check the ice-dynamic
+      !! ** Method  :  Read the namice_rhg namelist and check the ice-dynamic
       !!       parameter values called at the first timestep (nit000)
       !!
-      !! ** input   :   Namelist namicedyn
+      !! ** input   :   Namelist namice_rhg
       !!-------------------------------------------------------------------
       INTEGER ::   ios   ! Local integer output status for namelist read
       !!
-      NAMELIST/namicedyn/ nn_limadv  , nn_limadv_ord,                                       &
-         &                nn_icestr  , rn_pe_rdg, rn_pstar , rn_crhg, ln_icestr_bvf     ,   &
-         &                rn_ishlat  , rn_cio   , rn_creepl, rn_ecc , nn_nevp, rn_relast,   &
+      NAMELIST/namice_rhg/  rn_ishlat  , rn_cio   , rn_creepl, rn_ecc , nn_nevp, rn_relast,   &
          &                ln_landfast, rn_gamma , rn_icebfr, rn_lfrelax
       !!-------------------------------------------------------------------
       !
-      REWIND( numnam_ice_ref )         ! Namelist namicedyn in reference namelist : Ice dynamics
-      READ  ( numnam_ice_ref, namicedyn, IOSTAT = ios, ERR = 901)
-901   IF( ios /= 0 ) CALL ctl_nam ( ios , 'namicedyn in reference namelist', lwp )
+      REWIND( numnam_ice_ref )         ! Namelist namice_rhg in reference namelist : Ice dynamics
+      READ  ( numnam_ice_ref, namice_rhg, IOSTAT = ios, ERR = 901)
+901   IF( ios /= 0 ) CALL ctl_nam ( ios , 'namice_rhg in reference namelist', lwp )
       !
-      REWIND( numnam_ice_cfg )         ! Namelist namicedyn in configuration namelist : Ice dynamics
-      READ  ( numnam_ice_cfg, namicedyn, IOSTAT = ios, ERR = 902 )
-902   IF( ios /= 0 ) CALL ctl_nam ( ios , 'namicedyn in configuration namelist', lwp )
-      IF(lwm) WRITE ( numoni, namicedyn )
+      REWIND( numnam_ice_cfg )         ! Namelist namice_rhg in configuration namelist : Ice dynamics
+      READ  ( numnam_ice_cfg, namice_rhg, IOSTAT = ios, ERR = 902 )
+902   IF( ios /= 0 ) CALL ctl_nam ( ios , 'namice_rhg in configuration namelist', lwp )
+      IF(lwm) WRITE ( numoni, namice_rhg )
       !
       IF(lwp) THEN                     ! control print
@@ -136 +134 @@
          WRITE(numout,*) 'ice_rhg_init : ice parameters for ice dynamics '
          WRITE(numout,*) '~~~~~~~~~~~~'
-         WRITE(numout,*) '   Namelist namicedyn'
-         WRITE(numout,*) '      advection scheme for ice transport (limtrp)'
-         WRITE(numout,*) '         type of advection scheme (-1=Prather, 0=Ulimate-Macho)   nn_limadv     = ', nn_limadv 
-         WRITE(numout,*) '         order of the scheme for Ultimate-Macho case              nn_limadv_ord = ', nn_limadv_ord
-         WRITE(numout,*) '      ridging/rafting (icerdgrft)'
-         WRITE(numout,*) '         ice strength parameterization (0=Hibler 1=Rothrock)      nn_icestr     = ', nn_icestr 
-         WRITE(numout,*) '         Ratio of ridging work to PotEner change in ridging       rn_pe_rdg     = ', rn_pe_rdg 
-         WRITE(numout,*) '         1st bulk-rheology parameter                              rn_pstar      = ', rn_pstar
-         WRITE(numout,*) '         2nd bulk-rhelogy parameter                               rn_crhg       = ', rn_crhg
-         WRITE(numout,*) '         brine volume included in ice strength computation        ln_icestr_bvf = ', ln_icestr_bvf
-         WRITE(numout,*) '      rheology EVP (icerhg_evp)'
+         WRITE(numout,*) '   Namelist namice_rhg'
+        WRITE(numout,*) '      rheology EVP (icerhg_evp)'
          WRITE(numout,*) '         lateral boundary condition for sea ice dynamics          rn_ishlat     = ', rn_ishlat
          WRITE(numout,*) '         drag coefficient for oceanic stress                      rn_cio        = ', rn_cio