Merge pull request #30 from NOAA-EMC/develop

Bugfix i2a & Add Orion to module-setup (NOAA-EMC#61)
DeniseWorthen · May 12, 2020 · 4262519 · 4262519
2 parents 25cc1d5 + e88fd93
commit 4262519
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 1 deletion.
diff --git a/src/conf/module-setup.csh.inc b/src/conf/module-setup.csh.inc
@@ -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

diff --git a/src/conf/module-setup.sh.inc b/src/conf/module-setup.sh.inc
@@ -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

diff --git a/src/module_MEDIATOR.F90 b/src/module_MEDIATOR.F90
@@ -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