Skip to content

Lightning threat indexes #1642

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
jkbk2004 merged 94 commits into from
Mar 24, 2023
Merged

Lightning threat indexes #1642

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
94 commits
Select commit Hold shift + click to select a range
4926f4f
Add ifi to post
SamuelTrahanNOAA Jul 28, 2022
0bc4419
remove an assertion that was present for debugging only
SamuelTrahanNOAA Jul 28, 2022
ba8e354
merge upstream develop
SamuelTrahanNOAA Jan 26, 2023
95588ca
try_load the ifi module
SamuelTrahanNOAA Jan 26, 2023
316f6e3
use the latest postxconfig-NT-fv3lam.txt to run ifi
SamuelTrahanNOAA Jan 26, 2023
82e0e8f
rename postxconfig-NT-fv3lam-ifi.txt to postxconfig-NT-fv3lam-new.txt…
SamuelTrahanNOAA Jan 26, 2023
670b483
copy postxconfig-NT.txt for rrfs_warm_run.IN
SamuelTrahanNOAA Jan 26, 2023
33db400
lightning threat indexes
SamuelTrahanNOAA Jan 31, 2023
0d2f3ec
add lightning threat indexes to rrfs 13km tests
SamuelTrahanNOAA Jan 31, 2023
cd333ea
pass w to model & fixes to ccpp/physics changes
SamuelTrahanNOAA Feb 1, 2023
3bf93ca
allocate wgrs and revise a debug print
SamuelTrahanNOAA Feb 1, 2023
bd35864
wrong vars & units
SamuelTrahanNOAA Feb 10, 2023
8d70800
lightning: remove msft and tweak print statements
SamuelTrahanNOAA Feb 10, 2023
d5ce458
lightning threat indexes
SamuelTrahanNOAA Feb 16, 2023
17880a2
update upp; still not quite working
SamuelTrahanNOAA Feb 21, 2023
188e460
lightning threat index works in upp and inline post
SamuelTrahanNOAA Feb 23, 2023
937a55d
update to top of upp develop
SamuelTrahanNOAA Feb 27, 2023
a7e6aed
merge upstream develop
SamuelTrahanNOAA Feb 27, 2023
8633f5f
update upstream develop in FV3 and subcomponents
SamuelTrahanNOAA Feb 27, 2023
391ebf3
remove unintended changes in ccpp/physics
SamuelTrahanNOAA Feb 27, 2023
40b03cc
remove stray line from FV3/upp xml file
SamuelTrahanNOAA Feb 27, 2023
565455f
bug fix in upp build system
SamuelTrahanNOAA Feb 28, 2023
dad79f5
bug fix in upp to fix segfault with inline post in some circumstances
SamuelTrahanNOAA Feb 28, 2023
bfe4fd1
bug fix to SURFCE.f to prevent crash of inline post
SamuelTrahanNOAA Feb 28, 2023
f0838cf
INTERNAL_IFI support, turn off IFI by default
SamuelTrahanNOAA Feb 28, 2023
57e44a0
fix bug in UPP standalone build script compile_upp.sh
SamuelTrahanNOAA Feb 28, 2023
0182eba
changes from review of UPP and GFDL_atmos_cubed_sphere
SamuelTrahanNOAA Feb 28, 2023
81df03e
FV3: turn off lightning_threat by default since it allocates wgrs and…
SamuelTrahanNOAA Feb 28, 2023
0db38b4
do not output ltg*_max variables since they're all zeroes anyway beca…
SamuelTrahanNOAA Feb 28, 2023
7734faf
FV3: missing `active = (lightning_threat_indices_enabled)` for wgrd
SamuelTrahanNOAA Feb 28, 2023
daadc61
missing three more active = lines
SamuelTrahanNOAA Feb 28, 2023
3a4bc09
FV3 rearrange things in GFS_typedefs.F90 to make gnu compiler happy
SamuelTrahanNOAA Mar 1, 2023
7117aa6
merge upstream upp
SamuelTrahanNOAA Mar 2, 2023
1a77201
updates from review of upp
SamuelTrahanNOAA Mar 2, 2023
d60ab11
resolve reviewer comments in fv3atm and ccpp-physics
SamuelTrahanNOAA Mar 6, 2023
ca466ec
update to top of develop upp
SamuelTrahanNOAA Mar 6, 2023
5d1499a
UPP submodule: correct ifi load on acorn
SamuelTrahanNOAA Feb 28, 2023
bddcb2e
Merge branch 'ifi' of ssh://github.com/SamuelTrahanNOAA/ufs-weather-m…
SamuelTrahanNOAA Mar 7, 2023
7618893
Put ifi in acorn modulefiles
SamuelTrahanNOAA Mar 7, 2023
210601c
update upp branch name
SamuelTrahanNOAA Mar 7, 2023
9fc28dd
Merge branch 'ifi' of ssh://github.com/SamuelTrahanNOAA/ufs-weather-m…
SamuelTrahanNOAA Mar 7, 2023
6273484
enable ltg*_max variables in diag_table_hrrr
SamuelTrahanNOAA Mar 8, 2023
27ed912
Merge branch 'lightning' of ssh://github.com/SamuelTrahanNOAA/ufs-wea…
SamuelTrahanNOAA Mar 8, 2023
8edea8c
update to latest postxconfig-NT-fv3lam-new.txt
SamuelTrahanNOAA Mar 8, 2023
c624296
postxconfig-NT-fv3lam-new.txt -> postxconfig-NT-fv3lam.txt
SamuelTrahanNOAA Mar 8, 2023
0a63307
alternative POSTAPP for C96 versions of regional configurations
SamuelTrahanNOAA Mar 8, 2023
4fee133
rap & hrrr variants use POSTAPP=fv3lam_global
SamuelTrahanNOAA Mar 8, 2023
83824a9
upp: update latest fv3lam txt and merge develop
SamuelTrahanNOAA Mar 8, 2023
61b83ee
merge develop into FV3
SamuelTrahanNOAA Mar 8, 2023
de8ce1b
merge upstream develop
SamuelTrahanNOAA Mar 8, 2023
806c455
remove $POSTAPP = fv3lam_global since upp crashes when running fv3lam…
SamuelTrahanNOAA Mar 8, 2023
e5c9765
tests/fv3_conf/rrfs_warm_run.IN: postxconfig-NT-fv3lam-new.txt => pos…
SamuelTrahanNOAA Mar 8, 2023
7a9b96e
regional ifi
SamuelTrahanNOAA Mar 9, 2023
6110979
new tests for ifi on acorn
SamuelTrahanNOAA Mar 9, 2023
ec9c19e
remove stray file
SamuelTrahanNOAA Mar 14, 2023
bc19307
Merge remote-tracking branch 'upstream/develop' into ifi
SamuelTrahanNOAA Mar 14, 2023
4c2edce
point to develop UPP
SamuelTrahanNOAA Mar 14, 2023
1e40a18
resolve reviewer comments and update to develop
SamuelTrahanNOAA Mar 14, 2023
548ce57
merge upstream/develop
SamuelTrahanNOAA Mar 14, 2023
5ecd925
Merge branch 'lightning' of ssh://github.com/SamuelTrahanNOAA/ufs-wea…
SamuelTrahanNOAA Mar 14, 2023
f23c62f
merge upstream/develop to FV3
SamuelTrahanNOAA Mar 14, 2023
7faab0c
hera.gnu tests passed
SamuelTrahanNOAA Mar 14, 2023
68781cc
typo in fv3atm gitignore
SamuelTrahanNOAA Mar 15, 2023
ef5a51f
hera.intel passed
SamuelTrahanNOAA Mar 15, 2023
590a538
hera.gnu test passed
SamuelTrahanNOAA Mar 15, 2023
851bc71
hera.intel tests passed
SamuelTrahanNOAA Mar 15, 2023
f22964d
merge develop into fv3atm
SamuelTrahanNOAA Mar 16, 2023
3ce1c06
merge upstream develop
SamuelTrahanNOAA Mar 16, 2023
d3ad5d4
update FV3 to upstream/develop
SamuelTrahanNOAA Mar 16, 2023
fc4b0bb
merge #1361
SamuelTrahanNOAA Mar 17, 2023
b00b636
hera.intel passed
SamuelTrahanNOAA Mar 17, 2023
08229b1
hera gnu tests passed
SamuelTrahanNOAA Mar 17, 2023
919b656
point to nceplibs libIFI on acorn
SamuelTrahanNOAA Mar 17, 2023
73c95a1
Merge branch 'lightning' of ssh://github.com/SamuelTrahanNOAA/ufs-wea…
SamuelTrahanNOAA Mar 17, 2023
82fe8f8
merge upstream develop
SamuelTrahanNOAA Mar 21, 2023
5aa77f1
add new BL_DATE
jkbk2004 Mar 21, 2023
298aa57
rename regional ifi tests
SamuelTrahanNOAA Mar 21, 2023
de91cc3
Merge branch 'lightning' of ssh://github.com/SamuelTrahanNOAA/ufs-wea…
SamuelTrahanNOAA Mar 21, 2023
8c26af0
fix out-of-bounds access in upp calslr_roebbr
SamuelTrahanNOAA Mar 22, 2023
5aa13fa
upp: update author information
SamuelTrahanNOAA Mar 22, 2023
68062ba
update upp to develop and correct author date
SamuelTrahanNOAA Mar 22, 2023
a4f39a1
fix another out-of-bounds access and move a message to stdout
SamuelTrahanNOAA Mar 22, 2023
e662e7f
upp: update author info and add spval check
SamuelTrahanNOAA Mar 22, 2023
d8f25e2
point to develop upp
SamuelTrahanNOAA Mar 22, 2023
3efdf47
hera.gnu tests passed again
SamuelTrahanNOAA Mar 22, 2023
9467d66
[AutoRT] hera.gnu Job Completed.
jkbk2004 Mar 22, 2023
223db3c
[AutoRT] hera.intel Job Completed.
jkbk2004 Mar 22, 2023
ae95993
[AutoRT] orion.intel Job Completed.
jkbk2004 Mar 22, 2023
d22bee2
add cheyenne intel.gnu RT logs: passed
jkbk2004 Mar 23, 2023
cfd150b
add jet.intel RT logs: passed
zach1221 Mar 23, 2023
af10fa7
Acorn Intel RT Log
BrianCurtis-NOAA Mar 23, 2023
2366d83
WCOSS2 Intel RT Log
BrianCurtis-NOAA Mar 23, 2023
1e597ba
point to develop version of fv3atm
SamuelTrahanNOAA Mar 24, 2023
fc05161
Merge branch 'lightning' of ssh://github.com/SamuelTrahanNOAA/ufs-wea…
SamuelTrahanNOAA Mar 24, 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
23 changes: 23 additions & 0 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,28 @@ if(CMAKE_Platform)
endif()
endif()

option(BUILD_WITH_IFI "Build NCEPpost with In-Flight Icing (IFI) library if present" OFF)
option(REQUIRE_IFI "Abort if libIFI is not found ; enables BUILD_WITH_IFI=ON" OFF)
option(INTERNAL_IFI "Compile with IFI inside the executable, instead of a library" OFF)

if(INTERNAL_IFI)
message("Building with libIFI inside executable. Do not distribute executable outside of WCOSS2.")
set(BUILD_WITH_IFI OFF)
set(REQUIRE_IFI OFF)
endif()

if(REQUIRE_IFI)
set(BUILD_WITH_IFI ON)
endif()

if(BUILD_WITH_IFI)
if(REQUIRE_IFI)
find_package(IFI CONFIG REQUIRED)
else()
find_package(IFI CONFIG)
endif()
endif()

message("")
message("32BIT ............ ${32BIT}")
message("CCPP_32BIT ....... ${CCPP_32BIT}")
Expand Down Expand Up @@ -316,6 +338,7 @@ target_link_libraries(ufs PUBLIC "${_ufs_libs_public}")
add_executable(ufs_model driver/UFS.F90)
add_dependencies(ufs_model ufs)
target_link_libraries(ufs_model ufs esmf w3emc::w3emc_d)
set_target_properties(ufs_model PROPERTIES LINKER_LANGUAGE Fortran)

###############################################################################
### Install
Expand Down
2 changes: 1 addition & 1 deletion FV3
Open in desktop
Submodule FV3 updated from da1e9b to f3eeba
3 changes: 3 additions & 0 deletions modulefiles/ufs_acorn.intel.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,9 @@ load(pathJoin("hpc-cray-mpich", hpc_cray_mpich_ver))

load("ufs_common")

prepend_path("MODULEPATH", "/lfs/h1/emc/nceplibs/noscrub/UPP_IFI/modulefiles")
load("ifi/20230118-intel-19.1.3.304")

setenv("CC", "cc")
setenv("CXX", "CC")
setenv("FC", "ftn")
Expand Down
3 changes: 3 additions & 0 deletions modulefiles/ufs_acorn.intel_debug.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,9 @@ load(pathJoin("hpc-cray-mpich", hpc_cray_mpich_ver))

load("ufs_common_debug")

prepend_path("MODULEPATH", "/lfs/h1/emc/nceplibs/noscrub/UPP_IFI/modulefiles")
load("ifi/20230118-intel-19.1.3.304")

setenv("CC", "cc")
setenv("CXX", "CC")
setenv("FC", "ftn")
Expand Down
3 changes: 3 additions & 0 deletions modulefiles/ufs_hera.intel.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,4 +36,7 @@ setenv("CXX", "mpiicpc")
setenv("FC", "mpiifort")
setenv("CMAKE_Platform", "hera.intel")

prepend_path("MODULEPATH", "/scratch2/BMC/ifi/modulefiles")
try_load("ifi/20230118-intel-2022.1.2")

whatis("Description: UFS build environment")
3 changes: 3 additions & 0 deletions modulefiles/ufs_hera.intel_debug.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,4 +36,7 @@ setenv("CXX", "mpiicpc")
setenv("FC", "mpiifort")
setenv("CMAKE_Platform", "hera.intel")

prepend_path("MODULEPATH", "/scratch2/BMC/ifi/modulefiles")
try_load("ifi/20230118-intel-2022.1.2")

whatis("Description: UFS build environment")
3 changes: 3 additions & 0 deletions modulefiles/ufs_jet.intel.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,4 +31,7 @@ setenv("CXX", "mpiicpc")
setenv("FC", "mpiifort")
setenv("CMAKE_Platform", "jet.intel")

prepend_path("MODULEPATH", "/lfs4/BMC/ifi/modulefiles")
try_load("ifi/20230118-intel-2022.1.2")

whatis("Description: UFS build environment")
3 changes: 3 additions & 0 deletions modulefiles/ufs_jet.intel_debug.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,4 +31,7 @@ setenv("CXX", "mpiicpc")
setenv("FC", "mpiifort")
setenv("CMAKE_Platform", "jet.intel")

prepend_path("MODULEPATH", "/lfs4/BMC/ifi/modulefiles")
try_load("ifi/20230118-intel-2022.1.2")

whatis("Description: UFS build environment")
1,735 changes: 889 additions & 846 deletions tests/RegressionTests_acorn.intel.log
View file
Open in desktop

Large diffs are not rendered by default.

418 changes: 209 additions & 209 deletions tests/RegressionTests_cheyenne.gnu.log
View file
Open in desktop

Large diffs are not rendered by default.

1,302 changes: 651 additions & 651 deletions tests/RegressionTests_cheyenne.intel.log
View file
Open in desktop

Large diffs are not rendered by default.

422 changes: 211 additions & 211 deletions tests/RegressionTests_hera.gnu.log
View file
Open in desktop

Large diffs are not rendered by default.

1,326 changes: 663 additions & 663 deletions tests/RegressionTests_hera.intel.log
View file
Open in desktop

Large diffs are not rendered by default.

1,212 changes: 606 additions & 606 deletions tests/RegressionTests_jet.intel.log
View file
Open in desktop

Large diffs are not rendered by default.

1,326 changes: 663 additions & 663 deletions tests/RegressionTests_orion.intel.log
View file
Open in desktop

Large diffs are not rendered by default.

1,231 changes: 621 additions & 610 deletions tests/RegressionTests_wcoss2.intel.log
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 2 additions & 0 deletions tests/fv3_conf/rrfs_warm_run.IN
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,8 @@ if [ $IMP_PHYSICS = 8 ]; then
cp @[INPUTDATA_ROOT]/FV3_input_data_gsd/CCN_ACTIVATE.BIN .
fi

cp ${PATHRT}/parm/postxconfig-NT-fv3lam.txt postxconfig-NT.txt

if [ $DO_RRTMGP = .true. ]; then
cp @[INPUTDATA_ROOT]/FV3_input_data_RRTMGP/* .
fi
6 changes: 6 additions & 0 deletions tests/parm/diag_table/diag_table_hrrr
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -332,6 +332,12 @@
"gfs_phys", "skebv_wts", "skebv_wts", "fv3_history", "all", .false., "none", 2
"gfs_phys", "shum_wts", "shum_wts", "fv3_history", "all", .false., "none", 2


# Lightning threat indexes
"gfs_sfc", "ltg1_max", "ltg1_max", "fv3_history2d", "all", .false., "none", 2
"gfs_sfc", "ltg2_max", "ltg2_max", "fv3_history2d", "all", .false., "none", 2
"gfs_sfc", "ltg3_max", "ltg3_max", "fv3_history2d", "all", .false., "none", 2

#=============================================================================================
#
#====> This file can be used with diag_manager/v2.0a (or higher) <====
Expand Down
263 changes: 224 additions & 39 deletions tests/parm/postxconfig-NT-fv3lam.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
2
219
264
225
263
PRSLEV
32769
ncep_nco
Expand Down Expand Up @@ -9341,43 +9341,6 @@ surface
?
?
?
444
LTNG_ON_SURFACE
lightning
1
tmpl4_0
LTNG
NCEP
?
surface
0
?
0
?
?
0
?
0
?
?
?
0
0.0
0
0.0
?
0
0.0
0
0.0
1
1.0
0
0
0
?
?
?
581
VIL_ON_ENTIRE_ATMOS
entire atmosphere Vertically Integrated Liquid (kg/m-2)
Expand Down Expand Up @@ -17904,3 +17867,225 @@ surface
?
?
?
704
GSD_MAX_LTG_THREAT3_ON_ENTIRE_ATMOS
?
1
tmpl4_8
LTNG
NCEP
MAX
entire_atmos
0
?
0
?
?
0
?
0
?
?
?
0
0.0
0
0.0
?
0
0.0
0
0.0
1
4.0
0
0
0
?
?
?
1006
SDEN_ON_SURFACE
?
1
tmpl4_0
SDEN
?
?
surface
0
?
0
?
?
0
?
0
?
?
?
0
0.0
0
0.0
?
0
0.0
0
0.0
1
6.0
0
0
0
?
?
?
1007
ICE_PROB_IFI_FLIGHT_LEVEL
?
1
tmpl4_0
ICPRB
NCEP
?
spec_alt_above_mean_sea_lvl
1
1
60
5000. 10000. 15000. 20000. 25000. 30000. 35000. 40000. 45000. 50000. 55000. 60000. 65000. 70000. 75000. 80000. 85000. 90000. 95000. 100000. 105000. 110000. 115000. 120000. 125000. 130000. 135000. 140000. 145000. 150000. 155000. 160000. 165000. 170000. 175000. 180000. 185000. 190000. 195000. 200000. 205000. 210000. 215000. 220000. 225000. 230000. 235000. 240000. 245000. 250000. 255000. 260000. 265000. 270000. 275000. 280000. 285000. 290000. 295000. 300000.
?
0
?
0
?
?
?
0
0.0
0
0.0
?
0
0.0
0
0.0
1
4.0
0
0
0
?
?
?
1008
SLD_IFI_FLIGHT_LEVEL
?
1
tmpl4_0
SIPD
NCEP
?
spec_alt_above_mean_sea_lvl
1
1
60
5000. 10000. 15000. 20000. 25000. 30000. 35000. 40000. 45000. 50000. 55000. 60000. 65000. 70000. 75000. 80000. 85000. 90000. 95000. 100000. 105000. 110000. 115000. 120000. 125000. 130000. 135000. 140000. 145000. 150000. 155000. 160000. 165000. 170000. 175000. 180000. 185000. 190000. 195000. 200000. 205000. 210000. 215000. 220000. 225000. 230000. 235000. 240000. 245000. 250000. 255000. 260000. 265000. 270000. 275000. 280000. 285000. 290000. 295000. 300000.
?
0
?
0
?
?
?
0
0.0
0
0.0
?
0
0.0
0
0.0
1
4.0
0
0
0
?
?
?
1009
ICE_SEV_CAT_IFI_FLIGHT_LEVEL
?
1
tmpl4_0
ICSEV
NCEP
?
spec_alt_above_mean_sea_lvl
1
1
60
5000. 10000. 15000. 20000. 25000. 30000. 35000. 40000. 45000. 50000. 55000. 60000. 65000. 70000. 75000. 80000. 85000. 90000. 95000. 100000. 105000. 110000. 115000. 120000. 125000. 130000. 135000. 140000. 145000. 150000. 155000. 160000. 165000. 170000. 175000. 180000. 185000. 190000. 195000. 200000. 205000. 210000. 215000. 220000. 225000. 230000. 235000. 240000. 245000. 250000. 255000. 260000. 265000. 270000. 275000. 280000. 285000. 290000. 295000. 300000.
?
0
?
0
?
?
?
0
0.0
0
0.0
?
0
0.0
0
0.0
1
4.0
0
0
0
?
?
?
1010
WMO_ICE_SEV_CAT_IFI_FLIGHT_LEVEL
?
1
tmpl4_0
ICESEV
?
?
spec_alt_above_mean_sea_lvl
1
1
60
5000. 10000. 15000. 20000. 25000. 30000. 35000. 40000. 45000. 50000. 55000. 60000. 65000. 70000. 75000. 80000. 85000. 90000. 95000. 100000. 105000. 110000. 115000. 120000. 125000. 130000. 135000. 140000. 145000. 150000. 155000. 160000. 165000. 170000. 175000. 180000. 185000. 190000. 195000. 200000. 205000. 210000. 215000. 220000. 225000. 230000. 235000. 240000. 245000. 250000. 255000. 260000. 265000. 270000. 275000. 280000. 285000. 290000. 295000. 300000.
?
0
?
0
?
?
?
0
0.0
0
0.0
?
0
0.0
0
0.0
1
4.0
0
0
0
?
?
?
Loading