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

Adds a 1D bgc forcing test case and a bgc D-TEST #5506

Merged
merged 5 commits into from
Apr 28, 2023

Conversation

njeffery
Copy link
Contributor

@njeffery njeffery commented Mar 6, 2023

Atmospheric, ocean and biogeochemical data from the 2004 Ice Station Polarstern (ISPOL) Weddell Sea (67.9S, 54W) experiment from June 16, 2004 to December 31, 2004. Core 2 from the ISPOL location fills out the remainder of the year.

A uniform_1D initial condition was added for flexible initialization of BGC. Atmophere and Ocean forcing use the nCells dimension of 1. A new testcase - single_cell_ispol - was added to
MPAS-Dev/MPAS-Seaice_standalone_framework to verify this forcing and initializtion. MPAS-Dev/MPAS-Seaice_standalone_framework#15

The ISPOL bgc forcing can be used with any of the gridded physics forcing datasets for testing purposes.

[NML]
[BFB]

Atmospheric, ocean and biogeochemical data from the 2004 Ice Station Polarstern (ISPOL)
Weddell Sea (67.9S, 54W) experiment from June 16, 2004 to December 31, 2004.
Core 2 from the ISPOL location fills out the remainder of the year.

A uniform_1D initial condition was added for flexible initialization.
A new testcase - single_cell_ispol - was added to
MPAS-Dev/MPAS-Seaice_standalone_framework to verify this forcing and initializtion.

BFB
Properly initializes enthalpy and salinity using colpkg_init_trcr
Seasonal bgc forcing is time-dependent only and can be used for a DTESTM-BGC
-Adds nCells dimension to ocean and atm ISPOL forcing to simplify code
-Updates ISPOL forcing files
-Adds a new namelist option: config_forcing_bgc_type='ISPOL'

BFB
@njeffery
Copy link
Contributor Author

njeffery commented Mar 6, 2023

This branch was created in response to the concerns of #5282. It includes 1D ISPOL forcing for a single column bgc testcase but has been adapted to be used in a BGC D-TEST. In addition, atm and ocean forcing files include an nCells dimension.

@njeffery
Copy link
Contributor Author

njeffery commented Mar 6, 2023

Completed the ispol single sell testcase and a 3-year DTESTM-BGC

@njeffery njeffery changed the title Njeffery/seaice/ispol column forcing dtest Adds a 1D bgc forcing test case and a bgc D-TEST Mar 6, 2023
njeffery added a commit to njeffery/MPAS-Seaice_standalone_framework that referenced this pull request Mar 7, 2023
@njeffery
Copy link
Contributor Author

njeffery commented Mar 7, 2023

The code changes pass the single_cell_ispol test case:
MPAS-Dev/MPAS-Seaice_standalone_framework#18

@jonbob
Copy link
Contributor

jonbob commented Apr 11, 2023

@eclare108213 and @akturner -- could you please review this whenever you get a chance? Thanks

Copy link
Contributor

@eclare108213 eclare108213 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

These changes look fine to me but now there are conflicts that must be resolved.
Nicole tested both single-cell and D cases earlier.

@jonbob
Copy link
Contributor

jonbob commented Apr 25, 2023

@njeffery -- I pushed changes to that Registry is consistent with the documentation you added in the namelist_files. If you get a chance, could you make sure they're what you wanted? I'l try a test merge and see if the file conflicts are easily resolved during that process

@jonbob
Copy link
Contributor

jonbob commented Apr 25, 2023

@njeffery -- I can manage the conflicts during the merge process

Copy link
Contributor Author

@njeffery njeffery left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@jonbob : Thanks for the clean-up. These changes look good.

@jonbob jonbob added the NML label Apr 27, 2023
jonbob added a commit that referenced this pull request Apr 27, 2023
#5506)

Adds a 1D bgc forcing test case and a bgc D-TEST

New data file with atmospheric, ocean and biogeochemical data from the
2004 Ice Station Polarstern (ISPOL) Weddell Sea experiment from
June 16, 2004 to December 31, 2004. Core 2 from the ISPOL location fills
out the remainder of the year.

A uniform_1D initial condition was added for flexible initialization of
BGC. Atmophere and Ocean forcing use the nCells dimension of 1. A new
testcase - single_cell_ispol - was added to the
MPAS-Seaice_standalone_framework to verify this forcing and
initialization.

The ISPOL bgc forcing can be used with any of the gridded physics
forcing datasets for testing purposes.

[NML]
[BFB]
@jonbob
Copy link
Contributor

jonbob commented Apr 27, 2023

passes:

  • SMS_D_Ld1.T62_oEC60to30v3.DTESTM.chrysalis_intel
  • SMS_D_Ld1.ne30pg2_EC30to60E2r2.WCYCL1850.chrysalis_intel.allactive-wcprod
  • ERS.ne11_oQU240.WCYCL1850NS.chrysalis_intel

with expected NML DIFFs

merged to next

@jonbob jonbob merged commit 7ab58cf into master Apr 28, 2023
@jonbob jonbob deleted the njeffery/seaice/ispol-column-forcing-Dtest branch April 28, 2023 16:37
@jonbob
Copy link
Contributor

jonbob commented Apr 28, 2023

merged to master and expected NML DIFFs blessed on all platforms except mappy -- which did not report

@njeffery
Copy link
Contributor Author

Thanks @jonbob !

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
BFB PR leaves answers BFB mpas-seaice NML
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants