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

CONUS mesh update #201

Merged
merged 3 commits into from
May 9, 2019
Merged

CONUS mesh update #201

merged 3 commits into from
May 9, 2019

Conversation

sbrus89
Copy link

@sbrus89 sbrus89 commented Apr 8, 2019 •
edited
Loading

Adds coastal resolution around Greenland in the NAEC60to30cr8 mesh. Also incorporates two minor updates to coastal_tools.py.

@sbrus89
Copy link
Author

sbrus89 commented Apr 8, 2019

Here is an image of what the high-resolution region around Greenland looks like now...

greenland_resolution

@sbrus89 sbrus89 requested a review from vanroekel April 8, 2019 21:58
@sbrus89
Copy link
Author

sbrus89 commented Apr 8, 2019

nCells is now 645,043 compared to 622,022 in the previous version.

@mark-petersen
Copy link
Contributor

It's a bargain! This looks good to me, based on the image. @maltrud what do you think?

@maltrud
Copy link
Contributor

maltrud commented Apr 8, 2019

@sbrus89 this looks great. can you please point us to the IC file when it is ready so we can have a closer look?

@sbrus89
Copy link
Author

sbrus89 commented Apr 8, 2019

@maltrud, I updated the directory:
/lustre/scratch4/turquoise/.mdt5/sbrus/MPAS-O_meshes/NAEC60to30cr8
to contain the new mesh files generated with this PR.

The previous version is now located in:
/lustre/scratch4/turquoise/.mdt5/sbrus/MPAS-O_meshes/NAEC60to30cr8/archive/fe1019e

matthewhoffman
matthewhoffman approved these changes Apr 8, 2019
View reviewed changes
Copy link
Member

@matthewhoffman matthewhoffman left a comment

Choose a reason for hiding this comment

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

@sbrus89 , fantastic job! Greenland looks great. I'm approving solely on that grounds.

@sbrus89
Copy link
Author

sbrus89 commented Apr 8, 2019

Thanks @matthewhoffman!

@pwolfram
Copy link
Contributor

pwolfram commented Apr 8, 2019

Excellent, thanks @sbrus89!

@xylar
Copy link
Collaborator

xylar commented Apr 9, 2019

I updated the directory:
/lustre/scratch4/turquoise/.mdt5/sbrus/MPAS-O_meshes/NAEC60to30cr8
to contain the new mesh files generated with this PR.

The description of the PR suggests cr10, rather than cr8. maybe update whichever of these is incorrect to avoid confusion.

@xylar
Copy link
Collaborator

xylar commented Apr 9, 2019

I'll be happy to do a more complete review of the tool updates next week when I'm back, if needed.

@sbrus89
Copy link
Author

sbrus89 commented Apr 9, 2019

@xylar, thanks for catching that. It should be cr8. I edited the description to reflect this. The paths should be correct since they are copy/pasted.

@mark-petersen
Copy link
Contributor

@sbrus89 we just had a major framework merge, including CONUS partial python 3 updates, so I rebased. I also removed jigsaw_to_MPAS as its own path in the config file, since it is just a directory.

Please remove the jigsaw_to_MPAS line from your compass general.config.ocean file and retest your CONUS cases on the head of this PR.

@sbrus89 sbrus89 force-pushed the CONUS_update branch 2 times, most recently from 9f6a3d0 to aa7f532 Compare April 10, 2019 17:16
Steven Brus and others added 3 commits April 10, 2019 16:28
Add Greenland to NAEC60to30cr8 mesh and update coastal_tools.py
a93f78d 
 - Add resolution around entire coast of Greenland

 - Fill in divot in resolution near Labrador Sea. This required a
   new parameter "point_list" in the coastal_tools default_params dictionary.
   This is a list of coordinates which act as user-specified coastline points when
   calculating the cell width distance function. In this case, a single point
   adds a circle of high resolution.

 - Make specifying the bathymetry dataset used to extract coastlines more flexible.
   A new parameter "nc_vars" in the default_params dictionary is a
   list of the variable names used in the netCDF file for lon, lat and bathy.
@mark-petersen
remove source_path=jigsaw_to_MPAS to subdirectory of mpas_model
eea24b3
Add 60 layer version of NAEC60to30cr8
50b204b
@sbrus89
Copy link
Author

sbrus89 commented Apr 10, 2019

@mark-petersen, thanks for making those updates. I tested and the mesh is B4B with the previous commit.

I also added a 60 layer case as requested by @maltrud, which has an identical horizontal mesh (with 20 fewer layers). The 60 layer mesh is located here:
/lustre/scratch4/turquoise/.mdt5/sbrus/MPAS-O_meshes/NAEC60to30cr8L60

mark-petersen
mark-petersen approved these changes Apr 11, 2019
View reviewed changes
Copy link
Contributor

@mark-petersen mark-petersen left a comment

Choose a reason for hiding this comment

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

Approved. This will be merged in a few weeks, as there are others waiting in line, and we need to coordinate bundles of MPAS PRs for each E3SM PR.
@sbrus89 Thanks for your quick response on updating the CONUS mesh.

vanroekel
vanroekel approved these changes Apr 11, 2019
View reviewed changes
Copy link
Contributor

@vanroekel vanroekel left a comment

Choose a reason for hiding this comment

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

mesh looks good to me. Thanks @sbrus89

@sbrus89 sbrus89 mentioned this pull request Apr 17, 2019
Merged
@xylar
Copy link
Collaborator

xylar commented Apr 24, 2019

@pwolfram and @maltrud, this PR is waiting on your review. Maybe you know that already.

pwolfram
pwolfram approved these changes Apr 24, 2019
View reviewed changes
Copy link
Contributor

@pwolfram pwolfram left a comment

Choose a reason for hiding this comment

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

Thanks @sbrus89 and @xylar for the reminder to review! Review by inspection.

@pwolfram
Copy link
Contributor

@mark-petersen, everyone has approved and this is ready to merge.

mark-petersen added a commit to mark-petersen/MPAS-Model that referenced this pull request May 8, 2019
@mark-petersen
Merge PR MPAS-Dev#201 'sbrus89/CONUS_update' into ocean/develop
a1256fb 
Adds coastal resolution around Greenland in the NAEC60to30cr8 mesh. Also
incorporates two minor updates to coastal_tools.py.
@mark-petersen mark-petersen mentioned this pull request May 8, 2019
Merged
@mark-petersen mark-petersen merged commit 50b204b into MPAS-Dev:ocean/develop May 9, 2019
mark-petersen added a commit that referenced this pull request May 9, 2019
@mark-petersen
Merge branch 'ocean/develop' into e3sm/develop
cb33532 
Includes:
1. #56 LIGHT update
2. #164 clean up ice shelf melt flag
3. merge coastal branch
4. #201 CONUS mesh update
@mark-petersen mark-petersen mentioned this pull request May 11, 2019
Merged
mark-petersen added a commit to E3SM-Project/E3SM that referenced this pull request May 22, 2019
@mark-petersen
Update mpas source.
36763e1 
Includes:

1. LIGHT update (MPAS-Ocean Lagrangian particles): MPAS-Dev/MPAS-Model#56
2. clean up ice shelf melt flag: MPAS-Dev/MPAS-Model#164
3. merge coastal branch: MPAS-Dev/MPAS-Model#54
4. CONUS mesh update: MPAS-Dev/MPAS-Model#201
5. Major COMPASS upgrade to python 3: MPAS-Dev/MPAS-Model#229
6. Eliminate outdated -DUNDERSCORE flag: MPAS-Dev/MPAS-Model#156
7. PIO Version Compatibility Check - PGI Compiler Bug Fix: MPAS-Dev/MPAS-Model#212

These changes do not alter E3SM standard cases or testing on next. COMPASS is
the MPAS testing infrastructure. LIGHT and coastal changes are protected by
flags and not used in normal E3SM tests.
jonbob added a commit to E3SM-Project/E3SM that referenced this pull request May 22, 2019
@jonbob
Merge branch 'mark-petersen/update_mpas_bfb' into next (PR #2918)
0c16901 
Update mpas source

This PR update the mpas-source git submodule but only includes changes that
will not impact E3SM. These changes include:
* LIGHT update (MPAS-Ocean Lagrangian particles): MPAS-Dev/MPAS-Model#56
* clean up ice shelf melt flag: MPAS-Dev/MPAS-Model#164
* merge coastal branch: MPAS-Dev/MPAS-Model#54
* CONUS mesh update: MPAS-Dev/MPAS-Model#201
* Major COMPASS upgrade to python 3: MPAS-Dev/MPAS-Model#229
* Eliminate outdated -DUNDERSCORE flag: MPAS-Dev/MPAS-Model#156
* PIO Version Compatibility Check - PGI Compiler Bug Fix: MPAS-Dev/MPAS-Model#212

These changes do not alter E3SM standard cases or tested configurations.
COMPASS is the MPAS testing infrastructure. LIGHT and coastal changes
are protected by flags and not used in normal E3SM tests.

[NML]
[BFB]
jonbob added a commit to E3SM-Project/E3SM that referenced this pull request May 23, 2019
@jonbob
Merge branch 'mark-petersen/update_mpas_bfb' (PR #2918)
fe07217 
Update mpas source

This PR update the mpas-source git submodule but only includes changes that
will not impact E3SM. These changes include:
* LIGHT update (MPAS-Ocean Lagrangian particles): MPAS-Dev/MPAS-Model#56
* clean up ice shelf melt flag: MPAS-Dev/MPAS-Model#164
* merge coastal branch: MPAS-Dev/MPAS-Model#54
* CONUS mesh update: MPAS-Dev/MPAS-Model#201
* Major COMPASS upgrade to python 3: MPAS-Dev/MPAS-Model#229
* Eliminate outdated -DUNDERSCORE flag: MPAS-Dev/MPAS-Model#156
* PIO Version Compatibility Check - PGI Compiler Bug Fix: MPAS-Dev/MPAS-Model#212

These changes do not alter E3SM standard cases or tested configurations.
COMPASS is the MPAS testing infrastructure. LIGHT and coastal changes
are protected by flags and not used in normal E3SM tests.

[NML]
[BFB]
@sbrus89 sbrus89 deleted the CONUS_update branch April 3, 2020 19:39
ashwathsv pushed a commit to ashwathsv/MPAS-Model that referenced this pull request Jul 21, 2020
@mark-petersen
Merge PR MPAS-Dev#201 'sbrus89/CONUS_update' into ocean/develop
705aa30 
Adds coastal resolution around Greenland in the NAEC60to30cr8 mesh. Also
incorporates two minor updates to coastal_tools.py.
caozd999 pushed a commit to caozd999/MPAS-Model that referenced this pull request Jan 14, 2021
@mark-petersen
Merge PR MPAS-Dev#201 'sbrus89/CONUS_update' into ocean/develop
c03f109 
Adds coastal resolution around Greenland in the NAEC60to30cr8 mesh. Also
incorporates two minor updates to coastal_tools.py.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@mark-petersen mark-petersen mark-petersen approved these changes

@matthewhoffman matthewhoffman matthewhoffman approved these changes

@pwolfram pwolfram pwolfram approved these changes

@maltrud maltrud maltrud approved these changes

@vanroekel vanroekel vanroekel approved these changes

Assignees

@mark-petersen mark-petersen

Labels
COMPASS mesh Ocean
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
7 participants
@sbrus89 @mark-petersen @maltrud @pwolfram @xylar @matthewhoffman @vanroekel