Skip to content

UFS-dev PR#25 #79

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
grantfirl merged 12 commits into from
Dec 20, 2022
Merged

UFS-dev PR#25 #79

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
7a1ce44
Aqm bugfixes + New AQM Debug RT (#1505), INLINE_POST default (#1503),…
BrianCurtis-NOAA Dec 1, 2022
a514b51
Bug fix for the NoahMP tiled t2m and q2m (#1511)
ChunxiZhang-NOAA Dec 2, 2022
6c592ee
Merge commit 'a514b5' into ufs-dev-PR25
Dec 2, 2022
ace87dd
update FV3 submodule and .gitmodules for testing
Dec 16, 2022
a48f060
Merge branch 'main' into ufs-dev-PR25
Dec 16, 2022
e381759
update BL_DATE in rt.ncar.sh for new baselines
Dec 19, 2022
a98da79
[AutoRT] hera.gnu Job Completed.
Dec 19, 2022
f5d6b7f
[AutoRT] hera.intel Job Completed.
Dec 19, 2022
317d931
[AutoRT] cheyenne.gnu Job Completed.
Dec 20, 2022
b2d4dfd
temporarily increase WLCLK for regional_atmaq_debug
Dec 20, 2022
63579b3
[AutoRT] cheyenne.intel Job Completed.
Dec 20, 2022
8349ac9
update FV3 sub pointer, revert .gitmodules, revert WLCLK change
Dec 20, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion AQM
Open in desktop
Submodule AQM updated 20 files
+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
2 changes: 1 addition & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
2 changes: 1 addition & 1 deletion FV3
Open in desktop
Submodule FV3 updated 1 files
+1 −1 ccpp/physics
1 change: 0 additions & 1 deletion cmake/configure_acorn.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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)
1 change: 0 additions & 1 deletion cmake/configure_cheyenne.gnu.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +0,0 @@
set(INLINE_POST ON CACHE BOOL "Enable inline post" FORCE)
1 change: 0 additions & 1 deletion cmake/configure_cheyenne.intel.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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)
1 change: 0 additions & 1 deletion cmake/configure_expanse.intel.cmake
View file
Open in desktop
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)
1 change: 0 additions & 1 deletion cmake/configure_gaea.intel.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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")
1 change: 0 additions & 1 deletion cmake/configure_hera.gnu.cmake
View file
Open in desktop
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)
1 change: 0 additions & 1 deletion cmake/configure_hera.intel.cmake
View file
Open in desktop
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)
1 change: 0 additions & 1 deletion cmake/configure_jet.intel.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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)
1 change: 0 additions & 1 deletion cmake/configure_linux.gnu.cmake
View file
Open in desktop
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)
1 change: 0 additions & 1 deletion cmake/configure_linux.intel.cmake
View file
Open in desktop
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)
1 change: 0 additions & 1 deletion cmake/configure_macosx.gnu.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
1 change: 0 additions & 1 deletion cmake/configure_macosx.intel.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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)
1 change: 0 additions & 1 deletion cmake/configure_orion.intel.cmake
View file
Open in desktop
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)
1 change: 0 additions & 1 deletion cmake/configure_s4.intel.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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)
1 change: 0 additions & 1 deletion cmake/configure_stampede.intel.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +0,0 @@
set(INLINE_POST ON CACHE BOOL "Enable inline post" FORCE)
1 change: 0 additions & 1 deletion cmake/configure_wcoss2.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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)
16 changes: 13 additions & 3 deletions modulefiles/ufs_wcoss2.intel.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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))

Expand All @@ -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")
Expand Down
16 changes: 13 additions & 3 deletions modulefiles/ufs_wcoss2.intel_debug.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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))

Expand All @@ -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")
Expand Down
Loading