Skip to content

Bugfix i2a & Add Orion to module-setup #61

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

Merged
MinsukJi-NOAA merged 17 commits into from
May 11, 2020
Merged

Bugfix i2a & Add Orion to module-setup #61

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
95f9ac3
Merge pull request #1 from NOAA-EMC/develop
DeniseWorthen Oct 4, 2019
39b5e91
Merge pull request #2 from NOAA-EMC/develop
DeniseWorthen Nov 23, 2019
eb563f4
Merge pull request #5 from NOAA-EMC/develop
DeniseWorthen Jan 1, 2020
584c900
Merge pull request #8 from NOAA-EMC/develop
DeniseWorthen Jan 16, 2020
95a1a3b
Merge pull request #9 from NOAA-EMC/develop
DeniseWorthen Jan 24, 2020
afd7481
Merge pull request #11 from NOAA-EMC/develop
DeniseWorthen Jan 28, 2020
eec1e4b
Merge pull request #16 from NOAA-EMC/develop
DeniseWorthen Feb 27, 2020
dc17f0d
Merge pull request #17 from NOAA-EMC/develop
DeniseWorthen Apr 2, 2020
b40ef25
Merge pull request #18 from NOAA-EMC/develop
DeniseWorthen Apr 16, 2020
62c1037
Merge pull request #19 from NOAA-EMC/develop
DeniseWorthen Apr 17, 2020
6e6fb73
Merge pull request #21 from NOAA-EMC/develop
DeniseWorthen Apr 20, 2020
083982c
Merge pull request #24 from NOAA-EMC/develop
DeniseWorthen Apr 24, 2020
fb49539
Merge pull request #27 from NOAA-EMC/develop
DeniseWorthen Apr 27, 2020
25cc1d5
Merge pull request #29 from NOAA-EMC/develop
DeniseWorthen Apr 28, 2020
333c3e3
fix in prep_ocn for datm when i2a phase does not exist
DeniseWorthen Apr 30, 2020
d4dd78c
Add Orion to module-setup.*.inc
MinsukJi-NOAA May 8, 2020
acd5b4a
Merge remote-tracking branch 'dw-i2a/bugfix/fix_i2a' into fix/module-…
MinsukJi-NOAA May 8, 2020
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
6 changes: 6 additions & 0 deletions src/conf/module-setup.csh.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,12 @@ else if ( { test -d /scratch1 -a ! -d /scratch } ) then
source /apps/lmod/lmod/init/$__ms_shell
endif
module purge
else if ( { test -d /work/noaa } ) then
# We are on Orion
if ( ! { module help >& /dev/null } ) then
source /apps/lmod/init/$__ms_shell
endif
module purge
else if ( { test -d /data } ) then
# We are on SSEC Wisconsin S4
if ( ! { module help >& /dev/null } ) then
Expand Down
6 changes: 6 additions & 0 deletions src/conf/module-setup.sh.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,12 @@ elif [[ -d /scratch1 && ! -d /scratch ]] ; then
source /apps/lmod/lmod/init/$__ms_shell
fi
module purge
elif [[ -d /work/noaa ]] ; then
# We are on Orion
if ( ! eval module help > /dev/null 2>&1 ) ; then
source /apps/lmod/init/$__ms_shell
fi
module purge
elif [[ -d /data ]] ; then
# We are on SSEC Wisconsin S4
if ( ! eval module help > /dev/null 2>&1 ) ; then
Expand Down
2 changes: 1 addition & 1 deletion src/module_MEDIATOR.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5455,7 +5455,7 @@ subroutine MedPhase_prep_ocn(gcomp, rc)
!--- merges to ocn
!---------------------------------------

if (is_local%wrap%i2a_active) then
if ((is_local%wrap%i2o_active) .and. (is_local%wrap%a2o_active))then

! atm and ice fraction
! atmwgt and icewgt are the "normal" fractions
Expand Down