Aqm bugfixes + New AQM Debug RT (#1505), INLINE_POST default (#1503),…

… WCOSS2 MAPL Enable Tests (#1507) (#1505) * Inline post is now compiled by default on all supported platforms * Create Debug RT for AQM, Bring in fixes from debug testing and @rmontuoro small updates to AQM * update wcoss2 module files with esmf/mapl and turn on gocart in coupled runs * disable regional_atmaq_debug on jet: time out issue Co-authored-by: Dusan Jovic <[email protected]> Co-authored-by: Jun Wang <[email protected]> Co-authored-by: jkbk2004 <[email protected]>
ufs-community · Dec 1, 2022 · 7a1ce44 · 7a1ce44
1 parent 3a8533c
commit 7a1ce44
Show file tree

Hide file tree

Showing 31 changed files with 7,483 additions and 4,577 deletions.
diff --git a/AQM b/AQM
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -63,7 +63,7 @@ set(AVX             OFF CACHE BOOL "Enable AVX-I instruction set")
 set(SIMDMULTIARCH   OFF CACHE BOOL "Enable multi-target SIMD instruction sets")
 set(DEBUG           OFF CACHE BOOL "Enable DEBUG mode")
 set(DEBUG_LINKMPI   ON  CACHE BOOL "Enable linkmpi option when DEBUG mode is on")
-set(INLINE_POST     OFF CACHE BOOL "Enable inline post")
+set(INLINE_POST     ON  CACHE BOOL "Enable inline post")
 set(MULTI_GASES     OFF CACHE BOOL "Enable MULTI_GASES")
 set(MOVING_NEST     OFF CACHE BOOL "Enable moving nest code")
 set(OPENMP          ON  CACHE BOOL "Enable OpenMP threading")

diff --git a/cmake/configure_acorn.cmake b/cmake/configure_acorn.cmake
@@ -1,4 +1,3 @@
-set(INLINE_POST     ON  CACHE BOOL "Enable inline post" FORCE)
 set(PARALLEL_NETCDF ON  CACHE BOOL "Enable parallel NetCDF" FORCE)
 set(DEBUG_LINKMPI   OFF CACHE BOOL "Enable linkmpi option when DEBUG mode is on" FORCE)
 set(AVX2            OFF CACHE BOOL "Enable AVX2 instruction set" FORCE)
diff --git a/cmake/configure_cheyenne.gnu.cmake b/cmake/configure_cheyenne.gnu.cmake
@@ -1 +0,0 @@
-set(INLINE_POST     ON CACHE BOOL "Enable inline post" FORCE)

diff --git a/cmake/configure_cheyenne.intel.cmake b/cmake/configure_cheyenne.intel.cmake
@@ -1,3 +1,2 @@
-set(INLINE_POST     ON  CACHE BOOL "Enable inline post" FORCE)
 set(PARALLEL_NETCDF ON  CACHE BOOL "Enable parallel NetCDF" FORCE)
 set(DEBUG_LINKMPI   OFF CACHE BOOL "Enable linkmpi option when DEBUG mode is on" FORCE)
diff --git a/cmake/configure_expanse.intel.cmake b/cmake/configure_expanse.intel.cmake
@@ -1,2 +1 @@
-set(INLINE_POST     ON  CACHE BOOL "Enable inline post" FORCE)
 set(PARALLEL_NETCDF ON  CACHE BOOL "Enable parallel NetCDF" FORCE)
diff --git a/cmake/configure_gaea.intel.cmake b/cmake/configure_gaea.intel.cmake
@@ -1,4 +1,3 @@
-set(INLINE_POST     ON  CACHE BOOL "Enable inline post" FORCE)
 set(PARALLEL_NETCDF ON  CACHE BOOL "Enable parallel NetCDF" FORCE)
 set(DEBUG_LINKMPI   OFF CACHE BOOL "Enable linkmpi option when DEBUG mode is on" FORCE)
 set(MOM6_Extra_FORTRAN_FLAGS "-xsse2")
diff --git a/cmake/configure_hera.gnu.cmake b/cmake/configure_hera.gnu.cmake
@@ -1,2 +1 @@
-set(INLINE_POST     ON CACHE BOOL "Enable inline post" FORCE)
 set(PARALLEL_NETCDF ON CACHE BOOL "Enable parallel NetCDF" FORCE)
diff --git a/cmake/configure_hera.intel.cmake b/cmake/configure_hera.intel.cmake
@@ -1,2 +1 @@
-set(INLINE_POST     ON CACHE BOOL "Enable inline post" FORCE)
 set(PARALLEL_NETCDF ON CACHE BOOL "Enable parallel NetCDF" FORCE)
diff --git a/cmake/configure_jet.intel.cmake b/cmake/configure_jet.intel.cmake
@@ -1,4 +1,3 @@
-set(INLINE_POST     ON CACHE BOOL "Enable inline post" FORCE)
 set(PARALLEL_NETCDF ON CACHE BOOL "Enable parallel NetCDF" FORCE)
 set(AVX2            OFF CACHE BOOL "Enable AVX2 instruction set" FORCE)
 set(SIMDMULTIARCH   ON  CACHE BOOL "Enable multi-target SIMD instruction sets" FORCE)
diff --git a/cmake/configure_linux.gnu.cmake b/cmake/configure_linux.gnu.cmake
@@ -1,2 +1 @@
-set(INLINE_POST     ON CACHE BOOL "Enable inline post" FORCE)
 set(PARALLEL_NETCDF ON CACHE BOOL "Enable parallel NetCDF" FORCE)
diff --git a/cmake/configure_linux.intel.cmake b/cmake/configure_linux.intel.cmake
@@ -1,2 +1 @@
-set(INLINE_POST     ON CACHE BOOL "Enable inline post" FORCE)
 set(PARALLEL_NETCDF ON CACHE BOOL "Enable parallel NetCDF" FORCE)
diff --git a/cmake/configure_macosx.gnu.cmake b/cmake/configure_macosx.gnu.cmake
@@ -1,4 +1,3 @@
-set(INLINE_POST     ON CACHE BOOL "Enable inline post" FORCE)
 set(PARALLEL_NETCDF ON CACHE BOOL "Enable parallel NetCDF" FORCE)
 
 # OpenMP broken for clang compiler

diff --git a/cmake/configure_macosx.intel.cmake b/cmake/configure_macosx.intel.cmake
@@ -1,3 +1,2 @@
-set(INLINE_POST     ON CACHE BOOL "Enable inline post" FORCE)
 set(PARALLEL_NETCDF ON CACHE BOOL "Enable parallel NetCDF" FORCE)
 set(DEBUG_LINKMPI  OFF CACHE BOOL "Enable linkmpi option when DEBUG mode is on" FORCE)
diff --git a/cmake/configure_orion.intel.cmake b/cmake/configure_orion.intel.cmake
@@ -1,2 +1 @@
-set(INLINE_POST     ON  CACHE BOOL "Enable inline post" FORCE)
 set(PARALLEL_NETCDF ON  CACHE BOOL "Enable parallel NetCDF" FORCE)
diff --git a/cmake/configure_s4.intel.cmake b/cmake/configure_s4.intel.cmake
@@ -1,4 +1,3 @@
-set(INLINE_POST     ON CACHE BOOL "Enable inline post" FORCE)
 set(AVX2            OFF CACHE BOOL "Enable AVX2 instruction set" FORCE)
 set(AVX             ON CACHE BOOL "Enable AVX2 instruction set" FORCE)
 set(PARALLEL_NETCDF ON CACHE BOOL "Enable parallel NetCDF" FORCE)
diff --git a/cmake/configure_stampede.intel.cmake b/cmake/configure_stampede.intel.cmake
@@ -1 +0,0 @@
-set(INLINE_POST     ON CACHE BOOL "Enable inline post" FORCE)

diff --git a/cmake/configure_wcoss2.cmake b/cmake/configure_wcoss2.cmake
@@ -1,4 +1,3 @@
-set(INLINE_POST     ON  CACHE BOOL "Enable inline post" FORCE)
 set(PARALLEL_NETCDF ON  CACHE BOOL "Enable parallel NetCDF" FORCE)
 set(DEBUG_LINKMPI   OFF CACHE BOOL "Enable linkmpi option when DEBUG mode is on" FORCE)
 set(AVX2            OFF CACHE BOOL "Enable AVX2 instruction set" FORCE)
diff --git a/modulefiles/ufs_wcoss2.intel.lua b/modulefiles/ufs_wcoss2.intel.lua
@@ -39,9 +39,6 @@ load(pathJoin("netcdf", netcdf_ver))
 pio_ver=os.getenv("pio_ver") or "2.5.7"
 load(pathJoin("pio", pio_ver))
 
-esmf_ver=os.getenv("esmf_ver") or "8.3.0b09"
-load(pathJoin("esmf", esmf_ver))
-
 fms_ver=os.getenv("fms_ver") or "2022.01"
 load(pathJoin("fms", fms_ver))
 
@@ -66,6 +63,19 @@ load(pathJoin("sp", sp_ver))
 w3emc_ver=os.getenv("w3emc_ver") or "2.9.2"
 load(pathJoin("w3emc", w3emc_ver))
 
+prepend_path("MODULEPATH", "/apps/dev/lmodules/intel/19.1.3.304")
+
+gftl_shared_ver=os.getenv("gftl_shared_ver") or "1.5.0"
+load(pathJoin("gftl_shared", gftl_shared_ver))
+
+prepend_path("MODULEPATH", "/apps/dev/modulefiles/mpi/intel/19.1.3.304/cray-mpich/8.1.9")
+
+esmf_ver=os.getenv("esmf_ver") or "8.3.0b09"
+load(pathJoin("esmf", esmf_ver))
+
+mapl_ver=os.getenv("mapl_ver") or "2.23.1-esmf-8.3.0b09"
+load(pathJoin("mapl", mapl_ver))
+
 setenv("CC", "cc")
 setenv("CXX", "CC")
 setenv("FC", "ftn")

diff --git a/modulefiles/ufs_wcoss2.intel_debug.lua b/modulefiles/ufs_wcoss2.intel_debug.lua
@@ -39,9 +39,6 @@ load(pathJoin("netcdf", netcdf_ver))
 pio_ver=os.getenv("pio_ver") or "2.5.7"
 load(pathJoin("pio", pio_ver))
 
-esmf_ver=os.getenv("esmf_ver") or "8.3.0b09"
-load(pathJoin("esmf", esmf_ver))
-
 fms_ver=os.getenv("fms_ver") or "2022.01"
 load(pathJoin("fms", fms_ver))
 
@@ -66,6 +63,19 @@ load(pathJoin("sp", sp_ver))
 w3emc_ver=os.getenv("w3emc_ver") or "2.9.2"
 load(pathJoin("w3emc", w3emc_ver))
 
+prepend_path("MODULEPATH", "/apps/dev/lmodules/intel/19.1.3.304")
+
+gftl_shared_ver=os.getenv("gftl_shared_ver") or "1.5.0"
+load(pathJoin("gftl_shared", gftl_shared_ver))
+
+prepend_path("MODULEPATH", "/apps/dev/modulefiles/mpi/intel/19.1.3.304/cray-mpich/8.1.9")
+
+esmf_ver=os.getenv("esmf_ver") or "8.3.0b09-debug"
+load(pathJoin("esmf", esmf_ver))
+
+mapl_ver=os.getenv("mapl_ver") or "2.23.1-esmf-8.3.0b09"
+load(pathJoin("mapl", mapl_ver))
+
 setenv("CC", "cc")
 setenv("CXX", "CC")
 setenv("FC", "ftn")
+2 −1		aqm_files.cmake
+30 −13		examples/aqm.rc
+11 −37		src/aqm_cap.F90
+1 −0		src/aqm_comp_mod.F90
+31 −8		src/drv/cmaq_mod.F90
+4 −2		src/drv/cmaq_model_mod.F90
+3 −0		src/io/ioapi/m3exit.F90
+19 −3		src/io/ioapi/m3utilio.F90
+3 −0		src/io/ioapi/m3warn.F90
+2,184 −0		src/model/src/AERO_PHOTDATA.F
+2 −3		src/model/src/ASX_DATA_MOD.F
+189 −138		src/model/src/DUST_EMIS.F
+2 −2		src/shr/Makefile.am
+9 −2		src/shr/Makefile.in
+92 −13		src/shr/aqm_config_mod.F90
+27 −0		src/shr/aqm_emis_mod.F90
+1 −0		src/shr/aqm_internal_mod.F90
+150 −0		src/shr/aqm_logger_mod.F90
+31 −47		src/shr/aqm_methods.F90
+1 −1		src/shr/aqm_prod_mod.F90
Original file line number	Diff line number	Diff line change
		@@ -1 +0,0 @@
		set(INLINE_POST ON CACHE BOOL "Enable inline post" FORCE)
Original file line number	Diff line number	Diff line change
		@@ -1,2 +1 @@
		set(INLINE_POST ON CACHE BOOL "Enable inline post" FORCE)
		set(PARALLEL_NETCDF ON CACHE BOOL "Enable parallel NetCDF" FORCE)