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

add in-flight icing products to inline post #1361

Closed
wants to merge 33 commits into from
Closed

add in-flight icing products to inline post #1361

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
33 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
937a55d
update to top of upp develop
SamuelTrahanNOAA Feb 27, 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
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
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
7faab0c
hera.gnu tests passed
SamuelTrahanNOAA Mar 14, 2023
851bc71
hera.intel tests passed
SamuelTrahanNOAA Mar 15, 2023
d3ad5d4
update FV3 to upstream/develop
SamuelTrahanNOAA Mar 16, 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
4 changes: 2 additions & 2 deletions .gitmodules
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[submodule "FV3"]
path = FV3
url = https://github.com/NOAA-EMC/fv3atm
branch = develop
url = https://github.com/SamuelTrahanNOAA/fv3atm
branch = ifi
[submodule "WW3"]
path = WW3
url = https://github.com/NOAA-EMC/WW3
Expand Down
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 6 files
+13 −0 ccpp/data/GFS_typedefs.F90
+26 −5 ccpp/data/GFS_typedefs.meta
+1 −1 ccpp/framework
+1 −1 ccpp/physics
+2 −1 io/post_nems_routines.F90
+1 −1 upp
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/oar/esrl/noscrub/samuel.trahan/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/oar/esrl/noscrub/samuel.trahan/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")
2,439 changes: 898 additions & 1,541 deletions tests/RegressionTests_hera.gnu.log
View file
Open in desktop

Large diffs are not rendered by default.

1,320 changes: 660 additions & 660 deletions tests/RegressionTests_hera.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
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