Merged
Conversation
e44c0cd to
5f762f4
Compare
18 tasks
ee604f9 to
d4ccb90
Compare
d4ccb90 to
a3f8a17
Compare
13f7f57 to
fbf0b71
Compare
f49a851 to
29987ff
Compare
mark-petersen
approved these changes
May 8, 2019
Collaborator
mark-petersen
left a comment
There was a problem hiding this comment.
Tested compass_py3.7 package and this PR and successfully on grizzly and badger, compute node and front end node (except mpirun calls). Tested QU240 init, QU240 test, EC60to30 init.
Collaborator
Author
|
I'm holding off on merging this one for now because some small changes seem to be required based on recent merges into COMPASS. |
Includes planar_hex
This is better than moving them in the repo.
These functions are expected to make it simpler to make use of these tools within a pythonn workflow such as COMPASS where the user is working with xarray.Dataset and geometric_features.FeatureCollection objects instead of file names.
These include python cache directories as well as many, many other temporary, cache or config files that we might encounter.
Too many scripts are needed from elsewhere in the repo
It's too confusing to have mpas_mesh_tools next to mesh_tools. Plus, the package is pulling in scripts from throughout the repo, not just mesh tools.
The functions are in mpas_tools.ocean.coastline_alteration. The scripts in ocean/coastline_alteration still work the same as before by calling the functions.
This should prevent mistakes where files from other processes are accidentally retained (e.g. graph.info vs culled_graph.info)
The default is 'NETCDF3_64BIT' for MPAS compatibility.
This will hopefully avoid confusion with tools outside the package
Made the looping more efficient. Currently, still uses NetCDF4 instead of xarray.
6acfa96 to
eb25e77
Compare
mark-petersen
added a commit
to MPAS-Dev/MPAS-Model
that referenced
this pull request
May 10, 2019
…s' into ocean/develop A large number of updates to the COMPASS ocean API including: - using the geometric_features conda package (MPAS-Dev/geometric_features#102) - using the mpas_tools conda package (MPAS-Dev/MPAS-Tools#248) - updating the jigsaw_to_MPAS scripts to work as a python package and to support python 3 - update global_ocean scripts to python 3 and to use these new packages NOTE: This merge removes the capability to create the global meshes used in E3SM version 1, (2017-2018), where the base meshes were created with Doug Jacobsen’s tool. The global mesh creation remaining after this commit only uses the Jigsaw tool. In order to recreate meshes and initial conditions used in E3SM version 1, use repositories as of March 1, 2019: 1. MPAS-Model commit:42029f218175d893cf25e19a26d9b43382a44d54 2. MPAS-Tools commit:6d0fa3a24e879a1a5b6149d9fbfe80fa021489dc 3. geometric_features tag:E3SMv3grids 76709be closes #220 closes #213 closes #132 closes #166
xylar
added a commit
that referenced
this pull request
Jun 4, 2019
Add an external script to conda-package planar_hex In #248, planar_hex was moved into the conda-package for MPAS-Tools. However there is also a need for an external version of the tool. This PR adds a stub script called planar_hex that calls the code in the conda package. (The stub script is copied from a conda environment and is the same approach used to access entry points into python packages used elsewhere.)
ashwathsv
pushed a commit
to ashwathsv/MPAS-Model
that referenced
this pull request
Jul 21, 2020
…esh_tools' into ocean/develop A large number of updates to the COMPASS ocean API including: - using the geometric_features conda package (MPAS-Dev/geometric_features#102) - using the mpas_tools conda package (MPAS-Dev/MPAS-Tools#248) - updating the jigsaw_to_MPAS scripts to work as a python package and to support python 3 - update global_ocean scripts to python 3 and to use these new packages NOTE: This merge removes the capability to create the global meshes used in E3SM version 1, (2017-2018), where the base meshes were created with Doug Jacobsen’s tool. The global mesh creation remaining after this commit only uses the Jigsaw tool. In order to recreate meshes and initial conditions used in E3SM version 1, use repositories as of March 1, 2019: 1. MPAS-Model commit:42029f218175d893cf25e19a26d9b43382a44d54 2. MPAS-Tools commit:6d0fa3a24e879a1a5b6149d9fbfe80fa021489dc 3. geometric_features tag:E3SMv3grids 76709be closes MPAS-Dev#220 closes MPAS-Dev#213 closes MPAS-Dev#132 closes MPAS-Dev#166
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
This package is intended to include all the tools needed to run run COMPASS test cases and other typical mesh creation workflows. This includes: