forked from mom-ocean/MOM6
-
Notifications
You must be signed in to change notification settings - Fork 1
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
Add option to use QG Leith with biharmonic #14
Draft
gustavo-marques
wants to merge
27
commits into
ocean-eddy-cpt:dev/cpt
Choose a base branch
from
gustavo-marques:QG_leith_biharmonic
base: dev/cpt
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Draft
Add option to use QG Leith with biharmonic #14
gustavo-marques
wants to merge
27
commits into
ocean-eddy-cpt:dev/cpt
from
gustavo-marques:QG_leith_biharmonic
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
Update to EMC fork
This is a basic framework to use NCODA increments on layer space for ODA incremental updates.
P_inc has been replaced by h of analysis state, add options to use full fields instead of increments and add diagnostics to get outputs of increments (for now to check what your increment looks like if full fields).
Increments calculation moved at initialization, updates applied over nstep instead of nstep+1 and increments diagnostics has been added
…rection and general clean up - Add option to use or not uv increment - The calculation of the increment when using full field has been moved at initialization - A SSH correction has been applied to h_obs to account for the different SSH between the background and target state - The incremental update is now done over nstep-1 - a general clean up has been done with variable name change to make the code easier to follow
…ility - remove the u,v,tv pointers from the set_up_oda_incupd subroutines - explicitly put tv,u,v in arguments of apply_oda_incupd - change name get_oda_increments to calc_oda_increments - explicitly put tv,u,v in arguments of calc_oda_increments - use loops to calculate sum of h’s - remove the 2018_answers options - added option to output increments when using full fields - added subroutine output_oda_incupd_inc to write a separate double-precision file for the increments. - add if (mask==1 ) condition to apply/calculate the increments -add pass_var,pass_vector on increments and u,v,tv at the end of calc_oda_increments and apply_oda_incupd respectively - added CS%ncount to restart file to have reproducibility on restart. - Added option ODA_INCUPD_RESET_NCOUNT (! default= True, If True, reinitialize number of updates already done.)
Add COAPS/FSU IAU capability
…ate-2021-07-08 Dev gfdl main candidate 2021 07 08
…20210723 merge GFDL 20210723 main branch (hash # b629e8d)
…L-20210723 update to GFDL 20210723 main branch
Several axes_grp pointers in register_diag_field were null()-initialized at declaration, e.g. type(axes_grp), pointer :: axes => null() This implicitly declares the pointers with `save`, which preserves its value across calls. First call excepted, these axes will not be initialized to null(). In this instance, this was causing d2 axes to be created when they should not have existed. This patch eliminates the implicit `save` attributes and applies explicit initialization when required.
- Testing with an ice shelf (e.g. ISOMIP) and using the SIGMA_SHELF_ZSTAR coordinate would have caught this bug.
remove unused index bounds, and fix sum_h2 loop.
Update MOM_oda_incupd.F90
Fix to commit 893a06e which broke the SIGMA_SHELF_ZSTAR option
…0210727 IAU candidate 20210727
Fix register_diag_field axes_grp pointer init
Codecov Report
@@ Coverage Diff @@
## dev/cpt #14 +/- ##
===========================================
- Coverage 29.29% 29.13% -0.17%
===========================================
Files 235 236 +1
Lines 70799 71224 +425
===========================================
+ Hits 20742 20750 +8
- Misses 50057 50474 +417
Continue to review full report at Codecov.
|
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.
No description provided.