Skip to content
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
wants to merge 27 commits into
base: dev/cpt
Choose a base branch
from

Conversation

gustavo-marques
Copy link
Collaborator

No description provided.

pjpegion and others added 27 commits June 2, 2021 13:24
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.)
…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
Fix register_diag_field axes_grp pointer init
@codecov-commenter
Copy link

Codecov Report

Merging #14 (d339d77) into dev/cpt (7868fdd) will decrease coverage by 0.16%.
The diff coverage is 2.26%.

Impacted file tree graph

@@             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     
Impacted Files Coverage Δ
src/ALE/MOM_regridding.F90 21.36% <0.00%> (ø)
src/framework/MOM_diag_mediator.F90 54.09% <0.00%> (ø)
src/ocean_data_assim/MOM_oda_incupd.F90 0.00% <0.00%> (ø)
src/parameterizations/lateral/MOM_hor_visc.F90 43.48% <0.00%> (ø)
src/initialization/MOM_state_initialization.F90 20.92% <4.34%> (-1.03%) ⬇️
...parameterizations/vertical/MOM_diabatic_driver.F90 39.41% <14.81%> (-0.44%) ⬇️
src/core/MOM.F90 58.77% <60.00%> (-0.02%) ⬇️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 7868fdd...d339d77. Read the comment docs.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

8 participants