Changeset 28

Timestamp:

10/12/16 18:08:09 (8 years ago)

Author:

vancop

Message:

Add Griewank and Notz and salt diagnostics

Location:

branches/2016/dev_v3.20_2016_platelet

Files:

• INPUT/ISPOL/source_3.20/forcing.param.1d (modified) (1 diff)
• INPUT/ISPOL/source_3.20/icephys.param (modified) (2 diffs)
• INPUT/ISPOL/source_3.20/run.param.1d (modified) (1 diff)
• SOURCES/source_3.20/ice.com (modified) (2 diffs)

branches/2016/dev_v3.20_2016_platelet/INPUT/ISPOL/source_3.20/forcing.param.1d

@@ -32 +32 @@
 0       1.0     0.0
 # oceanic heat flux (W/m2) ; 5. is the ref
-99      1.0     12.00
+99      1.0     -30.00
 # snowfall (dimensions=length/timestep) 0.012 - 1h
 0       0.25000 0.0

branches/2016/dev_v3.20_2016_platelet/INPUT/ISPOL/source_3.20/icephys.param

@@ -13 +13 @@
 #
 # nlay_i        ! number of layers in the ice
-10
+20
 # nlay_s        ! number of layers in the snow
 1
@@ -47 +47 @@
 # ra_smooth     ! hyperbolic tangent coefficient for turbulent diffusivity (def:1)
 0.6
-# gravdr        ! type of gravity drainage 'CW' for Cox Weeks 88 or 'RA' for Rayleigh-number based
-RA
+# c_gravdr      ! gravity drainage: 'CW' = Cox Weeks 1988; 'DI' for eddy diffusive (Vetal10) or 'AD' for Advection-based (new)
+AD
+# c_sbr         ! computation of brine salinity for salt transport: linear ('LIN'), Weast 71 (WEA), Notz 05 (NTZ)
+LIN
+# c_perm        ! permeability of Freitag ('FRE') or Rees Jones and Worster ('RJW')
+FRE
+# c_permeff     ! form of effective permeability : minimum ('MIN') or harmonic mean ('HAR')
+MIN
 # delta_cw      ! CW88 grav. drainage eff.(1.68e-7 for CW88 or 0.588e-7 for V08 value)
 1.68e-7

branches/2016/dev_v3.20_2016_platelet/INPUT/ISPOL/source_3.20/run.param.1d

@@ -7 +7 @@
 LIM_BIO 
 # ddtb          ! time step of the model (86400., 3600.)
-86400.
+3600.
 # nstart    ! first time step (44,1057)
-44
+1057
 # nend      ! last time step  (365,8760) ! 408 for standard
-408 
+2056
 # nyear     ! initial year
 2004

branches/2016/dev_v3.20_2016_platelet/SOURCES/source_3.20/ice.com

@@ -178 +178 @@
 
       COMMON/heateqcoe/lfus,cpg,cpw,gammac,betak,tmut,tpw,
-     &              cpoc,deltah, betak1, betak2, visc_br, beta_ocs
+     &              cpoc,deltah, betak1, betak2, visc_br, thdiff_br,
+     &              beta_ocs
 
       COMMON/barrowconf/sal_read(11), hi_read(11), hgins, hnins,
@@ -196 +197 @@
      &                s_ini, ln_flo, ln_flu, ln_grd
 
-      CHARACTER*2 gravdr
+      CHARACTER*2 c_gravdr
       CHARACTER*4 alb_char, pre_char, sal_char
       CHARACTER*12 name_file_bar_par
       CHARACTER*17 name_file_bar_for
       CHARACTER*4  c_rad_scheme
-      CHARACTER*3  c_rad_discr
+      CHARACTER*3  c_rad_discr, c_sbr, c_perm, c_permeff
        
-      COMMON/chars/gravdr, alb_char, pre_char, sal_char, 
+      COMMON/chars/c_gravdr, alb_char, pre_char, sal_char, 
      &             name_file_bar_par, namefile_bar_for, 
-     &             c_rad_scheme, c_rad_discr
+     &             c_rad_scheme, c_rad_discr, c_sbr,
+     &             c_perm, c_permeff
 
       ! radiation transfer in sea ice