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

fix for conda on gaea #428

Closed
wants to merge 2 commits into from
+2 −17
Closed

fix for conda on gaea #428

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
eb55777
fix for conda on gaea
mark-a-potts Oct 25, 2022
f4af87b
Removed unneccessary local modulefiles which were added an extra laye…
mark-a-potts Oct 26, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion modulefiles/tasks/gaea/get_extrn_ics.local.lua
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion modulefiles/tasks/gaea/get_extrn_lbcs.local.lua
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion modulefiles/tasks/gaea/make_grid.local.lua
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion modulefiles/tasks/gaea/make_ics.local.lua
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion modulefiles/tasks/gaea/make_lbcs.local.lua
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion modulefiles/tasks/gaea/make_orog.local.lua
View file
Open in desktop

This file was deleted.

4 changes: 0 additions & 4 deletions modulefiles/tasks/gaea/miniconda_regional_workflow.lua
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion modulefiles/tasks/gaea/run_fcst.local.lua
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion modulefiles/tasks/gaea/run_vx.local.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
load("miniconda_regional_workflow")
--load("miniconda_regional_workflow")
prepend_path("LD_LIBRARY_PATH", "/ncrc/sw/gaea-cle7/python/3.9/anaconda-base/envs/noaa_py3.9/lib")
6 changes: 1 addition & 5 deletions ush/load_modules_run_task.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/bin/bash
#!/bin/bash -l
Copy link
Collaborator

Choose a reason for hiding this comment

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

Does the bash script need to be login enabled in order for this work to function properly? According to the code manager's guide, all bash scripts must explicitly be #!/bin/bash scripts (and not login enabled).

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Oh, good catch! I don't think that is necessary. I added it to see if I could figure out what was going on. I will remove it on my side and run a quick test to be sure.


#
#-----------------------------------------------------------------------
Expand Down Expand Up @@ -184,10 +184,6 @@ module list
if [ -n "${SRW_ENV:-}" ] ; then
set +u
conda activate ${SRW_ENV}
if [ $machine = "gaea" ]; then
conda deactivate
conda activate ${SRW_ENV}
fi
set -u
fi

Expand Down