fix TR8.sh and missing _r8

brian-eaton · Feb 19, 2025 · f579f58 · f579f58
1 parent 8262c03
commit f579f58
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 2 deletions.
diff --git a/doc/ChangeLog b/doc/ChangeLog
@@ -123,6 +123,9 @@ src/physics/cam/physics_types.F90
 src/physics/camrt/radiation.F90
  . remove old comment(s) for EUL
 
+src/physics/cam/gw_movmtn.F90
+. add missing _r8 at line 488
+
 src/physics/simple/physpkg.F90
 . remove old comment
 . remove dycore_is('EUL') from conditional
@@ -136,6 +139,8 @@ src/utils/spmd_utils.F90
 
 test/system/TR8.sh
 . remove filepaths for eul dycore and advection.
+. fix expression at line 33 which should be incrementing rc, not just
+  setting it with the current value from the carma directory.
 
 tools/nudging/Gen_Data/Gen_Data_FVdycore/Gen_Data_SETNAME_f09/makeIC_Create_field_Master_List.ncl
 tools/nudging/Gen_Data/Gen_Data_FVdycore/Gen_Data_SETNAME_f09/makeIC_ERAI.csh

diff --git a/src/physics/cam/gw_movmtn.F90 b/src/physics/cam/gw_movmtn.F90
@@ -485,7 +485,7 @@ subroutine vorticity_flux_src (vorticity , ncol, pverx, alpha_gw_movmtn, vort_sr
   steering_level(:ncol) = pverx - 20
   launch_level(:ncol)   = steering_level -10
 
-  scale_factor   = 1.e4 ! scales vorticity amp to u'w' in CLUBB
+  scale_factor   = 1.e4_r8 ! scales vorticity amp to u'w' in CLUBB
   !-----------------------------------
   ! Simple average over layers.
   ! Probably can do better

diff --git a/test/system/TR8.sh b/test/system/TR8.sh
@@ -30,7 +30,7 @@ rc=$?
 ruby $ADDREALKIND_EXE -r r8 -l 1 -d $CAM_ROOT/src/physics/camrt
 rc=`expr $? + $rc`
 ruby $ADDREALKIND_EXE -r r8 -l 1 -d $CAM_ROOT/src/physics/carma
-rc=$?
+rc=`expr $? + $rc`
 ruby $ADDREALKIND_EXE -r r8 -l 1 -d $CAM_ROOT/src/physics/rrtmg -s aer_src
 rc=`expr $? + $rc`
 ruby $ADDREALKIND_EXE -r r8 -l 1 -d $CAM_ROOT/src/physics/rrtmgp -s data,ext