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

HAFSv1 needed HYCOM, UPP, g2tmpl, ugwp, and moving nesting related updates #1544

Merged
merged 29 commits into from
Jan 17, 2023
Merged

HAFSv1 needed HYCOM, UPP, g2tmpl, ugwp, and moving nesting related updates #1544

Show file tree
Hide file tree
Changes from 17 commits
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
a70d4ca
Update submodule FV3/upp and use a newer version of g2tmpl/1.10.2.
BinLiu-NOAA Dec 20, 2022
881307d
Merge remote-tracking branch 'remotes/upstream/develop' into feature/…
BinLiu-NOAA Dec 21, 2022
469322f
Update submodule FV3.
BinLiu-NOAA Dec 21, 2022
065b078
Update submodule FV3.
BinLiu-NOAA Dec 21, 2022
e706b58
Update submodule FV3 and switch to use the unified ugwp scheme for HA…
BinLiu-NOAA Dec 30, 2022
d24488a
Merge remote-tracking branch 'remotes/upstream/develop' into feature/…
BinLiu-NOAA Dec 30, 2022
c88bf3b
Merge branch 'feature/update_upp' into feature/hafs.v1.0.0
BinLiu-NOAA Dec 30, 2022
b77c5b8
Merge remote-tracking branch 'remotes/upstream/develop' into feature/…
BinLiu-NOAA Jan 4, 2023
6fca7c2
Update submodule FV3.
BinLiu-NOAA Jan 4, 2023
8a48090
Update submodule HYCOM-interface/HYCOM and HYCOM-interface/CMakeLists…
BinLiu-NOAA Jan 4, 2023
8f41381
Merge branch 'feature/update_upp' into feature/hafs.v1.0.0
BinLiu-NOAA Jan 4, 2023
db1bc4e
Merge remote-tracking branch 'remotes/upstream/develop' into feature/…
BinLiu-NOAA Jan 11, 2023
442e986
Update tests/parm/postxconfig-NT-hafs.txt by using FV3/upp/parm/postx…
BinLiu-NOAA Jan 11, 2023
b82f9c3
Fixed bug in calculation of nest halo weights identified by Biju Thom…
wramstrom Jan 11, 2023
63902d8
Merge remote-tracking branch 'remotes/origin/feature/hafs.v1.0.0' int…
BinLiu-NOAA Jan 11, 2023
e0ba768
Merge remote-tracking branch 'remotes/upstream/develop' into feature/…
BinLiu-NOAA Jan 12, 2023
64d3f2b
add new BL_DATE
jkbk2004 Jan 12, 2023
823375f
[AutoRT] hera.gnu Job Completed.
BrianCurtis-NOAA Jan 12, 2023
5ea4219
Update submodule FV3.
BinLiu-NOAA Jan 13, 2023
0ff9700
add hera intel.gnu RT logs: passed
jkbk2004 Jan 14, 2023
7ae2678
add orion.intel RT log: passed
jkbk2004 Jan 14, 2023
1da094f
add cheyenne intel.gnu RT logs: passed
jkbk2004 Jan 16, 2023
8ed299f
add gaea.intel: passed
jkbk2004 Jan 16, 2023
da2f87e
add -DCCPP_SUITES: compile 012
jkbk2004 Jan 16, 2023
a071a2e
add jet.intel RT log: passed
jkbk2004 Jan 16, 2023
1e9e442
WCOSS2 Intel RT Log
BrianCurtis-NOAA Jan 17, 2023
fee885a
WCOSS2 to use ecflow 5.6.0.13 and switch to using ecflow nodes
BrianCurtis-NOAA Jan 17, 2023
cd8ee96
Acorn Intel RT Log
BrianCurtis-NOAA Jan 17, 2023
753b6e6
Update submodule FV3 and HYCOM-interface/HYCOM.
BinLiu-NOAA Jan 17, 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
12 changes: 8 additions & 4 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/NOAA-EMC/fv3atm
branch = develop
url = https://github.com/hafs-community/fv3atm
branch = feature/update_upp
#url = https://github.com/NOAA-EMC/fv3atm
#branch = develop
[submodule "WW3"]
path = WW3
url = https://github.com/NOAA-EMC/WW3
Expand All @@ -20,8 +22,10 @@
branch = emc/develop
[submodule "HYCOM"]
path = HYCOM-interface/HYCOM
url = https://github.com/NOAA-EMC/HYCOM-src
branch = emc/develop
# url = https://github.com/NOAA-EMC/HYCOM-src
# branch = emc/develop
url = https://github.com/hafs-community/HYCOM-src
branch = fix/debug
[submodule "MOM6"]
path = MOM6-interface/MOM6
url = https://github.com/NOAA-EMC/MOM6
Expand Down
2 changes: 1 addition & 1 deletion FV3
Open in desktop
Submodule FV3 updated 12 files
+2 −2 ccpp/suites/suite_FV3_HAFS_v1_gfdlmp_tedmf.xml
+2 −2 ccpp/suites/suite_FV3_HAFS_v1_gfdlmp_tedmf_nonsst.xml
+2 −2 ccpp/suites/suite_FV3_HAFS_v1_thompson.xml
+2 −2 ccpp/suites/suite_FV3_HAFS_v1_thompson_noahmp.xml
+2 −2 ccpp/suites/suite_FV3_HAFS_v1_thompson_noahmp_nonsst.xml
+2 −2 ccpp/suites/suite_FV3_HAFS_v1_thompson_nonsst.xml
+2 −2 ccpp/suites/suite_FV3_HAFS_v1_thompson_tedmf_gfdlsf.xml
+198 −27 moving_nest/fv_moving_nest.F90
+2 −0 moving_nest/fv_moving_nest_main.F90
+2 −2 moving_nest/fv_moving_nest_types.F90
+1 −1 moving_nest/fv_moving_nest_utils.F90
+1 −1 upp
2 changes: 1 addition & 1 deletion HYCOM-interface/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ if(CMAKE_Fortran_COMPILER_ID MATCHES "GNU")
elseif(CMAKE_Fortran_COMPILER_ID MATCHES "Intel")
set(CMAKE_Fortran_FLAGS "-g -traceback -mcmodel=small -r8 ${HYCOM_Extra_FORTRAN_FLAGS}")
set(CMAKE_Fortran_FLAGS_RELEASE "-O3 -fp-model source -warn nogeneral")
set(CMAKE_Fortran_FLAGS_DEBUG "-O0 -check -check noarg_temp_created -check nopointer -fpe0 -ftrapuv -link_mpi=dbg -init=snan,arrays")
set(CMAKE_Fortran_FLAGS_DEBUG "-O0 -check all -fpe0 -ftrapuv -link_mpi=dbg -init=snan,arrays")
set(CMAKE_Fortran_LINK_FLAGS "-V ${CMAKE_Fortran_FLAGS} -static-intel")
else()
message(WARNING "Fortran compiler with ID ${CMAKE_Fortran_COMPILER_ID} will be used with CMake default options")
Expand Down
2 changes: 1 addition & 1 deletion HYCOM-interface/HYCOM
Open in desktop
Submodule HYCOM updated 2 files
+1 −0 geopar.F90
+4 −0 mod_momtum.F90
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 @@ -35,7 +35,7 @@ load(pathJoin("crtm", crtm_ver))
g2_ver=os.getenv("g2_ver") or "3.4.5"
load(pathJoin("g2", g2_ver))

g2tmpl_ver=os.getenv("g2tmpl_ver") or "1.10.0"
g2tmpl_ver=os.getenv("g2tmpl_ver") or "1.10.2"
load(pathJoin("g2tmpl", g2tmpl_ver))

ip_ver=os.getenv("ip_ver") or "3.3.3"
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 @@ -35,7 +35,7 @@ load(pathJoin("crtm", crtm_ver))
g2_ver=os.getenv("g2_ver") or "3.4.5"
load(pathJoin("g2", g2_ver))

g2tmpl_ver=os.getenv("g2tmpl_ver") or "1.10.0"
g2tmpl_ver=os.getenv("g2tmpl_ver") or "1.10.2"
load(pathJoin("g2tmpl", g2tmpl_ver))

ip_ver=os.getenv("ip_ver") or "3.3.3"
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 @@ -42,7 +42,7 @@ module load fms/2022.04
module load bacio/2.4.1
module load crtm/2.4.0
module load g2/3.4.5
module load g2tmpl/1.10.0
module load g2tmpl/1.10.2
module load ip/3.3.3
module load sp/2.3.3
module load w3emc/2.9.2
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 @@ -39,7 +39,7 @@ module load fms/2022.04
module load bacio/2.4.1
module load crtm/2.4.0
module load g2/3.4.5
module load g2tmpl/1.10.0
module load g2tmpl/1.10.2
module load ip/3.3.3
module load sp/2.3.3
module load w3emc/2.9.2
Expand Down
2 changes: 1 addition & 1 deletion modulefiles/ufs_stampede.intel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ module load python3/3.7.0
module load bacio/2.4.1
module load crtm/2.3.0
module load g2/3.4.3
module load g2tmpl/1.10.0
module load g2tmpl/1.10.2
module load ip/3.3.3
module load nemsio/2.5.2
module load sp/2.3.3
Expand Down
2 changes: 1 addition & 1 deletion modulefiles/ufs_wcoss2.intel.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ load(pathJoin("crtm", crtm_ver))
g2_ver=os.getenv("g2_ver") or "3.4.5"
load(pathJoin("g2", g2_ver))

g2tmpl_ver=os.getenv("g2tmpl_ver") or "1.10.0"
g2tmpl_ver=os.getenv("g2tmpl_ver") or "1.10.2"
load(pathJoin("g2tmpl", g2tmpl_ver))

ip_ver=os.getenv("ip_ver") or "3.3.3"
Expand Down
2 changes: 1 addition & 1 deletion modulefiles/ufs_wcoss2.intel_debug.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ load(pathJoin("crtm", crtm_ver))
g2_ver=os.getenv("g2_ver") or "3.4.5"
load(pathJoin("g2", g2_ver))

g2tmpl_ver=os.getenv("g2tmpl_ver") or "1.10.0"
g2tmpl_ver=os.getenv("g2tmpl_ver") or "1.10.2"
load(pathJoin("g2tmpl", g2tmpl_ver))

ip_ver=os.getenv("ip_ver") or "3.3.3"
Expand Down
11 changes: 10 additions & 1 deletion tests/parm/input_global_hafs.nml.IN
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -194,7 +194,7 @@
cnvcld = .true.
imfshalcnv = 2
imfdeepcnv = 2
cdmbgwd = 3.5,0.25
cdmbgwd = 1.0,1.0,1.0,1.0
sfc_z0_type = 6
prslrd0 = 0.
ivegsrc = 1
Expand Down Expand Up @@ -238,6 +238,15 @@
do_skeb = .false.
lndp_type = 0
n_var_lndp = 0
gwd_opt = 2
do_ugwp_v0 = .false.
do_ugwp_v1 = .false.
do_ugwp_v1_w_gsldrag = .false.
do_ugwp_v1_orog_only = .false.
do_gsl_drag_ls_bl = .true.
do_gsl_drag_ss = .true.
do_gsl_drag_tofd = .true.
do_ugwp_v0_orog_only = .false.
/

&gfdl_cloud_microphysics_nml
Expand Down
24 changes: 20 additions & 4 deletions tests/parm/input_nest_hafs.nml.IN
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@
nwat = @[NWAT]
na_init = @[NA_INIT]
d_ext = 0.0
dnats = 1
dnats = @[DNATS]
fv_sg_adj = 300
d2_bg = 0.
nord = 2
Expand All @@ -93,7 +93,7 @@
hord_tr = 8
adjust_dry_mass = .false.
consv_te = 0.
do_sat_adj = .true.
do_sat_adj = @[DO_SAT_ADJ]
consv_am = .false.
fill = .true.
dwind_2d = .false.
Expand Down Expand Up @@ -143,7 +143,14 @@
fhcyc = @[FHCYC]
use_ufo = .true.
pre_rad = .false.
imp_physics = 11
imp_physics = @[IMP_PHYSICS]
ltaerosol = .false.
lradar = .true.
ttendlim = -999
dt_inner = @[DT_INNER]
sedi_semi = @[SEDI_SEMI]
decfl = @[DECFL]
ext_diag_thompson = .false.
pdfcld = .false.
fhswr = @[FHSWR]
fhlwr = @[FHLWR]
Expand Down Expand Up @@ -174,7 +181,7 @@
cnvcld = .true.
imfshalcnv = 2
imfdeepcnv = 2
cdmbgwd = 0.88,0.04
cdmbgwd = 1.0,1.0,1.0,1.0
sfc_z0_type = 6
prslrd0 = 0.
ivegsrc = 1
Expand Down Expand Up @@ -218,6 +225,15 @@
do_skeb = .false.
lndp_type = 0
n_var_lndp = 0
gwd_opt = 2
do_ugwp_v0 = .false.
do_ugwp_v1 = .false.
do_ugwp_v1_w_gsldrag = .false.
do_ugwp_v1_orog_only = .false.
do_gsl_drag_ls_bl = .true.
do_gsl_drag_ss = .true.
do_gsl_drag_tofd = .true.
do_ugwp_v0_orog_only = .false.
/

&gfdl_cloud_microphysics_nml
Expand Down
11 changes: 10 additions & 1 deletion tests/parm/input_regional_hafs.nml.IN
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -205,7 +205,7 @@
cnvcld = .true.
imfshalcnv = 2
imfdeepcnv = 2
cdmbgwd = 0.88,0.04
cdmbgwd = 1.0,1.0,1.0,1.0
sfc_z0_type = 6
prslrd0 = 0.
ivegsrc = 1
Expand Down Expand Up @@ -249,6 +249,15 @@
do_skeb = .false.
lndp_type = 0
n_var_lndp = 0
gwd_opt = 2
do_ugwp_v0 = .false.
do_ugwp_v1 = .false.
do_ugwp_v1_w_gsldrag = .false.
do_ugwp_v1_orog_only = .false.
do_gsl_drag_ls_bl = .true.
do_gsl_drag_ss = .true.
do_gsl_drag_tofd = .true.
do_ugwp_v0_orog_only = .false.
/

&gfdl_cloud_microphysics_nml
Expand Down
Loading