Skip to content
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

UFS-dev PR#27 #81

Merged
merged 16 commits into from
Jan 3, 2023
Merged

UFS-dev PR#27 #81

Show file tree
Hide file tree
Changes from 15 commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
60699c7
adding hr_ave_chem_v1 (#1513)
JianpingHuang-NOAA Dec 7, 2022
7e98ecf
clean up additional deprecated control dependencies (#1525)
jkbk2004 Dec 8, 2022
ce86979
update fms to fms/2022.04 and add a coupled mixed-mode test (#1514)
binli2337 Dec 12, 2022
c81a2f1
Merge HAFSv1 related developments back to the develop branch (#1518)
BinLiu-NOAA Dec 15, 2022
414050d
Merge commit 'c81a2f' into ufs-dev-PR27
Dec 20, 2022
28fe35f
update FV3 submodule
Dec 26, 2022
86cfb7e
Merge branch 'main' into ufs-dev-PR27
Dec 26, 2022
8437111
[AutoRT] cheyenne.gnu Job Completed.
Dec 26, 2022
312739c
[AutoRT] hera.gnu Job Completed.
Dec 26, 2022
552b47e
update BL_DATE in rt.ncar.sh
Dec 30, 2022
ff68ede
[AutoRT] cheyenne.gnu Job Completed.
Dec 30, 2022
6d6a8e0
[AutoRT] hera.intel Job Completed.
Dec 30, 2022
21af6e2
update BL_DATE and WLCLK in a couple of tests to complete RTs
Dec 30, 2022
afae2fb
revert test BL_DATE change
Jan 3, 2023
b27ef0a
[AutoRT] cheyenne.intel Job Completed.
Jan 3, 2023
e8c887f
update FV3 submodule pointer and revert .gitmodules
Jan 3, 2023
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
6 changes: 4 additions & 2 deletions .gitmodules
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
[submodule "FV3"]
path = FV3
url = https://github.com/NCAR/fv3atm
branch = main
url = https://github.com/grantfirl/fv3atm
branch = ufs-dev-PR27
#url = https://github.com/NCAR/fv3atm
#branch = main
[submodule "WW3"]
path = WW3
url = https://github.com/NOAA-EMC/WW3
Expand Down
16 changes: 12 additions & 4 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ list(APPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/CMakeModules/Modules)
###############################################################################

# Valid applications and choices
list(APPEND VALID_APPS ATM ATMAERO ATMAQ ATMW ATML LND S2S S2SA S2SW S2SWA S2SWAL HAFS HAFSW HAFS-ALL NG-GODAS)
list(APPEND VALID_APPS ATM ATMAERO ATMAQ ATMW ATML LND S2S S2SA S2SW S2SWA S2SWAL HAFS HAFSW HAFS-ALL NG-GODAS MS2SWA)
set(APP NONE CACHE BOOL "Application Name")
if(NOT (APP IN_LIST VALID_APPS))
message(FATAL_ERROR "${APP} is not a valid application.\nValid Applications are: ${VALID_APPS}")
Expand Down Expand Up @@ -121,13 +121,21 @@ endif()
find_package(NetCDF 4.7.4 REQUIRED C Fortran)
find_package(ESMF 8.3.0 MODULE REQUIRED)
if(FMS)
find_package(FMS 2022.01 REQUIRED COMPONENTS R4 R8)
if(32BIT)
find_package(FMS 2022.04 REQUIRED COMPONENTS R4 R8)
if(APP MATCHES "^(HAFSW)$")
add_library(fms ALIAS FMS::fms_r4)
else()
elseif (APP MATCHES "^(MS2SWA)$")
add_library(fms ALIAS FMS::fms_r8)
endif()
if(APP MATCHES "^(ATM|ATMAERO|ATMAQ|ATMW|ATML|LND|S2S|S2SA|S2SW|S2SWA|S2SWAL|HAFS|HAFS-ALL|NG-GODAS)$")
if(32BIT)
add_library(fms ALIAS FMS::fms_r4)
else()
add_library(fms ALIAS FMS::fms_r8)
endif()
endif()
endif()

if(CMEPS)
find_package(PIO 2.5.3 REQUIRED COMPONENTS C Fortran STATIC)
endif()
Expand Down
2 changes: 1 addition & 1 deletion FV3
Open in desktop
Submodule FV3 updated 22 files
+4 −2 .gitmodules
+35 −1 CMakeLists.txt
+1 −1 atmos_cubed_sphere
+28 −4 atmos_model.F90
+5 −1 ccpp/data/GFS_typedefs.F90
+6 −0 ccpp/data/GFS_typedefs.meta
+1 −1 ccpp/physics
+1 −1 ccpp/suites/suite_FV3_HAFS_v1_gfdlmp_tedmf.xml
+1 −1 ccpp/suites/suite_FV3_HAFS_v1_gfdlmp_tedmf_nonsst.xml
+91 −0 ccpp/suites/suite_FV3_HAFS_v1_thompson.xml
+91 −0 ccpp/suites/suite_FV3_HAFS_v1_thompson_noahmp.xml
+89 −0 ccpp/suites/suite_FV3_HAFS_v1_thompson_noahmp_nonsst.xml
+89 −0 ccpp/suites/suite_FV3_HAFS_v1_thompson_nonsst.xml
+1 −1 ccpp/suites/suite_FV3_HAFS_v1_thompson_tedmf_gfdlsf.xml
+19 −0 module_fcst_grid_comp.F90
+136 −0 moving_nest/bounding_box.F90
+2,515 −0 moving_nest/fv_moving_nest.F90
+1,147 −0 moving_nest/fv_moving_nest_main.F90
+1,436 −0 moving_nest/fv_moving_nest_physics.F90
+626 −0 moving_nest/fv_moving_nest_types.F90
+2,159 −0 moving_nest/fv_moving_nest_utils.F90
+1,905 −0 moving_nest/fv_tracker.F90
2 changes: 1 addition & 1 deletion HYCOM-interface/HYCOM
Open in desktop
Submodule HYCOM updated 1 files
+8 −2 NUOPC/hycom_couple.F90
6 changes: 3 additions & 3 deletions cmake/configure_apps.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,19 +42,19 @@ if(APP MATCHES "^(NG-GODAS)$")
message("Configuring UFS app in (CDEPS) Data Atmosphere mode")
endif()

if(APP MATCHES "^(S2S|S2SA|S2SW|S2SWA|S2SWAL)$")
if(APP MATCHES "^(S2S|S2SA|S2SW|S2SWA|S2SWAL|MS2SWA)$")
set(APP_MSG "Configuring UFS app in S2S")
set(CMEPS ON CACHE BOOL "Enable CMEPS" FORCE)
set(FMS ON CACHE BOOL "Enable FMS" FORCE)
set(FV3 ON CACHE BOOL "Enable FV3" FORCE)
set(MOM6 ON CACHE BOOL "Enable MOM6" FORCE)
set(CICE6 ON CACHE BOOL "Enable CICE6" FORCE)
set(STOCH_PHYS ON CACHE BOOL "Enable Stochastic Physics" FORCE)
if(APP MATCHES "^(S2SW|S2SWA|S2SWAL)")
if(APP MATCHES "^(S2SW|S2SWA|S2SWAL|MS2SWA)")
set(WW3 ON CACHE BOOL "Enable WAVEWATCH III" FORCE)
string(CONCAT APP_MSG ${APP_MSG} " with Waves")
endif()
if(APP MATCHES "^(S2SA|S2SWA)")
if(APP MATCHES "^(S2SA|S2SWA|MS2SWA)")
set(UFS_GOCART ON CACHE BOOL "Enable GOCART" FORCE)
string(CONCAT APP_MSG ${APP_MSG} " with Aerosols")
endif()
Expand Down
2 changes: 1 addition & 1 deletion modulefiles/ufs_common.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,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"
fms_ver=os.getenv("fms_ver") or "2022.04"
load(pathJoin("fms",fms_ver))

bacio_ver=os.getenv("bacio_ver") or "2.4.1"
Expand Down
2 changes: 1 addition & 1 deletion modulefiles/ufs_common_debug.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ load(pathJoin("pio", pio_ver))
esmf_ver=os.getenv("esmf_ver") or "8.3.0b09-debug"
load(pathJoin("esmf", esmf_ver))

fms_ver=os.getenv("fms_ver") or "2022.01"
fms_ver=os.getenv("fms_ver") or "2022.04"
load(pathJoin("fms",fms_ver))

bacio_ver=os.getenv("bacio_ver") or "2.4.1"
Expand Down
2 changes: 1 addition & 1 deletion modulefiles/ufs_gaea.intel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ module load hdf5/1.10.6
module load netcdf/4.7.4
module load pio/2.5.7
module load esmf/8.3.0b09
module load fms/2022.01
module load fms/2022.04

module load bacio/2.4.1
module load crtm/2.4.0
Expand Down
2 changes: 1 addition & 1 deletion modulefiles/ufs_gaea.intel_debug
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ module load hdf5/1.10.6
module load netcdf/4.7.4
module load pio/2.5.7
module load esmf/8.3.0b09-debug
module load fms/2022.01
module load fms/2022.04

module load bacio/2.4.1
module load crtm/2.4.0
Expand Down
22 changes: 12 additions & 10 deletions modulefiles/ufs_wcoss2.intel.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ help([[
loads UFS Model prerequisites on Cactus and Dogwood
]])

-- First, look for libraries in "prod" space
PrgEnv_intel_ver=os.getenv("PrgEnv_intel_ver") or "8.1.0"
load(pathJoin("PrgEnv-intel", PrgEnv_intel_ver))

Expand All @@ -17,10 +18,6 @@ load(pathJoin("cray-mpich", cray_mpich_ver))
cmake_ver=os.getenv("cmake_ver") or "3.20.2"
load(pathJoin("cmake", cmake_ver))

setenv("HPC_OPT", "/apps/ops/para/libs")
prepend_path("MODULEPATH", "/apps/ops/para/libs/modulefiles/compiler/intel/19.1.3.304")
prepend_path("MODULEPATH", "/apps/ops/para/libs/modulefiles/mpi/intel/19.1.3.304/cray-mpich/8.1.7")

jasper_ver=os.getenv("jasper_ver") or "2.0.25"
load(pathJoin("jasper", jasper_ver))

Expand All @@ -36,10 +33,7 @@ load(pathJoin("hdf5", hdf5_ver))
netcdf_ver=os.getenv("netcdf_ver") or "4.7.4"
load(pathJoin("netcdf", netcdf_ver))

pio_ver=os.getenv("pio_ver") or "2.5.7"
load(pathJoin("pio", pio_ver))

fms_ver=os.getenv("fms_ver") or "2022.01"
fms_ver=os.getenv("fms_ver") or "2022.04"
load(pathJoin("fms", fms_ver))

bacio_ver=os.getenv("bacio_ver") or "2.4.1"
Expand All @@ -63,13 +57,21 @@ load(pathJoin("sp", sp_ver))
w3emc_ver=os.getenv("w3emc_ver") or "2.9.2"
load(pathJoin("w3emc", w3emc_ver))

-- Second, look for libraries in "para"
setenv("HPC_OPT", "/apps/ops/para/libs")
prepend_path("MODULEPATH", "/apps/ops/para/libs/modulefiles/compiler/intel/19.1.3.304")
prepend_path("MODULEPATH", "/apps/ops/para/libs/modulefiles/mpi/intel/19.1.3.304/cray-mpich/8.1.7")

pio_ver=os.getenv("pio_ver") or "2.5.7"
load(pathJoin("pio", pio_ver))

-- Finally, look for libraries in "dev" space
prepend_path("MODULEPATH", "/apps/dev/lmodules/intel/19.1.3.304")
prepend_path("MODULEPATH", "/apps/dev/modulefiles/mpi/intel/19.1.3.304/cray-mpich/8.1.9")

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))

Expand Down
22 changes: 12 additions & 10 deletions modulefiles/ufs_wcoss2.intel_debug.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ help([[
loads UFS Model prerequisites on Cactus and Dogwood
]])

-- First, look for libraries on "prod" space
PrgEnv_intel_ver=os.getenv("PrgEnv_intel_ver") or "8.1.0"
load(pathJoin("PrgEnv-intel", PrgEnv_intel_ver))

Expand All @@ -17,10 +18,6 @@ load(pathJoin("cray-mpich", cray_mpich_ver))
cmake_ver=os.getenv("cmake_ver") or "3.20.2"
load(pathJoin("cmake", cmake_ver))

setenv("HPC_OPT", "/apps/ops/para/libs")
prepend_path("MODULEPATH", "/apps/ops/para/libs/modulefiles/compiler/intel/19.1.3.304")
prepend_path("MODULEPATH", "/apps/ops/para/libs/modulefiles/mpi/intel/19.1.3.304/cray-mpich/8.1.7")

jasper_ver=os.getenv("jasper_ver") or "2.0.25"
load(pathJoin("jasper", jasper_ver))

Expand All @@ -36,10 +33,7 @@ load(pathJoin("hdf5", hdf5_ver))
netcdf_ver=os.getenv("netcdf_ver") or "4.7.4"
load(pathJoin("netcdf", netcdf_ver))

pio_ver=os.getenv("pio_ver") or "2.5.7"
load(pathJoin("pio", pio_ver))

fms_ver=os.getenv("fms_ver") or "2022.01"
fms_ver=os.getenv("fms_ver") or "2022.04"
load(pathJoin("fms", fms_ver))

bacio_ver=os.getenv("bacio_ver") or "2.4.1"
Expand All @@ -63,13 +57,21 @@ load(pathJoin("sp", sp_ver))
w3emc_ver=os.getenv("w3emc_ver") or "2.9.2"
load(pathJoin("w3emc", w3emc_ver))

-- Seond, look for libraries in "para"
setenv("HPC_OPT", "/apps/ops/para/libs")
prepend_path("MODULEPATH", "/apps/ops/para/libs/modulefiles/compiler/intel/19.1.3.304")
prepend_path("MODULEPATH", "/apps/ops/para/libs/modulefiles/mpi/intel/19.1.3.304/cray-mpich/8.1.7")

pio_ver=os.getenv("pio_ver") or "2.5.7"
load(pathJoin("pio", pio_ver))

-- Finally, look for libraries in "dev" space
prepend_path("MODULEPATH", "/apps/dev/lmodules/intel/19.1.3.304")
prepend_path("MODULEPATH", "/apps/dev/modulefiles/mpi/intel/19.1.3.304/cray-mpich/8.1.9")

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))

Expand Down
Loading