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

Jump to bottom

Bugfix i2a & Add Orion to module-setup (#61) #30

Merged
merged 1 commit into from
May 12, 2020
Merged

Bugfix i2a & Add Orion to module-setup (#61) #30

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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