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

Update wave_spec_frac filename implementation and update icepack #417

Merged
merged 2 commits into from
Mar 13, 2020
Merged
Changes from 1 commit
Commits
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
Prev Previous commit
Merge branch 'master' of https://github.com/cice-consortium/cice into…
… wave_spec_file_in
apcraig committed Mar 13, 2020

Verified

This commit was signed with the committer’s verified signature.
aduth Andrew Duthie
commit e3ce8dcf9b088ce90b4b85dda1e67305064d2c52
4 changes: 2 additions & 2 deletions configuration/scripts/machines/env.cori_intel
Original file line number Diff line number Diff line change
@@ -29,12 +29,12 @@ module unload cray-hdf5-parallel
module unload cray-netcdf
module unload cray-netcdf-hdf5parallel
module unload cray-parallel-netcdf
module load cray-netcdf/4.6.1.3
module load cray-netcdf/4.6.3.2

module unload cray-libsci

module unload craype
module load craype/2.5.18
module load craype/2.6.2

setenv NETCDF_PATH ${NETCDF_DIR}
setenv OMP_PROC_BIND true
You are viewing a condensed version of this merge commit. You can view the full changes here.