Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge changes from main #6

Merged
merged 33 commits into from
Apr 10, 2020
Merged
Changes from 1 commit
Commits
Show all changes
33 commits
Select commit Hold shift + click to select a range
b5134ad
fixing bulletin board link (#391)
duvivier Jan 1, 2020
5d6b26c
Macros fixes and diag_type fix (#396)
apcraig Jan 17, 2020
e18b650
fsd2 (#394)
lettie-roach Jan 24, 2020
a2b9fab
Add conda environment to run on personal computers (#393)
phil-blain Jan 24, 2020
0011980
cleaning up minor documentation (#397)
duvivier Jan 30, 2020
1287fbc
Add CONTRIBUTING, update README (#392)
phil-blain Feb 2, 2020
321b0d2
cleaning up README
eclare108213 Feb 2, 2020
1513a66
implementing suggestions from PR #392
eclare108213 Feb 2, 2020
d1008ce
fixing spacing
eclare108213 Feb 2, 2020
9cc6b23
link to documentation section of resources index
eclare108213 Feb 2, 2020
ab56cbe
fix license link
eclare108213 Feb 2, 2020
77635aa
machines: conda: fix linux env to be in line with the doc (#400)
phil-blain Feb 5, 2020
5264e42
update izumi intel compiler after upgrade (#401)
apcraig Feb 7, 2020
0bd9cdc
doc: conda: add note about csh/tcsh (#402)
phil-blain Feb 7, 2020
1561e76
update suite.submit script and add new controls and cice.setup option…
apcraig Feb 14, 2020
2e1c3b7
Fix errors in cice.setup script and add travis tests to catch this so…
apcraig Feb 18, 2020
7e11a34
update copyright year, update internal version number in preparation …
apcraig Feb 21, 2020
f3aec72
Add additional basal stress parameters to the dynamics namelist (#404)
daveh150 Feb 26, 2020
e81f710
Added JRA55 forcing for gx3 grid; modified ice-forcing.F90 to now han…
rallard77 Feb 28, 2020
abc7b5a
Iceopen (#410)
daveh150 Feb 28, 2020
7e2a1d9
fix albedo initialization order of operations and update icepack (#414)
apcraig Mar 6, 2020
7b43a6f
update cori port and update icepack (#416)
apcraig Mar 10, 2020
771aecb
update wave_spec_frac filename implementation and update icepack (#417)
apcraig Mar 13, 2020
6cc0d6b
remove guest Bouchat from template
eclare108213 Mar 18, 2020
5f97e45
add Osinski to template
eclare108213 Mar 18, 2020
9040fe2
conda: Macros: add '-L' argument to the linker command (#418)
phil-blain Mar 26, 2020
9ac1863
Update travis data download to zenodo, update conda macos Macros file…
apcraig Mar 30, 2020
1bf6e8d
Isotopes for CICE (#423)
eclare108213 Apr 8, 2020
85ba54d
HYCOM notation: ewndsp,nwndsp --> wndewd,wndnwd (#425)
mhrib Apr 10, 2020
d529df8
Jedi DA modifications (#427)
apcraig Apr 10, 2020
a7c2893
Secure, that best guess for max_blocks is always >= 1 (#431)
mhrib Apr 10, 2020
1c6c225
update test reporting (#428)
apcraig Apr 10, 2020
31a1975
update cori batch setup (#432)
apcraig Apr 10, 2020
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Add additional basal stress parameters to the dynamics namelist (CICE…
…-Consortium#404)

* Made the following basalstress parameters namelist items in dynamics_nml: k2, alphab, threshold_bw.

* Updated documentation for updated basalstress parameters

* Correct typo in user_guide/ug_case)settings.rst

* Modified ice_read_write.F90:ice_open. Added nbytes variable to allow for large grids that can cause integer overflow

* Modified ice_read_write.F90:ice_open. Added nbytes variable to allow for large grids that can cause integer overflow

* Revert "Correct typo in user_guide/ug_case)settings.rst"

Reverting to make new branch to commit code changes, instead of working off of master.

This reverts commit 06c614a.

* Correct typo in ug_case_settings.rst

* Reverting to version prior to updating ice_open

* retrigger checks
daveh150 authored Feb 26, 2020

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature.
commit f3aec7200ba80cdca226693533ef703845f57ffa
14 changes: 8 additions & 6 deletions cicecore/cicedynB/dynamics/ice_dyn_shared.F90
Original file line number Diff line number Diff line change
@@ -85,8 +85,14 @@ module ice_dyn_shared
logical (kind=log_kind), public :: &
basalstress ! if true, basal stress for landfast on

! basal stress parameters
real (kind=dbl_kind), public :: &
k1 ! 1st free parameter for landfast parameterization
k1, & ! 1st free parameter for landfast parameterization
k2, & ! second free parameter (N/m^3) for landfast parametrization
alphab, & ! alphab=Cb factor in Lemieux et al 2015
threshold_hw ! max water depth for grounding
! see keel data from Amundrud et al. 2004 (JGR)


!=======================================================================

@@ -887,11 +893,7 @@ subroutine basal_stress_coeff (nx_block, ny_block, &
au, & ! concentration of ice at u location
hu, & ! volume per unit area of ice at u location (mean thickness)
hwu, & ! water depth at u location
hcu, & ! critical thickness at u location
k2 = 15.0_dbl_kind , & ! second free parameter (N/m^3) for landfast parametrization
alphab = 20.0_dbl_kind, & ! alphab=Cb factor in Lemieux et al 2015
threshold_hw = 30.0_dbl_kind ! max water depth for grounding
! see keel data from Amundrud et al. 2004 (JGR)
hcu ! critical thickness at u location

integer (kind=int_kind) :: &
i, j, ij
15 changes: 13 additions & 2 deletions cicecore/cicedynB/general/ice_init.F90
Original file line number Diff line number Diff line change
@@ -95,7 +95,8 @@ subroutine input_data
dxrect, dyrect
use ice_dyn_shared, only: ndte, kdyn, revised_evp, yield_curve, &
kevp_kernel, &
basalstress, k1, Ktens, e_ratio, coriolis, &
basalstress, k1, k2, alphab, threshold_hw, &
Ktens, e_ratio, coriolis, &
kridge, ktransport, brlx, arlx
use ice_transport_driver, only: advection
use ice_restoring, only: restore_ice
@@ -184,7 +185,7 @@ subroutine input_data
advection, coriolis, kridge, ktransport, &
kstrength, krdg_partic, krdg_redist, mu_rdg, &
e_ratio, Ktens, Cf, basalstress, &
k1
k1, k2, alphab, threshold_hw

namelist /shortwave_nml/ &
shortwave, albedo_type, &
@@ -296,6 +297,9 @@ subroutine input_data
close_boundaries = .false. ! true = set land on edges of grid
basalstress= .false. ! if true, basal stress for landfast is on
k1 = 8.0_dbl_kind ! 1st free parameter for landfast parameterization
k2 = 15.0_dbl_kind ! dah: second free parameter (N/m^3) for landfast parametrization
alphab = 20.0_dbl_kind ! alphab=Cb factor in Lemieux et al 2015
threshold_hw = 30.0_dbl_kind ! max water depth for grounding
Ktens = 0.0_dbl_kind ! T=Ktens*P (tensile strength: see Konig and Holland, 2010)
e_ratio = 2.0_dbl_kind ! EVP ellipse aspect ratio
advection = 'remap' ! incremental remapping transport scheme
@@ -569,6 +573,9 @@ subroutine input_data
call broadcast_scalar(Cf, master_task)
call broadcast_scalar(basalstress, master_task)
call broadcast_scalar(k1, master_task)
call broadcast_scalar(k2, master_task)
call broadcast_scalar(alphab, master_task)
call broadcast_scalar(threshold_hw, master_task)
call broadcast_scalar(Ktens, master_task)
call broadcast_scalar(e_ratio, master_task)
call broadcast_scalar(advection, master_task)
@@ -1036,8 +1043,12 @@ subroutine input_data
write(nu_diag,1000) ' mu_rdg = ', mu_rdg
if (kstrength == 1) &
write(nu_diag,1000) ' Cf = ', Cf

write(nu_diag,1010) ' basalstress = ', basalstress
write(nu_diag,1005) ' k1 = ', k1
write(nu_diag,1005) ' k2 = ', k2
write(nu_diag,1005) ' alphab = ', alphab
write(nu_diag,1005) ' threshold_hw = ', threshold_hw
write(nu_diag,1005) ' Ktens = ', Ktens
write(nu_diag,1005) ' e_ratio = ', e_ratio
write(nu_diag,1030) ' advection = ', &
3 changes: 3 additions & 0 deletions configuration/scripts/ice_in
Original file line number Diff line number Diff line change
@@ -118,6 +118,9 @@
e_ratio = 2.
basalstress = .false.
k1 = 8.
k2 = 15.
alphab = 20.
threshold_hw = 30.
coriolis = 'latitude'
kridge = 1
ktransport = 1
2 changes: 1 addition & 1 deletion doc/source/science_guide/sg_dynamics.rst
Original file line number Diff line number Diff line change
@@ -163,7 +163,7 @@ The parameterization for the seabed stress is described in :cite:`Lemieux16`. Th
:label: Cb

where :math:`k_2` determines the maximum seabed stress that can be sustained by the grounded parameterized ridge(s), :math:`u_0`
is a small residual velocity and :math:`\alpha_b=20` is a parameter to ensure that the seabed stress quickly drops when
is a small residual velocity and :math:`\alpha_b` is a parameter to ensure that the seabed stress quickly drops when
the ice concentration is smaller than 1. In the code, :math:`k_2 \max [0,(h_u - h_{cu})] e^{-\alpha_b * (1 - a_u)}` is defined as
:math:`T_b`. The quantities :math:`h_u`, :math:`a_{u}` and :math:`h_{cu}` are calculated at
the 'u' point based on local ice conditions (surrounding tracer points). They are respectively given by
3 changes: 3 additions & 0 deletions doc/source/user_guide/ug_case_settings.rst
Original file line number Diff line number Diff line change
@@ -275,6 +275,9 @@ Table of namelist options
"","", "``-1``", "Transport Disabled", ""
"","``basalstress``", "true/false", "use basal stress parameterization for landfast ice", ""
"","``k1``", "real", "1st free parameter for landfast parameterization", "8."
"","``k2``", "real", "2nd free parameter (N/m^3) for landfast parameterization", "15."
"","``alphab``", "real", ":math:`\alpha_{b}` factor in :cite:`Lemieux16`", "20."
"","``threshold_hw``", "real", "Max water depth for grounding (see :cite:`Amundrud04`)", "30."
"","``e_ratio``", "real", "EVP ellipse aspect ratio", "2.0"
"","``Ktens``", "real", "Tensile strength factor (see :cite:`Konig10`)", "0.0"
"","", "", "", ""