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

Move load_compass_env.sh to the ocean dir #618

Merged

Conversation

xylar
Copy link
Collaborator

@xylar xylar commented Jul 1, 2020

Each core will have its own version of this file going forward.

@xylar
Copy link
Collaborator Author

xylar commented Jul 1, 2020

@mark-petersen and @sbrus89, this should be merged after #617 is merged to develop and develop is merged to ocean/develop.

@xylar
Copy link
Collaborator Author

xylar commented Jul 1, 2020

Testing

I tested by setting up the ocean/global_coean/QU240wISC/init test case with and without the --link_load_compass flag (after merging #617 into this branch). Without the flag, there is no load_compass_env.sh link in the test case, as expected. With the flag, the link is there and sourcing it loads the expected compass_0.1.6 environment on Grizzly.

@xylar xylar removed the Don't merge label Aug 4, 2020
@xylar
Copy link
Collaborator Author

xylar commented Aug 4, 2020

@mark-petersen, and @sbrus89, this should be tested an merged soon, since the load_compass_env.sh script won't be found in its current location anymore.

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.

I just tried this, and it works great. It be exact, on cori:

cd testing_and_setup/compass
source ocean/load_compass_env.sh

and (compass_0.1.6) shows up in front of my terminal prompt. Can then use any of the compass commands.

Sorry for the delay. I can merge today.

@xylar
Copy link
Collaborator Author

xylar commented Aug 17, 2020

@sbrus89, can you verify that the --link_load_compass flag works for you on this branch?

@xylar
Copy link
Collaborator Author

xylar commented Aug 17, 2020

@mark-petersen, please wait until @sbrus89 has approved.

@mark-petersen
Copy link
Contributor

@xylar, I can't get it to work with the --link_load_compass flag, but maybe I misunderstand how to use it. On ocean/develop with this PR merged locally, I try:

cd testing_and_setup/compass
./setup_testcase.py -q -f config.ocean_turq --work_dir /lustre/scratch3/turquoise/mpeterse/runs/nightly/ocean_model_200816_f53d3f0d \
  -n 54 -m runtime_definitions/mpirun.xml --link_load_compass

Traceback (most recent call last):
  File "./setup_testcase.py", line 27, in <module>
    import netCDF4
ImportError: No module named netCDF4

Also tried link_load_compass = True in config file, and get same response. Is that how we are supposed to test?

Do we want a --link_load_compass on manage_regression_suite.py for consistency?

@sbrus89
Copy link

sbrus89 commented Aug 17, 2020

@xylar, My link ends up pointing to the compass directory, not the ocean directory.

@xylar
Copy link
Collaborator Author

xylar commented Aug 17, 2020

@mark-petersen, I think you're misunderstanding the purpose. You still have to load compass. This just gives you a local link to the load_compass_env.sh so you can source it, e.g. in a job script. There is no way for the script to load compass for you because it is a python script and needs a working python environment already loaded.

@xylar
Copy link
Collaborator Author

xylar commented Aug 17, 2020

@sbrus89, maybe we need to rebase, since these changes will only work if #617 is included. I'll try locally on my laptop.

Each core will have its own version of this file going forward.
@mark-petersen
Copy link
Contributor

@xylar I did misunderstand, thanks.

@xylar xylar force-pushed the ocean/move_load_compass_env branch from 6940b06 to 968c8f8 Compare August 17, 2020 20:36
@xylar
Copy link
Collaborator Author

xylar commented Aug 17, 2020

@sbrus89, it worked for me after a rebase. Could you try again?

@sbrus89
Copy link

sbrus89 commented Aug 17, 2020

Thanks @xylar, that works for me now on Grizzly.

Copy link

@sbrus89 sbrus89 left a comment

Choose a reason for hiding this comment

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

Approved.

@mark-petersen mark-petersen merged commit 87fc57c into MPAS-Dev:ocean/develop Aug 17, 2020
mark-petersen added a commit that referenced this pull request Aug 17, 2020
* ocean/develop:
  Move load_compass_env.sh to the ocean dir #618
  Update ISOMIP+ docs, including tutorial for Ocean0 on LANL IC #653
  Fix path to docs in Travis CI #644
  New Mesh: WC14to60kmL60E3SMv2r03 #628
jonbob added a commit to E3SM-Project/E3SM that referenced this pull request Aug 18, 2020
Update MPAS-Source: COMPASS and Documentation files

This PRi brings in a new mpas-source submdoule with changes only to the ocean
core. It updates files unrelated to the E3SM forward model, including:
* Move load_compass_env.sh to the ocean dir  (MPAS-Dev/MPAS-Model#618);
* Update ISOMIP+ docs, including tutorial for Ocean0 on LANL IC
  (MPAS-Dev/MPAS-Model#653);
* Fix path to docs in Travis CI  (MPAS-Dev/MPAS-Model#644);
* atmosphere core init changes  (MPAS-Dev/MPAS-Model#637);
* New Mesh: WC14to60kmL60E3SMv2r03  (MPAS-Dev/MPAS-Model#628);
* Fix ISOMIP+ viz scripts  (MPAS-Dev/MPAS-Model#642);
* Add support for custom critical passages and land blockages
  (MPAS-Dev/MPAS-Model#586); and
* New Mesh: WC12to60kmL60E3SMv2r01  (MPAS-Dev/MPAS-Model#555)

[BFB]
jonbob added a commit to E3SM-Project/E3SM that referenced this pull request Aug 19, 2020
Update MPAS-Source: COMPASS and Documentation files

This PR brings in a new mpas-source submdoule with changes only to the ocean
core. It updates files unrelated to the E3SM forward model, including:
* Move load_compass_env.sh to the ocean dir  (MPAS-Dev/MPAS-Model#618);
* Update ISOMIP+ docs, including tutorial for Ocean0 on LANL IC
  (MPAS-Dev/MPAS-Model#653);
* Fix path to docs in Travis CI  (MPAS-Dev/MPAS-Model#644);
* atmosphere core init changes  (MPAS-Dev/MPAS-Model#637);
* New Mesh: WC14to60kmL60E3SMv2r03  (MPAS-Dev/MPAS-Model#628);
* Fix ISOMIP+ viz scripts  (MPAS-Dev/MPAS-Model#642);
* Add support for custom critical passages and land blockages
  (MPAS-Dev/MPAS-Model#586); and
* New Mesh: WC12to60kmL60E3SMv2r01  (MPAS-Dev/MPAS-Model#555)

[BFB]
@xylar xylar deleted the ocean/move_load_compass_env branch August 20, 2020 13:13
@xylar
Copy link
Collaborator Author

xylar commented Aug 20, 2020

Do we want a --link_load_compass on manage_regression_suite.py for consistency?

@mark-petersen, yes, that's on my to-do list. It would be modification to develop, so it will take some time to propagate even when it happens.

This pull request was closed.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants