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

Update mpas-ocean to capture edge fluxes #3054

Merged
merged 4 commits into from
Jul 16, 2019

Conversation

mark-petersen
Copy link
Contributor

This PR is identical to #2760, but for maint-1.0. It adds variables within tracer_advection_mono to capture the edge based fluxes of temperature and salinity to fully close the heat and salinity budgets regionally.

[BFB]

@mark-petersen mark-petersen added mpas-ocean BFB PR leaves answers BFB maint-1.0 PRs for or issues about maint-1.0 labels Jul 10, 2019
@mark-petersen mark-petersen requested a review from vanroekel July 10, 2019 15:08
@mark-petersen mark-petersen force-pushed the mark-petersen/maint-1.0/captureEdgeTracerFluxes branch from 771d054 to db8823e Compare July 10, 2019 15:16
@mark-petersen
Copy link
Contributor Author

@vanroekel take a look to make sure this includes what you want. I am running some tests now.

@mark-petersen
Copy link
Contributor Author

passes:

./create_test SMS_D_Ln9.T62_oQU120_ais20.MPAS_LISIO_TEST.cori-knl_gnu -p acme -q debug --walltime 00:30:00

But failed these:

./create_test SMS_D_Ln9.T62_oQU120_ais20.MPAS_LISIO_TEST.cori-knl_intel -p acme -q debug --walltime 00:30:00
./create_test PET_Ln9.T62_oEC60to30v3.GMPAS-IAF.cori-knl_intel -p acme -q debug --walltime 00:30:00
./create_test PEM_Ln9.ne30_oECv3_ICG.A_WCYCL1850S.cori-knl_gnu -p acme -q debug --walltime 00:30:00

on cori-knl. Most likely not due to this PR, but I'd need to compare

@jonbob
Copy link
Contributor

jonbob commented Jul 11, 2019

@mark-petersen - those tests are failing because we also need the fix from PR #2769

@mark-petersen
Copy link
Contributor Author

@jonbob I added those two previous bug fixes. Thanks for pointing those out. I now have:

PASS SMS_D_Ln9.T62_oQU120_ais20.MPAS_LISIO_TEST.cori-knl_gnu RUN time=123
PASS SMS_D_Ln9.T62_oQU120_ais20.MPAS_LISIO_TEST.cori-knl_intel RUN time=367
PASS PEM_Ln9.ne30_oECv3_ICG.A_WCYCL1850S.cori-knl_gnu COMPARE_base_modpes
PASS PEM_Ln9.ne30_oECv3_ICG.A_WCYCL1850S.cori-knl_intel COMPARE_base_modpes

Much better! I'm still getting:

FAIL PET_Ln9.T62_oEC60to30v3.GMPAS-IAF.cori-knl_intel RUN time=6

Looking into that now...

@mark-petersen
Copy link
Contributor Author

mark-petersen commented Jul 12, 2019

This branch is not passing threading tests.

PASS PEM_Ln9.T62_oEC60to30v3.GMPAS-IAF.cori-knl_gnu RUN time=444
PASS PEM_Ln9.T62_oEC60to30v3.GMPAS-IAF.cori-knl_intel RUN time=392
PASS PEM_Ln9.ne30_oECv3_ICG.A_WCYCL1850S.cori-knl_gnu RUN time=732
PASS PEM_Ln9.ne30_oECv3_ICG.A_WCYCL1850S.cori-knl_gnu RUN time=730
PASS PEM_Ln9.ne30_oECv3_ICG.A_WCYCL1850S.cori-knl_intel RUN time=680
FAIL PET_Ln9.T62_oEC60to30v3.GMPAS-IAF.cori-knl_gnu RUN time=10
FAIL PET_Ln9.T62_oEC60to30v3.GMPAS-IAF.cori-knl_intel RUN time=6
FAIL PET_Ln9.ne30_oECv3_ICG.A_WCYCL1850S.cori-knl_gnu RUN time=9
PASS SMS_D_Ln9.T62_oQU120_ais20.MPAS_LISIO_TEST.cori-knl_gnu RUN time=115
PASS SMS_D_Ln9.T62_oQU120_ais20.MPAS_LISIO_TEST.cori-knl_gnu RUN time=123
PASS SMS_D_Ln9.T62_oQU120_ais20.MPAS_LISIO_TEST.cori-knl_intel RUN time=363
PASS SMS_D_Ln9.T62_oQU120_ais20.MPAS_LISIO_TEST.cori-knl_intel RUN time=367

I am checking on the maint-1.0 branch now.

@mark-petersen
Copy link
Contributor Author

The current maint-1.0 branch also fails those PET tests (hash 9fc77cb). The good news is that this PR is ready to merge. I'll make an issue for maint-1.0.

@mark-petersen
Copy link
Contributor Author

@vanroekel is out today. I'm removing him and adding me as reviewer.

@mark-petersen mark-petersen removed the request for review from vanroekel July 12, 2019 16:51
@mark-petersen
Copy link
Contributor Author

Reported PET problem at #3062. I was mistaken, I can't add myself as a reviewer.

@rljacob
Copy link
Member

rljacob commented Jul 12, 2019

Is @jonbob also out today? He's the assigned integrator. I could merge it.

@mark-petersen
Copy link
Contributor Author

@rljacob, yes please merge. @jonbob is out taking care of home ownership stuff. I know that the water cycle team wanted this in to restart their high-res B case.

@rljacob rljacob assigned rljacob and unassigned jonbob Jul 12, 2019
@rljacob
Copy link
Member

rljacob commented Jul 12, 2019

So does this PR fix all the PET tests on maint-1.0? Or 3 still fail?

@jonbob
Copy link
Contributor

jonbob commented Jul 15, 2019

@rljacob - I'm back and can take this back, if you need. I'm seeing the same PET failures on anvil, but I also tested current master and it has the same issue.

@rljacob rljacob assigned jonbob and unassigned rljacob Jul 15, 2019
@rljacob
Copy link
Member

rljacob commented Jul 15, 2019

Does this PR fix #3062 ?

@jonbob
Copy link
Contributor

jonbob commented Jul 16, 2019

@rljacob - I don't think #3062 is an MPAS problem but is a problem with the testing scripts. Is it OK to merge this one? I think the high-res run is waiting for it...

@rljacob
Copy link
Member

rljacob commented Jul 16, 2019

Yes go ahead.

@jonbob jonbob merged commit b606e49 into maint-1.0 Jul 16, 2019
jonbob added a commit that referenced this pull request Jul 16, 2019
…aint-1.0 (PR #3054)

Update mpas-ocean to capture edge fluxes

This PR is identical to #2760, but for maint-1.0. It adds variables
within tracer_advection_mono to capture the edge based fluxes of
temperature and salinity to fully close the heat and salinity budgets
regionally.

[BFB]
@jonbob
Copy link
Contributor

jonbob commented Jul 16, 2019

merged to maint-1.0

@jonbob jonbob deleted the mark-petersen/maint-1.0/captureEdgeTracerFluxes branch July 16, 2019 17:15
rljacob pushed a commit that referenced this pull request Apr 21, 2021
…9-03-29

Jgfouca/branch for acme split 2019 03 29
Change list:

Features:

Implements remaining changes for gustiness feature for EAMv2
Support multiqueueing for sandiatoss3
Add a new 'B' test option to indicate a build-only test
Bug fixes:

Remove dependence on "mask" variables in the mapping files that are input to the gen_domain tool.
Fix some issues with downloading input files when checksum files are not set up
Fix kokkos build, Make logic needs to happen after macro include or else kokkos flags are lost
CIME fixes for PIO2
Use consistent casing (all-caps) for build_threaded value
Test suite: scripts-regression-tests
Test baseline:
Test namelist changes:
Test status: [bit for bit, roundoff, climate changing]

Fixes [CIME Github issue #]

User interface changes?:

Update gh-pages html (Y/N)?:

Code review: @jedwards4b
rljacob pushed a commit that referenced this pull request May 6, 2021
…9-03-29

Jgfouca/branch for acme split 2019 03 29
Change list:

Features:

Implements remaining changes for gustiness feature for EAMv2
Support multiqueueing for sandiatoss3
Add a new 'B' test option to indicate a build-only test
Bug fixes:

Remove dependence on "mask" variables in the mapping files that are input to the gen_domain tool.
Fix some issues with downloading input files when checksum files are not set up
Fix kokkos build, Make logic needs to happen after macro include or else kokkos flags are lost
CIME fixes for PIO2
Use consistent casing (all-caps) for build_threaded value
Test suite: scripts-regression-tests
Test baseline:
Test namelist changes:
Test status: [bit for bit, roundoff, climate changing]

Fixes [CIME Github issue #]

User interface changes?:

Update gh-pages html (Y/N)?:

Code review: @jedwards4b
jgfouca pushed a commit that referenced this pull request Nov 7, 2024
…_markdown

Automatically Merged using E3SM Pull Request AutoTester
PR Title: change RRM docs to point from scream-docs to eamxx-scripts
PR Author: bogensch
PR LABELS: AT: AUTOMERGE, documentation, AT: Integrate Without Testing
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
BFB PR leaves answers BFB maint-1.0 PRs for or issues about maint-1.0 mpas-ocean
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants