Update the calculation of uvel and vvel in evp dynamics #953
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
ice_dyn_evp.F90. Do an unmasked grid_average_X2Y when averaging from uvelE to uvel and from vvelN to vvel instead of a masked average. The masking is handled separately. This change is bit-for-bit and saves a few flops. Closes CICE-Consortium#952. Update the documentation to add the hemispheric sign dependence in the water stress terms in the dynamics equations. Closes CICE-Consortium#951.
|
I'm doing a full test suite to make sure answers haven't changed. @JFLemieux73 @eclare108213 Please review code changes and documentation, let me know if I've done something wrong. |
JFLemieux73
reviewed
May 14, 2024
| @@ -35,11 +35,11 @@ For clarity, the two components of Equation :eq:`vpmom` are | |||
| \begin{aligned} | |||
| m{\partial u\over\partial t} &= {\partial\sigma_{1j}\over\partial x_j} + \tau_{ax} + | |||
| a_i c_w \rho_w | |||
| \left|{\bf U}_w - {\bf u}\right| \left[\left(U_w-u\right)\cos\theta - \left(V_w-v\right)\sin\theta\right] | |||
| \left|{\bf U}_w - {\bf u}\right| \left[ + \left(U_w-u\right)\cos\theta \mp \left(V_w-v\right)\sin\theta\right] | |||
There was a problem hiding this comment.
not sure I would add the + sign before \left(U_w...
JFLemieux73
reviewed
May 14, 2024
| :label: vmom | ||
|
|
||
| where :math:`{\tt vrel}\ \cdot\ {\tt waterx(y)}= {\tt taux(y)}` and the definitions of :math:`u^{l}` and :math:`v^{l}` vary depending on the grid. | ||
|
|
||
| As :math:`u` and :math:`v` are collocated on the B grid, :math:`u^{l}` and :math:`v^{l}` are respectively :math:`u^{k+1}` and :math:`v^{k+1}` such that this system of equations can be solved as follows. Define | ||
|
|
||
| .. math:: | ||
| \hat{u} = F_u + \tau_{ax} - mg{\partial H_\circ\over\partial x} + {\tt vrel} \left(U_w\cos\theta - V_w\sin\theta\right) + {m\over\Delta t_e}u^k | ||
| \hat{u} = F_u + \tau_{ax} - mg{\partial H_\circ\over\partial x} + {\tt vrel} \left(+ U_w\cos\theta \mp V_w\sin\theta\right) + {m\over\Delta t_e}u^k |
There was a problem hiding this comment.
same comment here not sure I would add the + sign before U_w
There was a problem hiding this comment.
This was done just to keep the equations aligned a bit in the text. I'll remove them again, wasn't sure what was better.
There was a problem hiding this comment.
The extra plus signs are out, feel free to have another look. Can revert if you prefer the prior version. If I don't hear anything, will merge later today.
eclare108213
approved these changes
May 14, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
For detailed information about submitting Pull Requests (PRs) to the CICE-Consortium,
please refer to: https://github.com/CICE-Consortium/About-Us/wiki/Resource-Index#information-for-developers
PR checklist
Update the calculation of uvel and vvel in evp to reduce flops, bit-for-bit.
apcraig, jflemiuex, eclare
Full test suites run on derecho with intel, gnu, cray. All testing passes as expected, https://github.com/CICE-Consortium/Test-Results/wiki/cice_by_hash_forks#c5b390ec0507633c319e6c7d1cb2a6850924dc59
Update the calculation of uvel and vvel in subroutine evp in file ice_dyn_evp.F90. Do an unmasked grid_average_X2Y when averaging from uvelE to uvel and from vvelN to vvel instead of a masked average. The masking is handled separately. This change is bit-for-bit and saves a few flops. Closes #952.
Update the documentation to add the hemispheric sign dependence in the water stress terms in the dynamics equations. Closes #951.