Skip to content

Change visc_method default to avg_zeta #744

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.

Sign up for GitHub

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

Merged
eclare108213 merged 1 commit into from
Aug 2, 2022
Merged

Change visc_method default to avg_zeta #744

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
17 changes: 11 additions & 6 deletions cice.setup
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1180,21 +1180,26 @@ echo "-------test--------------"
echo "${testname_base}"
cd ${testname_base}
source ./cice.settings
set bldstat = 0
if (\${dobuild} == true) then
if (\${doreuse} == true) then
set ciceexe = "../ciceexe.\${ICE_TARGET}.\${ICE_ENVNAME}.\${ICE_COMMDIR}.\${ICE_BLDDEBUG}.\${ICE_THREADED}.\${ICE_IOTYPE}"
./cice.build --exe \${ciceexe}
set bldstat = \${status}
if !(-e \${ciceexe}) cp -p \${ICE_RUNDIR}/cice \${ciceexe}
else
./cice.build
set bldstat = \${status}
endif
endif
if (\${dosubmit} == true) then
set jobid = \`./cice.submit\`
echo "\$jobid"
echo "\$jobid \${ICE_TESTNAME} " >> ../suite.jobs
else if (\${dorun} == true) then
./cice.test
if (\$bldstat == 0) then
Copy link
Copy Markdown
Contributor

@eclare108213 eclare108213 Aug 2, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank you, I was wishing for this change last week!

if (\${dosubmit} == true) then
set jobid = \`./cice.submit\`
echo "\$jobid"
echo "\$jobid \${ICE_TESTNAME} " >> ../suite.jobs
else if (\${dorun} == true) then
./cice.test
endif
endif
cd ..
EOF
Expand Down
4 changes: 2 additions & 2 deletions cicecore/cicedynB/general/ice_init.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -404,7 +404,7 @@ subroutine input_data
Ktens = 0.0_dbl_kind ! T=Ktens*P (tensile strength: see Konig and Holland, 2010)
e_yieldcurve = 2.0_dbl_kind ! VP aspect ratio of elliptical yield curve
e_plasticpot = 2.0_dbl_kind ! VP aspect ratio of elliptical plastic potential
visc_method = 'avg_strength' ! calc viscosities at U point: avg_strength, avg_zeta
visc_method = 'avg_zeta' ! calc viscosities at U point: avg_strength, avg_zeta
deltaminEVP = 1e-11_dbl_kind ! minimum delta for viscosities (EVP, Hunke 2001)
deltaminVP = 2e-9_dbl_kind ! minimum delta for viscosities (VP, Hibler 1979)
capping_method = 'max' ! method for capping of viscosities (max=Hibler 1979,sum=Kreyscher2000)
Expand Down Expand Up @@ -889,7 +889,7 @@ subroutine input_data
call broadcast_scalar(Ktens, master_task)
call broadcast_scalar(e_yieldcurve, master_task)
call broadcast_scalar(e_plasticpot, master_task)
call broadcast_scalar(visc_method, master_task)
call broadcast_scalar(visc_method, master_task)
call broadcast_scalar(deltaminEVP, master_task)
call broadcast_scalar(deltaminVP, master_task)
call broadcast_scalar(capping_method, master_task)
Expand Down
2 changes: 1 addition & 1 deletion configuration/scripts/ice_in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,7 @@
Ktens = 0.
e_yieldcurve = 2.
e_plasticpot = 2.
visc_method = 'avg_strength'
visc_method = 'avg_zeta'
elasticDamp = 0.36d0
deltaminEVP = 1e-11
deltaminVP = 2e-9
Expand Down
2 changes: 1 addition & 1 deletion configuration/scripts/options/set_nml.alt07
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@ kdyn = 1
evp_algorithm = 'standard_2d'
ndte = 300
capping_method = 'sum'
visc_method = 'avg_zeta'
visc_method = 'avg_strength'

2 changes: 1 addition & 1 deletion doc/source/cice_index.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -738,7 +738,7 @@ either Celsius or Kelvin units).
"vice(n)", "volume per unit area of ice (in category n)", "m"
"vicen_init", "ice volume at beginning of timestep", "m"
"viscosity_dyn", "dynamic viscosity of brine", ":math:`1.79\times 10^{-3}` kg/m/s"
"visc_method", "method for calculating viscosities (‘avg_strength’ or ‘avg_zeta’)", "avg_strength"
"visc_method", "method for calculating viscosities (‘avg_strength’ or ‘avg_zeta’)", "avg_zeta"
"vocn", "ocean current in the y-direction", "m/s"
"vonkar", "von Karman constant", "0.4"
"vraftn", "volume of rafted ice", "m"
Expand Down
2 changes: 1 addition & 1 deletion doc/source/user_guide/ug_case_settings.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -488,7 +488,7 @@ dynamics_nml
"", "``geostropic``", "computed from ocean velocity", ""
"``threshold_hw``", "real", "Max water depth for grounding (see :cite:`Amundrud04`)", "30."
"``use_mean_vrel``", "logical", "Use mean of two previous iterations for vrel in VP", "``.true.``"
"``visc_method``", "``avg_strength``", "average strength for viscosities on U grid", "``avg_strength``"
"``visc_method``", "``avg_strength``", "average strength for viscosities on U grid", "``avg_zeta``"
"", "``avg_zeta``", "average zeta for viscosities on U grid", ""
"``yield_curve``", "``ellipse``", "elliptical yield curve", "``ellipse``"
"", "", "", ""
Expand Down