Conversation
…myi update based on a date or melt days
Conflicts: model/finiteelement.cpp
…n_with_age Conflicts: model/finiteelement.cpp
…xtsim into damage_and_concentration
…ion in the exponential.
…_with_age Conflicts: model/finiteelement.cpp
Conflicts: model/finiteelement.cpp
…au_u = C_d rho u |u| and tau_v = C_d rho v |v|, not tau_u = C_d rho u ||u,v|| etc.
…e new formulation.
simplify horrible B0T loop
These outputs have ambiguous names and it's difficult to find a good one. In the non-coupled case M_ocean_temp and M_ocean_salinity are the temperature and salinity we're nudging the prognostic values (M_sst and M_sss) towards. In the coupled case M_ocean_temp and M_ocean_salinity are the values received from the coupler and are equal to M_sst and M_sss. I, therefore, propose to name them "ocean temperature forcing" and "ocean salinity forcing". Not very good, but hopefully comprehensible.
I merged develop into debug_NANUK and used debug for all the conflicts.
We removed M_ridge_ratio_ht, which was not doing anything. Also two extra comments!
The NEMO_icemod.nc file is based on the CREG grid, which has a coordinate singularity over land. We, therefore, need masking if we want to do a coordinate based interpolation (as we do). Somehow earlier versions of the code sometime managed to perform this interpolation - even though that shouldn't work. But now it should always work.
I moved the parameter definition from the function where it is used to the initialisation phase. The reason is that setting Csens_io requires a call to vm, which costs a lot when it's done for each element.
Co-authored-by: Timothy Williams <tdcwilliams@gmail.com>
See discussion on PR #631
Nanuk merge
Small fixes
Issue632 crashing
Issue583 young ice update v2
Issue638 moorings vars
einola
approved these changes
Sep 12, 2023
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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.
model code for latest forecast