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.

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

Fix type mismatch compiler error when gfortran 10 is used without '-fallow-argument-mismatch' flag #1147

Merged
merged 113 commits into from
Mar 20, 2024
Merged
Changes from 1 commit
Commits
Show all changes
113 commits
Select commit Hold shift + click to select a range
b5ab330
Update .gitmodules
DusanJovic-NOAA Mar 23, 2022
3e445e2
Resolve argument mismatch errors when using gfortran
DusanJovic-NOAA Mar 24, 2022
50cef09
Update FV3
DusanJovic-NOAA Mar 29, 2022
4be4e0e
Merge remote-tracking branch 'origin/develop' into no_arg_mismatch
DusanJovic-NOAA Mar 29, 2022
1874364
Merge remote-tracking branch 'origin/develop' into no_arg_mismatch
DusanJovic-NOAA Apr 8, 2022
1b04fb6
Merge remote-tracking branch 'origin/develop' into no_arg_mismatch
DusanJovic-NOAA May 13, 2022
eef2070
Update FV3
DusanJovic-NOAA Jun 14, 2022
5feb519
Merge remote-tracking branch 'origin/develop' into no_arg_mismatch
DusanJovic-NOAA Jun 14, 2022
47f446b
update FV3
DusanJovic-NOAA Jul 5, 2022
58f5fbb
Merge remote-tracking branch 'origin/develop' into no_arg_mismatch
DusanJovic-NOAA Jul 5, 2022
c949167
Merge remote-tracking branch 'origin/develop' into no_arg_mismatch
DusanJovic-NOAA Jul 13, 2022
65ef6f8
update FV3
DusanJovic-NOAA Jul 19, 2022
1fcbe29
update stochastic_physics
DusanJovic-NOAA Jul 19, 2022
1c5b6ad
Merge remote-tracking branch 'origin/develop' into no_arg_mismatch
DusanJovic-NOAA Jul 19, 2022
65df0f1
update FV3
DusanJovic-NOAA Jul 19, 2022
dc8a5fc
update FV3
DusanJovic-NOAA Jul 20, 2022
489297c
update FV3
DusanJovic-NOAA Aug 10, 2022
cc90bd7
Merge remote-tracking branch 'origin/develop' into no_arg_mismatch
DusanJovic-NOAA Aug 10, 2022
4c2cf8c
Update FV3
DusanJovic-NOAA Sep 28, 2022
b9744af
Update stochastic_physics
DusanJovic-NOAA Sep 28, 2022
865d7e5
Merge remote-tracking branch 'origin/develop' into no_arg_mismatch
DusanJovic-NOAA Sep 28, 2022
4d8cee7
update FV3
DusanJovic-NOAA Sep 28, 2022
28919f1
Update FV3
DusanJovic-NOAA Oct 13, 2022
68d9f84
Merge branch 'develop' into no_arg_mismatch
DusanJovic-NOAA Oct 13, 2022
4520d99
Update FV3
DusanJovic-NOAA Oct 17, 2022
e6a0fdd
Merge remote-tracking branch 'origin/develop' into no_arg_mismatch
DusanJovic-NOAA Oct 17, 2022
fd8b682
Update FV3
DusanJovic-NOAA Nov 7, 2022
209d603
Merge remote-tracking branch 'origin/develop' into no_arg_mismatch
DusanJovic-NOAA Nov 7, 2022
16e6ec0
Update submodule pointer for CMakeModules
climbfuji Nov 7, 2022
b662de2
Update .gitmodules and submodule pointer for FV3
climbfuji Nov 7, 2022
63f9b1b
Also find shared PIO libraries
climbfuji Nov 7, 2022
2a000bc
Update modulefiles/ufs_cheyenne.gnu.lua, modulefiles/ufs_cheyenne.gnu…
climbfuji Nov 7, 2022
5dee80d
Remove lmod reinit for Cheyenne in tests/module-setup.sh
climbfuji Nov 7, 2022
fd999ae
Merge branch 'no_arg_mismatch' of https://github.com/dusanjovic-noaa/…
climbfuji Nov 7, 2022
5204f2f
Changes to tests/compile.sh tests/module-setup.sh for cheyenne.gnu wi…
climbfuji Nov 7, 2022
78e495e
Update FV3
DusanJovic-NOAA Nov 7, 2022
6e6c5ae
Merge branch 'no_arg_mismatch' of https://github.com/dusanjovic-noaa/…
climbfuji Nov 7, 2022
08e3b4c
Revert .gitmodules
climbfuji Nov 8, 2022
67a0206
Update ecflow on Cheyenne for rt.sh
climbfuji Nov 8, 2022
ba9b6e0
Remove executable permission from tests/fv3_conv/fv3_qsub.IN_cheyenne
climbfuji Nov 8, 2022
cabc22f
Update FV3
DusanJovic-NOAA Nov 8, 2022
4f840c6
update FV3
DusanJovic-NOAA Nov 18, 2022
250d17a
Update FV3
DusanJovic-NOAA Dec 15, 2022
3c887ef
Merge remote-tracking branch 'origin/develop' into no_arg_mismatch
DusanJovic-NOAA Dec 15, 2022
93b7ce1
Update FV3 and stochastic_physics
DusanJovic-NOAA Dec 30, 2022
98da0fb
Merge remote-tracking branch 'origin/develop' into no_arg_mismatch
DusanJovic-NOAA Dec 30, 2022
63d2df7
Update FV3
DusanJovic-NOAA Mar 16, 2023
23bf02e
Merge remote-tracking branch 'origin/develop' into no_arg_mismatch
DusanJovic-NOAA Mar 16, 2023
2178455
Update FV3
DusanJovic-NOAA Mar 16, 2023
f2e809b
Update FV3
DusanJovic-NOAA Mar 29, 2023
ce03c93
Merge remote-tracking branch 'origin/develop' into no_arg_mismatch
DusanJovic-NOAA Mar 29, 2023
a8d6ad4
Update FV3
DusanJovic-NOAA Mar 30, 2023
63753a8
Update FV3
DusanJovic-NOAA Apr 26, 2023
2e859d6
Merge remote-tracking branch 'origin/develop' into no_arg_mismatch
DusanJovic-NOAA Apr 26, 2023
93806a6
Print MPI Library version in the main program
DusanJovic-NOAA Apr 26, 2023
dcfa818
Update FV3
DusanJovic-NOAA May 4, 2023
c1b09bb
Merge remote-tracking branch 'origin/develop' into no_arg_mismatch
DusanJovic-NOAA May 4, 2023
da77c36
Update FV3
DusanJovic-NOAA Jun 8, 2023
16f4111
Merge remote-tracking branch 'origin/develop' into no_arg_mismatch
DusanJovic-NOAA Jun 8, 2023
840a013
Update FV3
DusanJovic-NOAA Jun 13, 2023
da83592
Merge remote-tracking branch 'origin/develop' into no_arg_mismatch
DusanJovic-NOAA Jun 13, 2023
a1e8e36
Update FV3
DusanJovic-NOAA Aug 4, 2023
056e1ca
Merge remote-tracking branch 'origin/develop' into no_arg_mismatch
DusanJovic-NOAA Aug 4, 2023
58762d9
Update FV3
DusanJovic-NOAA Aug 28, 2023
21915c3
Merge remote-tracking branch 'origin/develop' into no_arg_mismatch
DusanJovic-NOAA Aug 28, 2023
ae6dfab
Update FV3
DusanJovic-NOAA Sep 6, 2023
f73ca62
Update stochastic_physics
DusanJovic-NOAA Sep 6, 2023
5936f71
Merge remote-tracking branch 'origin/develop' into no_arg_mismatch
DusanJovic-NOAA Sep 6, 2023
07c9e69
Update FV3
DusanJovic-NOAA Sep 15, 2023
7751377
Update stochastic_physics
DusanJovic-NOAA Sep 15, 2023
7ac2826
Merge remote-tracking branch 'origin/develop' into no_arg_mismatch
DusanJovic-NOAA Sep 15, 2023
80c1492
Update ufs_cheyenne.gnu.lua
DusanJovic-NOAA Sep 18, 2023
5c58f05
Update compile.sh and module-setup.sh from develop
DusanJovic-NOAA Sep 19, 2023
0e0551e
Update FV3
DusanJovic-NOAA Nov 1, 2023
504c2af
Update stochastic_physics
DusanJovic-NOAA Nov 1, 2023
9609ef8
Merge remote-tracking branch 'origin/develop' into no_arg_mismatch
DusanJovic-NOAA Nov 1, 2023
fd8863d
Update FV3
DusanJovic-NOAA Nov 3, 2023
3219a3f
Merge remote-tracking branch 'origin/develop' into no_arg_mismatch
DusanJovic-NOAA Nov 3, 2023
1319cf0
Update FV3
DusanJovic-NOAA Nov 3, 2023
513d042
Update FV3
DusanJovic-NOAA Dec 18, 2023
dfd78c0
Merge remote-tracking branch 'origin/develop' into no_arg_mismatch
DusanJovic-NOAA Dec 18, 2023
d680eab
Update FV3
DusanJovic-NOAA Jan 4, 2024
884961f
Update stochastic_physics
DusanJovic-NOAA Jan 4, 2024
fedd9fe
Merge remote-tracking branch 'origin/develop' into no_arg_mismatch
DusanJovic-NOAA Jan 4, 2024
c08b7f9
Update FV3 and stochastic_physics
DusanJovic-NOAA Jan 16, 2024
7297471
Merge remote-tracking branch 'origin/develop' into no_arg_mismatch
DusanJovic-NOAA Jan 16, 2024
7967de0
Update FV3
DusanJovic-NOAA Jan 19, 2024
097b050
Merge remote-tracking branch 'origin/develop' into no_arg_mismatch
DusanJovic-NOAA Jan 19, 2024
0b4dc0f
Update FV3
DusanJovic-NOAA Feb 7, 2024
fb0f4fc
Merge remote-tracking branch 'origin/develop' into no_arg_mismatch
DusanJovic-NOAA Feb 7, 2024
bc30ad3
Update FV3
DusanJovic-NOAA Feb 7, 2024
b9f0c3e
Update FV3
DusanJovic-NOAA Feb 7, 2024
4ae108c
Update FV3
DusanJovic-NOAA Feb 26, 2024
44dcfc6
Merge remote-tracking branch 'origin/develop' into no_arg_mismatch
DusanJovic-NOAA Feb 26, 2024
cca412e
Update FV3
DusanJovic-NOAA Feb 27, 2024
1d0e135
Update FV3
DusanJovic-NOAA Mar 18, 2024
ba1d11b
Merge remote-tracking branch 'origin/develop' into no_arg_mismatch
DusanJovic-NOAA Mar 18, 2024
159c8a9
Regression test passed on Hera
DusanJovic-NOAA Mar 18, 2024
166605b
Update FV3
DusanJovic-NOAA Mar 19, 2024
2b2e99f
Update repo_check.sh: turn off upp check
jkbk2004 Mar 19, 2024
879e687
Merge branch 'no_arg_mismatch' of https://github.com/DusanJovic-NOAA/…
DusanJovic-NOAA Mar 19, 2024
5e70cd6
[AutoRT] Hercules Job Failed!
epic-cicd-jenkins Mar 19, 2024
7908de2
Merge branch 'no_arg_mismatch' of github.com:DusanJovic-NOAA/ufs-weat…
epic-cicd-jenkins Mar 19, 2024
b91a8c1
Update repo_check.sh: fix path and branch names
jkbk2004 Mar 19, 2024
a0c8f70
WCOSS2 RT Log: Pass
BrianCurtis-NOAA Mar 19, 2024
a1fbd3d
add hercules RT logs: passed
zach1221 Mar 19, 2024
3271aa5
add dereco RT logs: passed
zach1221 Mar 19, 2024
889b350
add orion RT logs: passed
zach1221 Mar 19, 2024
6b6625a
[AutoRT] Gaea Job Completed.
epic-cicd-jenkins Mar 19, 2024
7842b88
Delete tests/logs/RT-run-Hercules.log
zach1221 Mar 19, 2024
bce9e3d
Delete tests/logs/RT-run-Orion.log
zach1221 Mar 19, 2024
1ea32ad
add jet RT logs: passed
zach1221 Mar 19, 2024
c9e0b9b
Revert .gitmodules and update FV3 and stochastic_physics
DusanJovic-NOAA Mar 19, 2024
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
Prev Previous commit
Next Next commit
Merge remote-tracking branch 'origin/develop' into no_arg_mismatch
  • Loading branch information
DusanJovic-NOAA committed Feb 7, 2024
commit fb0f4fc6bb1b30714da03bee8bed9993fab0aacc
5 changes: 5 additions & 0 deletions CDEPS-interface/cdeps_files.cmake
Original file line number Diff line number Diff line change
@@ -12,14 +12,18 @@ list(APPEND cdeps_share_files
CDEPS/share/shr_assert.h
CDEPS/share/shr_cal_mod.F90
CDEPS/share/shr_const_mod.F90
CDEPS/share/shr_file_mod.F90
CDEPS/share/shr_kind_mod.F90
CDEPS/share/shr_log_mod.F90
CDEPS/share/shr_nl_mod.F90
CDEPS/share/shr_orb_mod.F90
CDEPS/share/shr_precip_mod.F90
CDEPS/share/shr_strconvert_mod.F90
CDEPS/share/shr_string_mod.F90
CDEPS/share/shr_sys_mod.F90
CDEPS/share/shr_timer_mod.F90
CDEPS/share/shr_file_mod.F90
CDEPS/share/shr_nl_mod.F90
)

list(APPEND cdeps_streams_files
@@ -46,6 +50,7 @@ list(APPEND cdeps_datm_files
CDEPS/datm/datm_datamode_gfs_mod.F90
CDEPS/datm/datm_datamode_gfs_hafs_mod.F90
CDEPS/datm/datm_datamode_jra_mod.F90
CDEPS/datm/datm_datamode_simple_mod.F90
)

list(APPEND cdeps_dice_files
14 changes: 12 additions & 2 deletions CMEPS-interface/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -81,6 +81,11 @@ list(APPEND _mediator_files
CMEPS/mediator/med_phases_post_rof_mod.F90
CMEPS/mediator/med_phases_post_wav_mod.F90)

if(CDEPS_INLINE)
list(APPEND _mediator_files CMEPS/mediator/med_phases_cdeps_mod.F90)
add_definitions(-DCDEPS_INLINE)
endif()

###############################################################################
### Host model for CCPP
###############################################################################
@@ -178,13 +183,18 @@ set_target_properties(cmeps PROPERTIES Fortran_MODULE_DIRECTORY ${CMAKE_CURRENT_
target_include_directories(cmeps PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}/mod>
$<INSTALL_INTERFACE:mod>)
target_compile_definitions(cmeps PRIVATE ${CDEPS_SHARE_DEFS})
target_link_libraries(cmeps PUBLIC fms
esmf
target_link_libraries(cmeps PUBLIC esmf
PIO::PIO_Fortran)
if(OpenMP_Fortran_FOUND)
target_link_libraries(cmeps PRIVATE OpenMP::OpenMP_Fortran)
endif()

### Set dependency for CDEPS if inline capability is requested
if(CDEPS_INLINE)
add_dependencies(cmeps cdeps::cdeps)
target_link_libraries(cmeps PUBLIC cdeps::cdeps)
endif()

###############################################################################
### Install
###############################################################################
10 changes: 7 additions & 3 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -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 ATMWM ATML LND S2S S2SA S2SW S2SWA S2SWAL HAFS HAFSW HAFS-ALL NG-GODAS)
list(APPEND VALID_APPS ATM ATMAERO ATMAQ ATMW ATMWM ATML LND S2S S2SA S2SW S2SWA S2SWAL HAFS HAFSW HAFS-MOM6 HAFS-MOM6W HAFS-ALL NG-GODAS)
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}")
@@ -66,11 +66,13 @@ set(DISABLE_FMA OFF CACHE BOOL "Disable Fused Multiply-Add instructions (wor
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(REGIONAL_MOM6 OFF CACHE BOOL "Enable Regional MOM6")
set(OPENMP ON CACHE BOOL "Enable OpenMP threading")
set(PARALLEL_NETCDF OFF CACHE BOOL "Enable parallel NetCDF")
set(JEDI_DRIVER OFF CACHE BOOL "Enable JEDI as top level driver")
set(CMEPS_AOFLUX OFF CACHE BOOL "Enable atmosphere-ocean flux calculation in mediator")
set(PDLIB OFF CACHE BOOL "Enable Domain Decomposition in WW3 via PDLIB")
set(CDEPS_INLINE OFF CACHE BOOL "Enable CDEPS inline capability")

set(CMAKE_Platform $ENV{CMAKE_Platform})
if(CMAKE_Platform)
@@ -114,10 +116,12 @@ message("DEBUG ............ ${DEBUG}")
message("INLINE_POST ...... ${INLINE_POST}")
message("MULTI_GASES ...... ${MULTI_GASES}")
message("MOVING_NEST ...... ${MOVING_NEST}")
message("REGIONAL_MOM6..... ${REGIONAL_MOM6}")
message("OPENMP ........... ${OPENMP}")
message("PARALLEL_NETCDF .. ${PARALLEL_NETCDF}")
message("JEDI_DRIVER ...... ${JEDI_DRIVER}")
message("CMEPS_AOFLUX ..... ${CMEPS_AOFLUX}")
message("CDEPS_INLINE ..... ${CDEPS_INLINE}")

message("")

@@ -146,10 +150,10 @@ if(FMS)
find_package(FMS 2022.04 REQUIRED COMPONENTS R4 R8)
if(APP MATCHES "^(HAFSW)$")
add_library(fms ALIAS FMS::fms_r4)
elseif (APP MATCHES "^(S2S|S2SA|S2SW|S2SWA|S2SWAL|NG-GODAS)$")
elseif (APP MATCHES "^(S2S|S2SA|S2SW|S2SWA|S2SWAL|NG-GODAS|HAFS-MOM6|HAFS-MOM6W)$")
add_library(fms ALIAS FMS::fms_r8)
endif()
if(APP MATCHES "^(ATM|ATMAERO|ATMAQ|ATMWM|ATMW|ATML|LND|HAFS|HAFS-ALL)$")
if(APP MATCHES "^(ATM|ATMAERO|ATMAQ|ATMWM|ATMW|ATML|HAFS|HAFS-ALL)$")
if(32BIT)
add_library(fms ALIAS FMS::fms_r4)
else()
19 changes: 15 additions & 4 deletions MOM6-interface/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -28,8 +28,14 @@ include("mom6_files.cmake")
add_library(mom6_obj OBJECT ${mom6_src_files})
set_target_properties(mom6_obj PROPERTIES Fortran_MODULE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/mod)
target_include_directories(mom6_obj PRIVATE $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}/mod>)
target_include_directories(mom6_obj PRIVATE $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/MOM6/config_src/memory/dynamic_nonsymmetric>
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/MOM6/src/framework>)

if(REGIONAL_MOM6)
target_include_directories(mom6_obj PRIVATE $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/MOM6/config_src/memory/dynamic_symmetric>
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/MOM6/src/framework>)
else()
target_include_directories(mom6_obj PRIVATE $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/MOM6/config_src/memory/dynamic_nonsymmetric>
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/MOM6/src/framework>)
endif()
target_link_libraries(mom6_obj PRIVATE fms
esmf
stochastic_physics
@@ -42,8 +48,13 @@ target_link_libraries(mom6_obj PRIVATE fms
add_library(mom6_nuopc_obj OBJECT ${mom6_nuopc_src_files})
set_target_properties(mom6_nuopc_obj PROPERTIES Fortran_MODULE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/mod)
target_include_directories(mom6_nuopc_obj PRIVATE $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}/mod>)
target_include_directories(mom6_nuopc_obj PRIVATE $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/MOM6/config_src/memory/dynamic_nonsymmetric>
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/MOM6/src/framework>)
if(REGIONAL_MOM6)
target_include_directories(mom6_nuopc_obj PRIVATE $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/MOM6/config_src/memory/dynamic_symmetric>
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/MOM6/src/framework>)
else()
target_include_directories(mom6_nuopc_obj PRIVATE $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/MOM6/config_src/memory/dynamic_nonsymmetric>
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/MOM6/src/framework>)
endif()
target_link_libraries(mom6_nuopc_obj PRIVATE mom6_obj
fms
stochastic_physics
2 changes: 1 addition & 1 deletion MOM6-interface/MOM6
2 changes: 1 addition & 1 deletion NOAHMP-interface/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -64,7 +64,7 @@ add_library(noahmp STATIC ${_noahmp_cap_files} ${_noahmp_ccpp_files} ${_noahmp_f
set_target_properties(noahmp PROPERTIES Fortran_MODULE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/mod)
target_include_directories(noahmp PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}/mod>
$<INSTALL_INTERFACE:mod>)
target_link_libraries(noahmp PUBLIC esmf fms)
target_link_libraries(noahmp PUBLIC esmf)

###############################################################################
### Install
2 changes: 1 addition & 1 deletion WW3
4 changes: 4 additions & 0 deletions cmake/Intel.cmake
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -g -traceback -fpp -fno-alias -auto -safe-cray-ptr -ftz -assume byterecl -nowarn -sox -align array64byte -qno-opt-dynamic-align")
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -qno-opt-dynamic-align -sox -fp-model source")

if(CMAKE_Platform STREQUAL "derecho.intel")
set(CMAKE_Fortran_LINK_FLAGS "-Wl,--copy-dt-needed-entries")
endif()

if(NOT 32BIT)
set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -real-size 64")
endif()
19 changes: 10 additions & 9 deletions cmake/configure_apps.cmake
Original file line number Diff line number Diff line change
@@ -58,7 +58,7 @@ if(APP MATCHES "^(S2S|S2SA|S2SW|S2SWA|S2SWAL)$")
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|S2SWAL)")
set(UFS_GOCART ON CACHE BOOL "Enable GOCART" FORCE)
string(CONCAT APP_MSG ${APP_MSG} " with Aerosols")
endif()
@@ -68,17 +68,19 @@ if(APP MATCHES "^(S2S|S2SA|S2SW|S2SWA|S2SWAL)$")
message("${APP_MSG} mode")
endif()

if(APP MATCHES "^(HAFS|HAFSW|HAFS-ALL)$")
if(APP MATCHES "^(HAFS|HAFSW|HAFS-MOM6|HAFS-MOM6W|HAFS-ALL)$")
set(CMEPS ON CACHE BOOL "Enable CMEPS" FORCE)
if(APP MATCHES "^(HAFS-ALL)$")
set(CDEPS ON CACHE BOOL "Enable CDEPS" FORCE)
message("Configuring UFS app in HAFS with CDEPS mode")
endif()
set(CDEPS ON CACHE BOOL "Enable CDEPS" FORCE)
set(FMS ON CACHE BOOL "Enable FMS" FORCE)
set(FV3 ON CACHE BOOL "Enable FV3" FORCE)
set(STOCH_PHYS ON CACHE BOOL "Enable Stochastic Physics" FORCE)
set(HYCOM ON CACHE BOOL "Enable HYCOM" FORCE)
if(APP MATCHES "^(HAFSW|HAFS-ALL)$")
if(APP MATCHES "^(HAFS-MOM6|HAFS-MOM6W)$")
set(MOM6 ON CACHE BOOL "Enable MOM6" FORCE)
endif()
if(APP MATCHES "^(HAFS|HAFSW|HAFS-ALL)$")
set(HYCOM ON CACHE BOOL "Enable HYCOM" FORCE)
endif()
if(APP MATCHES "^(HAFSW|HAFS-MOM6W|HAFS-ALL)$")
set(WW3 ON CACHE BOOL "Enable WAVEWATCH III" FORCE)
message("Configuring UFS app in HAFS with Waves mode")
endif()
@@ -96,5 +98,4 @@ if(APP MATCHES "^(LND)$")
set(CMEPS ON CACHE BOOL "Enable CMEPS" FORCE)
set(CDEPS ON CACHE BOOL "Enable CDEPS" FORCE)
set(NOAHMP ON CACHE BOOL "Enable NOAHMP" FORCE)
set(FMS ON CACHE BOOL "Enable FMS" FORCE)
endif()
2 changes: 1 addition & 1 deletion tests/bl_date.conf
Original file line number Diff line number Diff line change
@@ -1 +1 @@
export BL_DATE=20240111
export BL_DATE=20240126
15 changes: 14 additions & 1 deletion tests/default_vars.sh
Original file line number Diff line number Diff line change
@@ -324,6 +324,7 @@ export HAFS=false
export AQM=false
export DATM_CDEPS=false
export DOCN_CDEPS=false
export CDEPS_INLINE=false
export POSTAPP='global'
export USE_MERRA2=.false.

@@ -515,6 +516,7 @@ export CPLICE=.false.
export CPLWAV=.false.
export CPLWAV2ATM=.false.
export CPLLND=.false.
export CPLLND2ATM=.false.
export USE_MED_FLUX=.false.
export DAYS=1
export NPX=97
@@ -637,6 +639,8 @@ export PRINT_DIFF_PGR=.false.

# Coupling
export coupling_interval_fast_sec=0
export CHOUR=06
export MOM6_OUTPUT_DIR=./MOM6_OUTPUT
}

# Defaults for the CICE6 model namelist, mx100
@@ -772,6 +776,7 @@ export HAFS=false
export AQM=false
export DATM_CDEPS=false
export DOCN_CDEPS=false
export CDEPS_INLINE=false
export FV3BMIC='p8c'
export BMIC=.false.
export DAYS=1
@@ -782,6 +787,7 @@ export SYEAR=2021
export SMONTH=03
export SDAY=22
export SHOUR=06
export CHOUR=06
export FHMAX=24
export FHROT=0
export DT_ATMOS=720
@@ -826,7 +832,7 @@ export FRAC_GRID=.true.
export CCPP_SUITE=FV3_GFS_v17_coupled_p8
export INPUT_NML=cpld_control.nml.IN
export FIELD_TABLE=field_table_thompson_noaero_tke_GOCART
export DIAG_TABLE=diag_table_p8_template
export DIAG_TABLE=diag_table_cpld.IN
export DIAG_TABLE_ADDITIONAL=''

export FHZERO=6
@@ -968,6 +974,7 @@ export HAFS=false
export AQM=false
export DATM_CDEPS=true
export DOCN_CDEPS=false
export CDEPS_INLINE=false
export DAYS=1

# model configure
@@ -1029,6 +1036,7 @@ export FILENAME_BASE=cfsr.
export MESH_ATM=${FILENAME_BASE//.}_mesh.nc
export atm_datamode=${DATM_SRC}
export stream_files=INPUT/${FILENAME_BASE}201110.nc
export EXPORT_ALL=.false.
export STREAM_OFFSET=0

export BL_SUFFIX=""
@@ -1042,13 +1050,15 @@ export HAFS=true
export AQM=false
export DATM_CDEPS=true
export DOCN_CDEPS=false
export CDEPS_INLINE=false
export INPES=$INPES_dflt
export JNPES=$JNPES_dflt
export NTILES=1

export atm_model=datm
export DATM_IN_CONFIGURE=datm_in.IN
export DATM_STREAM_CONFIGURE=hafs_datm.streams.era5.IN
export EXPORT_ALL=.false.
}
export_hafs_docn_cdeps ()
{
@@ -1057,6 +1067,7 @@ export S2S=false
export HAFS=true
export AQM=false
export DOCN_CDEPS=true
export CDEPS_INLINE=false
export INPES=$INPES_dflt
export JNPES=$JNPES_dflt
export NTILES=1
@@ -1075,6 +1086,7 @@ export HAFS=true
export AQM=false
export DATM_CDEPS=false
export DOCN_CDEPS=false
export CDEPS_INLINE=false
export INPES=$INPES_dflt
export JNPES=$JNPES_dflt
export NTILES=1
@@ -1146,6 +1158,7 @@ export HAFS=true
export AQM=false
export DATM_CDEPS=false
export DOCN_CDEPS=false
export CDEPS_INLINE=false
export INPES=$INPES_dflt
export JNPES=$JNPES_dflt
export NTILES=1
1 change: 0 additions & 1 deletion tests/fv3_conf/control_run.IN
Original file line number Diff line number Diff line change
@@ -82,7 +82,6 @@ else
cp $RFILE INPUT/${RFILE_NEW}
done
fi

fi

if [ $TILEDFIX = .true. ]; then
5 changes: 5 additions & 0 deletions tests/fv3_conf/cpld_control_run.IN
Original file line number Diff line number Diff line change
@@ -142,6 +142,11 @@ else
cp ../${DEP_RUN}${SUFFIX}/${RFILE} .
fi

# LAND restart file
if [ $CPLLND = .true. ]; then
cp ../${DEP_RUN}${SUFFIX}/ufs.cpld.lnd.out.${RESTART_FILE_SUFFIX_SECS}.tile*.nc RESTART/.
fi

else
# C48mx500 warm start from ICs
cp ${FV3_IC}/*.nc ./INPUT
15 changes: 15 additions & 0 deletions tests/fv3_conf/hafs_fv3_run.IN
Original file line number Diff line number Diff line change
@@ -17,6 +17,8 @@ elif [ ${CNTL_DIR} = "hafs_regional_storm_following_1nest_atm" ] || \
[ ${CNTL_DIR} = "hafs_regional_specified_moving_1nest_atm" ] || \
[ ${CNTL_DIR} = "hafs_regional_storm_following_1nest_atm_ocn" ] || \
[ ${CNTL_DIR} = "hafs_regional_storm_following_1nest_atm_ocn_debug" ] || \
[ ${CNTL_DIR} = "hafs_regional_storm_following_1nest_atm_ocn_wav_inline" ] || \
[ ${CNTL_DIR} = "hafs_regional_storm_following_1nest_atm_ocn_wav_mom6" ] || \
[ ${CNTL_DIR} = "hafs_regional_storm_following_1nest_atm_ocn_wav" ]; then
cp -r @[INPUTDATA_ROOT]/FV3_hafs_input_data/INPUT_hafs_regional_storm_following_1nest_atm/* ./INPUT/
elif [ ${CNTL_DIR} = "hafs_regional_1nest_atm" ] || \
@@ -49,3 +51,16 @@ if [[ $POSTAPP = 'hafs' ]]; then
cp ${PATHRT}/parm/postxconfig-NT-hafs.txt postxconfig-NT_FH00.txt
cp ${PATHRT}/parm/params_grib2_tbl_new params_grib2_tbl_new
fi

if [ ${CNTL_DIR} = "hafs_regional_storm_following_1nest_atm_ocn_wav_mom6" ]; then
rm -rf OUTPUT
mkdir OUTPUT
cp -r @[INPUTDATA_ROOT]/FV3_hafs_input_data/MOM6_regional_input_data/* ./INPUT/
cp ${PATHRT}/parm/MOM_input_hafs ./MOM_input
cp ${PATHRT}/parm/MOM6_data_table_hafs ./data_table
fi
if [ ${CNTL_DIR} = "hafs_regional_storm_following_1nest_atm_ocn_wav_inline" ] || \
[ ${CNTL_DIR} = "hafs_regional_storm_following_1nest_atm_ocn_wav_mom6" ]; then
cp @[INPUTDATA_ROOT]/FV3_hafs_input_data/CDEPS_input_data/gfs_mesh.nc ./INPUT/
cp @[INPUTDATA_ROOT]/FV3_hafs_input_data/CDEPS_input_data/gfs_forcings.nc ./INPUT/
fi
6 changes: 5 additions & 1 deletion tests/fv3_conf/hafs_ww3_run.IN
Original file line number Diff line number Diff line change
@@ -1,10 +1,14 @@

if [ ${CNTL_DIR} = "hafs_regional_atm_wav" ] || \
[ ${CNTL_DIR} = "hafs_regional_atm_ocn_wav" ] || \
[ ${CNTL_DIR} = "hafs_regional_storm_following_1nest_atm_ocn_wav_inline" ] || \
[ ${CNTL_DIR} = "hafs_regional_storm_following_1nest_atm_ocn_wav_mom6" ] || \
[ ${CNTL_DIR} = "hafs_regional_storm_following_1nest_atm_ocn_wav" ]; then
cp @[INPUTDATA_ROOT_WW3]/@[WW3_MODDEF] ./mod_def.ww3
cp @[INPUTDATA_ROOT_WW3]/@[MESH_WAV] ./mesh.hafs.nc
if [ ${CNTL_DIR} = "hafs_regional_storm_following_1nest_atm_ocn_wav" ]; then
if [ ${CNTL_DIR} = "hafs_regional_storm_following_1nest_atm_ocn_wav_inline" ] || \
[ ${CNTL_DIR} = "hafs_regional_storm_following_1nest_atm_ocn_wav_mom6" ] || \
[ ${CNTL_DIR} = "hafs_regional_storm_following_1nest_atm_ocn_wav" ]; then
cp @[INPUTDATA_ROOT]/FV3_hafs_input_data/WW3_hafs_regional_input_data/wind.natl_6m_2020082512 ./wind.ww3
else
cp @[INPUTDATA_ROOT_WW3]/wind.natl_6m ./wind.ww3
1 change: 1 addition & 0 deletions tests/fv3_conf/hycom_hat10_run.IN
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@

if [ ${CNTL_DIR} = "hafs_regional_storm_following_1nest_atm_ocn" ] || \
[ ${CNTL_DIR} = "hafs_regional_storm_following_1nest_atm_ocn_debug" ] || \
[ ${CNTL_DIR} = "hafs_regional_storm_following_1nest_atm_ocn_wav_inline" ] || \
[ ${CNTL_DIR} = "hafs_regional_storm_following_1nest_atm_ocn_wav" ]; then
rsync -arv @[INPUTDATA_ROOT]/FV3_hafs_input_data/HYCOM_hafs_regional_input_data/. ./
else
Loading
You are viewing a condensed version of this merge commit. You can view the full changes here.