-
Notifications
You must be signed in to change notification settings - Fork 155
ice_dyn_vp: express rheology in terms of bulk and shear viscosities #647
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
Changes from 9 commits
a613ccc
d0648e9
2c32426
cfcec17
c3f8e29
e24cf6b
932197e
9a87e52
af1b43b
0aa8cc9
1eb3096
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -638,13 +638,13 @@ subroutine stress (nx_block, ny_block, & | |
| i, j, ij | ||
|
|
||
| real (kind=dbl_kind) :: & | ||
| divune, divunw, divuse, divusw , & ! divergence | ||
| tensionne, tensionnw, tensionse, tensionsw, & ! tension | ||
| shearne, shearnw, shearse, shearsw , & ! shearing | ||
| Deltane, Deltanw, Deltase, Deltasw , & ! Delt | ||
| zetax2ne, zetax2nw, zetax2se, zetax2sw , & ! 2 x zeta (visc coeff) | ||
| etax2ne, etax2nw, etax2se, etax2sw , & ! 2 x eta (visc coeff) | ||
| rep_prsne, rep_prsnw, rep_prsse, rep_prssw, & ! replacement pressure | ||
| divune, divunw, divusw, divuse , & ! divergence | ||
| tensionne, tensionnw, tensionsw, tensionse, & ! tension | ||
| shearne, shearnw, shearsw, shearse , & ! shearing | ||
| Deltane, Deltanw, Deltasw, Deltase , & ! Delt | ||
| zetax2ne, zetax2nw, zetax2sw, zetax2se , & ! 2 x zeta (visc coeff) | ||
| etax2ne, etax2nw, etax2sw, etax2se , & ! 2 x eta (visc coeff) | ||
| rep_prsne, rep_prsnw, rep_prssw, rep_prsse, & ! replacement pressure | ||
| ! puny , & ! puny | ||
| ssigpn, ssigps, ssigpe, ssigpw , & | ||
| ssigmn, ssigms, ssigme, ssigmw , & | ||
|
|
@@ -656,13 +656,16 @@ subroutine stress (nx_block, ny_block, & | |
| str12ew, str12we, str12ns, str12sn , & | ||
| strp_tmp, strm_tmp, tmp | ||
|
|
||
| logical :: capping ! of the viscous coef | ||
|
|
||
| character(len=*), parameter :: subname = '(stress)' | ||
|
|
||
| !----------------------------------------------------------------- | ||
| ! Initialize | ||
| !----------------------------------------------------------------- | ||
|
|
||
| str(:,:,:) = c0 | ||
| capping = .true. ! to be improved | ||
|
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Do we want to keep that comment ? as it stands I find it a little confusing, i.e. it could mean either "the fact that
Contributor
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. replaced by: ! could be later included in ice_in |
||
|
|
||
| do ij = 1, icellt | ||
| i = indxti(ij) | ||
|
|
@@ -694,13 +697,14 @@ subroutine stress (nx_block, ny_block, & | |
|
|
||
| call viscous_coeffs_and_rep_pressure (strength(i,j), tinyarea(i,j),& | ||
| Deltane, Deltanw, & | ||
| Deltase, Deltasw, & | ||
| Deltasw, Deltase, & | ||
| zetax2ne, zetax2nw, & | ||
| zetax2se, zetax2sw, & | ||
| zetax2sw, zetax2se, & | ||
| etax2ne, etax2nw, & | ||
| etax2se, etax2sw, & | ||
| etax2sw, etax2se, & | ||
| rep_prsne, rep_prsnw, & | ||
| rep_prsse, rep_prssw ) | ||
| rep_prssw, rep_prsse, & | ||
| capping) | ||
|
|
||
| !----------------------------------------------------------------- | ||
| ! the stresses ! kg/s^2 | ||
|
|
||
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
These changes to the argument declaration are not strictly needed and add noise to the diff, personally I would drop them.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Same thing for the arguments to
viscous_coeffs_and_rep_pressurebelowThere was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
ok corrected.