Merge branch 'noaa/develop' into update-ci-tests

Author: clark-evans

.gitignore

@@ -63,3 +63,21 @@ restart_timestamp
 
 src/core_*/inc
 build/
+
+# ignore output generated by the make system
+default_inputs/
+namelist.atmosphere
+namelist.init_atmosphere
+src/core_atmosphere/default_inputs/
+src/core_init_atmosphere/default_inputs/
+stream_list.atmosphere.da_state
+stream_list.atmosphere.diag_ugwp
+stream_list.atmosphere.diagnostics
+stream_list.atmosphere.output
+stream_list.atmosphere.surface
+streams.atmosphere
+streams.init_atmosphere
+
+# ignore ics and tables generated by get_data.sh
+testing_and_setup/ufs-community/data/ics/
+testing_and_setup/ufs-community/data/tables/

Makefile

@@ -366,7 +366,7 @@ ifort_icx:   # BUILDTARGET Intel Fortran, C, and C++ compiler suite
 	"FFLAGS_DEBUG = -g -convert big_endian -free -check all -fpe0 -traceback" \
 	"CFLAGS_DEBUG = -g -traceback" \
 	"CXXFLAGS_DEBUG = -g -traceback" \
-	"LDFLAGS_DEBUG = -g -fpe0 -traceback" \
+	"LDFLAGS_DEBUG = -g -traceback" \
 	"FFLAGS_OMP = -qopenmp" \
 	"CFLAGS_OMP = -qopenmp" \
 	"PICFLAG = -fpic" \

README.md

@@ -1,4 +1,4 @@
-MPAS-v8.3.1-2.32
+MPAS-v8.3.1-2.34
 ====
 
 The Model for Prediction Across Scales (MPAS) is a collaborative project for

src/core_atmosphere/physics/physics_wrf/module_ra_rrtmg_sw.F

@@ -10204,9 +10204,9 @@ subroutine rrtmg_swrad( &
        !    eot is based on the second equation at https://gml.noaa.gov/grad/solcalc/solareqns.PDF
        !    do not call rrtmg_sw is night-time:
        dorrsw = .true.
-       da=6.2831853071795862*(julian-1.)/365.
+       da=6.2831853071795862*(julian-0.5)/365.
        eot=(0.000075+0.001868*cos(da)-0.032077*sin(da) &
-            -0.014615*cos(2*da)-0.04089*sin(2*da))*(229.18)
+            -0.014615*cos(2*da)-0.040849*sin(2*da))*(229.18)
        xt24 = mod(xtime+radt*0.5,1440.)+eot
        tloctm = gmt + xt24/60. + xlong(i,j)/15.
        hrang = 15. * (tloctm-12.) * degrad