Skip to content

Jet build config updates (contains #53 update the descriptions of the GSD_SAR_v1 and RRFS_v0 tests) #55

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
climbfuji merged 8 commits into from
Jun 16, 2020
Merged

Jet build config updates (contains #53 update the descriptions of the GSD_SAR_v1 and RRFS_v0 tests) #55

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
a6b42dc
adding file parm/ccpp_gsd_sar_v1.nml.IN
linlin-pan Jun 7, 2020
d39d1d6
Merge pull request #3 from NCAR/dtc/develop
panll Jun 10, 2020
644b2f2
update the descriptions of the tests and test parameters.
linlin-pan Jun 10, 2020
de68acf
Update .gitmodules and submodule pointer for fv3atm for code review a…
climbfuji Jun 15, 2020
51a1d16
Merge branch 'dtc/develop' of https://github.com/panll/ufs-weather-mo…
climbfuji Jun 15, 2020
1a47539
cmake/configure_jet.intel.cmake: bugfix for Jet to compile CCPP with …
climbfuji Jun 15, 2020
bed5243
build.sh: bring in update from public release branch
climbfuji Jun 15, 2020
8385b88
Revert change to .gitmoddules and update submodule pointer for fv3atm
climbfuji Jun 16, 2020
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
2 changes: 1 addition & 1 deletion FV3
Open in desktop
Submodule FV3 updated 2 files
+3 −0 ccpp/suites/suite_FV3_GSD_SAR_v1.xml
+3 −1 ccpp/suites/suite_FV3_RRFS_v0.xml
3 changes: 1 addition & 2 deletions build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,7 @@ set -eu

MYDIR=$(cd "$(dirname "$(readlink -f -n "${BASH_SOURCE[0]}" )" )" && pwd -P)

export COMPILER=${COMPILER:?"Please set COMPILER environment variable [gnu|intel]"}
export CMAKE_Platform=linux.${COMPILER}
export CMAKE_Platform=${CMAKE_Platform:?"Please set the CMAKE_Platform environment variable, e.g. [macosx.gnu|linux.gnu|linux.intel|hera.intel|...]"}
export CMAKE_C_COMPILER=${CMAKE_C_COMPILER:-mpicc}
export CMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER:-mpicxx}
export CMAKE_Fortran_COMPILER=${CMAKE_Fortran_COMPILER:-mpif90}
Expand Down
4 changes: 3 additions & 1 deletion cmake/configure_jet.intel.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,11 @@ option(INLINE_POST "Enable inline post" OFF)

include( cmake/${CMAKE_Fortran_COMPILER_ID}.cmake )

message("AVX2 is ENABLED on Jet (multi-tagret executable)")
message("AVX2 is ENABLED on Jet (multi-target executable)")
string (REPLACE "-xHOST" "-axSSE4.2,AVX,CORE-AVX2" CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS}")
string (REPLACE "-xHOST" "-axSSE4.2,AVX,CORE-AVX2" CMAKE_C_FLAGS "${CMAKE_C_FLAGS}")
# For CCPP
option(SIMDMULTIARCH "Enable multi-target SIMD instruction sets" ON)

string(REPLACE "-i_dynamic" "-shared-intel"
CMAKE_SHARED_LIBRARY_LINK_Fortran_FLAGS
Expand Down
6 changes: 3 additions & 3 deletions parm/ccpp_gsd_sar_v1.nml.IN
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -175,8 +175,8 @@
random_clds = .false.
trans_trac = .true.
cnvcld = .false.
imfshalcnv = 0
imfdeepcnv = 0
imfshalcnv = -1
imfdeepcnv = -1
cdmbgwd = 3.5,0.25
prslrd0 = 0.
ivegsrc = 1
Expand All @@ -193,7 +193,7 @@
do_shum = .F.
do_skeb = .F.
do_sfcperts = .F.
lsm = 2
lsm = 1
lsoil = 4
iopt_dveg = 2
iopt_crs = 1
Expand Down
2 changes: 1 addition & 1 deletion tests/tests/fv3_ccpp_gsd_sar_v1
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
###############################################################################
#
# FV3 CCPP GSD SAR (GF CU + Thompson MP + MYNN PBL + RUC LSM) test
# FV3 CCPP GSD SAR ( Thompson MP + MYNN PBL + NOAH LSM) test
#
###############################################################################

Expand Down
6 changes: 3 additions & 3 deletions tests/tests/fv3_ccpp_rrfs_v0
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
###############################################################################
#
# FV3 CCPP GSD (GF CU + Thompson MP + MYNN PBL + NOAH LSM) test
# FV3 CCPP RRFS (Thompson MP + MYNN PBL + NOAHMP LSM) test
#
###############################################################################

Expand Down Expand Up @@ -115,8 +115,8 @@ export INPUT_NML=ccpp_gsd.nml.IN

export HYBEDMF=.F.
export DO_MYNNEDMF=.T.
export IMFSHALCNV=3
export IMFDEEPCNV=3
export IMFSHALCNV=-1
export IMFDEEPCNV=-1
export FHCYC=0
export LSM=2
export LSOIL_LSM=4
Expand Down