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.

Sign up for GitHub

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

Jump to bottom

Update MPAS-Ocean for coastal applications #3015

Merged
merged 1 commit into from
Oct 22, 2019
Merged

Update MPAS-Ocean for coastal applications #3015

merged 1 commit into from
Oct 22, 2019

Conversation

mark-petersen
Copy link
Contributor

Various additions for MPAS-Ocean coastal applications. Includes:

  • Addition of COMPASS test cases for coastal.
  • Add implicit Rayleigh drag (default off)
  • Alterations for wetting/drying (default off)

BFB

@rljacob rljacob added the BFB PR leaves answers BFB label Jun 25, 2019
jgfouca pushed a commit that referenced this pull request Jun 25, 2019
@jedwards4b
Merge pull request #3015 from ESMCI/fischer/ne30_support
9e2c5e9 
Fischer/ne30 support
Add grid support for ne30np4 and ne30pg3 to be able to run fully coupled. BHIST still
needs some additional data files to be regridded. Changes are also needed in cam and clm
to get ne30pg3 to run.

Test suite: scripts_regression_tests, SMS_D.ne30_g17.B1850.cheyenne_intel,
SMS_D.ne30pg3_g17.B1850.cheyenne_intel
Test baseline:
Test namelist changes:
Test status: bit for git

Fixes [CIME Github issue #]

User interface changes?:

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

Code review:jedwards
@jonbob
Copy link
Contributor

jonbob commented Jul 25, 2019

Note: this PR requires #3014 as a prerequisite

@rljacob rljacob added this to the v2.0alpha milestone Sep 19, 2019
@mark-petersen
Copy link
Contributor Author

@jonbob this PR is ready to merge. I ran a quick test:

./create_test -p acme -q debug --walltime 00:30:00 \
  PET_Ln3.T62_oEC60to30v3wLI.GMPAS-DIB-IAF-ISMF.cori-knl_intel

and it passes.

@mark-petersen
Copy link
Contributor Author

@jonbob There is a small chance these lines will cause this to be a non-BFB merge:

src/core_ocean/shared/mpas_ocn_vmix.F
-      A(1)=0
+      A(1)=0.0_RKIND
-         B(N) = 1 - A(N) + dt*implicitBottomDragCoef &
+         B(N) = 1.0_RKIND - A(N) + dt*implicitBottomDragCoef &

The old version makes the compiler convert an integer to an 8-byte real. The newer version is correct. Most likely it is a BFB change.

@mark-petersen mark-petersen force-pushed the mark-petersen/ocean/update_mpas_coastal branch from 4c3500b to 6d2bc58 Compare October 21, 2019 13:46
@mark-petersen mark-petersen deleted the mark-petersen/ocean/update_mpas_coastal branch October 21, 2019 13:47
@mark-petersen mark-petersen restored the mark-petersen/ocean/update_mpas_coastal branch October 21, 2019 13:47
@mark-petersen mark-petersen reopened this Oct 21, 2019
@mark-petersen
Copy link
Contributor Author

@jonbob sorry for the above confusion. I didn't see that I had made this branch on the mark-petersen fork. In the future I'll use E3SM-Project so we all use the same procedure.

@xylar
Copy link
Contributor

xylar commented Oct 21, 2019

@mark-petersen, I think there's been discussion that we have too many branches on E3SM-Projects/E3SM and that people should please use their own forks if they're comfortable doing so. @rljacob can chime in if he wants to, but my sense is that you should use your fork as you did here.

@jonbob
Copy link
Contributor

jonbob commented Oct 21, 2019

@xylar - I think the E3SM branches are OK because I can (and do) delete them once the PR's close.

@xylar
Copy link
Contributor

xylar commented Oct 21, 2019

Okay, fair enough.

@mark-petersen
Copy link
Contributor Author

Also passes:

./create_test -p acme -q debug --walltime 00:30:00 \
  PEM_Ln9.ne30_oECv3wLI.A_WCYCL1850-DIB-ISMF_CMIP6.cori-knl_intel

@jonbob
Copy link
Contributor

jonbob commented Oct 21, 2019

@mark-petersen - it's also fine to use your fork. It's easy enough to merge from there

@jonbob
Copy link
Contributor

jonbob commented Oct 21, 2019

@mark-petersen - you don't know if this is BFB from your testing?

@mark-petersen
Copy link
Contributor Author

I had not run a comparison run. I see create_test has a --compare and --baseline-name options. Trying that now...

@mark-petersen
Copy link
Contributor Author

@jonbob I was able to confirm that this merge is BFB (compared coupling files on ne30_oECv3wLI.A_WCYCL1850-DIB-ISMF_CMIP6). I think this is all set.

@jonbob
Copy link
Contributor

jonbob commented Oct 21, 2019

Perfect -- and thank you. I'll get this merged right away.

jonbob added a commit that referenced this pull request Oct 21, 2019
@jonbob
Merge branch 'mark-petersen/ocean/update_mpas_coastal' into next (PR #…
05254ac 
…3015)

Update MPAS-Ocean for coastal applications

This PR brings in a new mpas-source submodule, with changes to
mpas-ocean source code. The various additions are all for MPAS-Ocean coastal
applications, and include:
* Addition of COMPASS test cases for coastal (does not impact E3SM);
* Add implicit Rayleigh drag (default off); and
* Alterations for wetting/drying (default off)
Since all modifications are either off by default or do not impact E3SM,
this PR should not change answers.

[BFB]
@jonbob
Copy link
Contributor

jonbob commented Oct 21, 2019

merged to next
passed SMS.T62_oQU120_ais20.MPAS_LISIO_TEST.anvil_intel

jonbob added a commit that referenced this pull request Oct 22, 2019
@jonbob
Merge branch 'mark-petersen/ocean/update_mpas_coastal' (PR #3015)
5d42626 
Update MPAS-Ocean for coastal applications

This PR brings in a new mpas-source submodule, with changes to
mpas-ocean source code. The various additions are all for MPAS-Ocean coastal
applications, and include:
* Addition of COMPASS test cases for coastal (does not impact E3SM);
* Add implicit Rayleigh drag (default off); and
* Alterations for wetting/drying (default off)
Since all modifications are either off by default or do not impact E3SM,
this PR should not change answers.

[BFB]
@jonbob jonbob merged commit 6d2bc58 into E3SM-Project:master Oct 22, 2019
@jonbob
Copy link
Contributor

jonbob commented Oct 22, 2019

merged to master
@mark-petersen - you can delete this branch from your fork if you want

@mark-petersen mark-petersen deleted the mark-petersen/ocean/update_mpas_coastal branch October 22, 2019 16:33
jgfouca added a commit that referenced this pull request Oct 9, 2024
@jgfouca
Merge pull request #3015 from E3SM-Project/jgfouca/revert_kok_rrt
1b7eb5b 
Revert Kokkos rrtmgp
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@jonbob jonbob

Labels
BFB PR leaves answers BFB mpas-ocean
Projects
None yet
Milestone
v2.0alpha
Development

Successfully merging this pull request may close these issues.
4 participants
@mark-petersen @jonbob @xylar @rljacob