add option to copy inputs for regional grid hep20 and NUOPCfied flag …

…lwflag=2
feiliuesmf · May 9, 2016 · aeeaa3e · aeeaa3e
1 parent a553897
commit aeeaa3e
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 1 deletion.
diff --git a/bld/hycom.buildnml.csh b/bld/hycom.buildnml.csh
@@ -48,9 +48,16 @@ if ($MACH == "yellowstone") then
         echo "error copying hycom input data file, abort"
         exit 2
       endif
+  else if ($OCN_GRID == "hep20") then
+      if (-e /glade/p/work/abozec/hycom/HYCOM_CESM/INPUT_hep20/) then
+        cp -p -f /glade/p/work/abozec/hycom/HYCOM_CESM/INPUT_hep20/* .
+      else
+        echo "error copying hycom input data file, abort"
+        exit 2
+      endif
   endif
 ## NAVY Machines
-else  if ($MACH == "shepard") then
+else  if ($MACH == "shepard" || $MACH == "gordon") then
   echo "We are on" ${MACH}
   echo "Getting ocean input files"
 ## get the input file depending on the grid
@@ -68,6 +75,13 @@ else  if ($MACH == "shepard") then
         echo "error copying hycom input data file, abort"
         exit 2
       endif
+  else if ($OCN_GRID == "hep20") then
+      if (-e /p/work1/abozec/hycom/HYCOM_CESM/INPUT_hep20/) then
+        cp -p -f /p/work1/abozec/hycom/HYCOM_CESM/INPUT_hep20/* .
+      else
+        echo "error copying hycom input data file, abort"
+        exit 2
+      endif
   endif
 else  if ($MACH == "kilrain") then
   echo "We are on" ${MACH}
@@ -87,6 +101,13 @@ else  if ($MACH == "kilrain") then
         echo "error copying hycom input data file, abort"
         exit 2
       endif
+  else if ($OCN_GRID == "hep20") then
+      if (-e /scr/abozec/hycom/HYCOM_CESM/INPUT_hep20/) then
+        cp -p -f /scr/abozec/hycom/HYCOM_CESM/INPUT_hep20/* .
+      else
+        echo "error copying hycom input data file, abort"
+        exit 2
+      endif
   endif
 endif
 

diff --git a/sorc/thermf.F b/sorc/thermf.F
@@ -1138,9 +1138,19 @@ subroutine thermfj(m,n,dtime, j)
             endif !natm
           endif
           !correction is blackbody radiation from tdif at tsur
+#ifdef NUOPC
+          if(.not.(cpl_swflx.and.cpl_lwmdnflx.and.cpl_lwmupflx)) then
+             radfl = radfl - (4.506+0.0554*tsur) * tdif
+             !count the correction as a relaxation term
+             sstflx(i,j) = - (4.506+0.0554*tsur) * tdif
+          else
+             sstflx(i,j) = 0.0
+          endif
+#else
           radfl = radfl - (4.506+0.0554*tsur) * tdif
           !count the correction as a relaxation term
           sstflx(i,j) = - (4.506+0.0554*tsur) * tdif
+#endif
         else
           sstflx(i,j) = 0.0
         endif