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 DoD ports to Carpenter, Narwhal, Warhawk and some initial pe layouts for ARRMwISC3to18. #10

Open
wants to merge 1 commit into
base: arrm3to18-E3SMv3
Choose a base branch
from
Open

Add DoD ports to Carpenter, Narwhal, Warhawk and some initial pe layouts for ARRMwISC3to18. #10

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 cime_config/allactive/config_pesall.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2259,7 +2259,7 @@
</mach>
</grid>
<grid name="a%ne30.+oi%oARRM60to10|a%ne30.+oi%ARRM10to60">
<mach name="onyx|warhawk|narwhal">
<mach name="any">
<pes compset=".*EAM.+ELM.+MPASSI.+MPASO.+MOSART.+SGLC" pesize="any">
<comment>none</comment>
<ntasks>
Expand Down Expand Up @@ -2296,7 +2296,7 @@
</mach>
</grid>
<grid name="a%ne0np4_arcticx4.+oi%oARRM60to10|a%ne0np4_arcticx4.+oi%ARRM10to60">
<mach name="onyx|warhawk|narwhal">
<mach name="any">
<pes compset=".*EAM.+ELM.+MPASSI.+MPASO.+MOSART.+SGLC" pesize="any">
<comment>none</comment>
<ntasks>
Expand Down
14 changes: 14 additions & 0 deletions cime_config/machines/cmake_macros/intel_carpenter.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
# fp-model source does not work on in mpicxx, this seems to be a compiler bug, need to manually switch to precise
set(CMAKE_CXX_FLAGS " ") # hardcode it here to blank, then try to do same things as in intel.cmake
if (compile_threaded)
string(APPEND CMAKE_CXX_FLAGS " -qopenmp")
endif()
string(APPEND CMAKE_CXX_FLAGS_DEBUG " -O0 -g")
string(APPEND CMAKE_CXX_FLAGS_RELEASE " -O2")
string(APPEND CMAKE_CXX_FLAGS " -fp-model=precise") # and manually add precise
#message(STATUS "ndk CXXFLAGS=${CXXFLAGS}")

string(APPEND CMAKE_Fortran_FLAGS " -fp-model consistent -fimf-use-svml")
string(APPEND CMAKE_CXX_FLAGS " -fp-model consistent")
string(APPEND CMAKE_Fortran_FLAGS_RELEASE " -qno-opt-dynamic-align")
string(APPEND CMAKE_EXE_LINKER_FLAGS " -lpthread")
10 changes: 10 additions & 0 deletions cime_config/machines/cmake_macros/intel_narwhal.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,13 @@
# fp-model source does not work on in mpicxx, this seems to be a compiler bug, need to manually switch to precise
set(CMAKE_CXX_FLAGS " ") # hardcode it here to blank, then try to do same things as in intel.cmake
if (compile_threaded)
string(APPEND CMAKE_CXX_FLAGS " -qopenmp")
endif()
string(APPEND CMAKE_CXX_FLAGS_DEBUG " -O0 -g")
string(APPEND CMAKE_CXX_FLAGS_RELEASE " -O2")
string(APPEND CMAKE_CXX_FLAGS " -fp-model=precise") # and manually add precise
#message(STATUS "ndk CXXFLAGS=${CXXFLAGS}")

string(APPEND CMAKE_Fortran_FLAGS " -fp-model consistent -fimf-use-svml")
string(APPEND CMAKE_CXX_FLAGS " -fp-model consistent")
string(APPEND CMAKE_Fortran_FLAGS_RELEASE " -qno-opt-dynamic-align")
Expand Down
69 changes: 69 additions & 0 deletions cime_config/machines/config_batch.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -882,6 +882,29 @@
</queues>
</batch_system>

<batch_system MACH="carpenter" type="pbs" >
<directives queue="debug">
<directive>-A {{ PROJECT }}</directive>
<directive>-l application=Regional-Arctic-System-Model</directive>
<directive>-l select={{ num_nodes }}:ncpus={{ MAX_MPITASKS_PER_NODE }}:mpiprocs={{ tasks_per_node }}</directive>
</directives>
<directives queue="standard">
<directive>-A {{ PROJECT }}</directive>
<directive>-l application=Regional-Arctic-System-Model</directive>
<directive>-l select={{ num_nodes }}:ncpus={{ MAX_MPITASKS_PER_NODE }}:mpiprocs={{ tasks_per_node }}</directive>
</directives>
<directives queue="transfer">
<directive>-A {{ PROJECT }}</directive>
<directive>-l application=Regional-Arctic-System-Model</directive>
<directive>-l select=1:ncpus=1</directive>
</directives>
<queues>
<queue walltimemax="00:59:00" nodemax="72" strict="true">debug</queue>
<queue walltimemax="04:00:00" default="true">standard</queue>
<queue default="true" walltimemax="12:00:00" jobmin="1" jobmax="1">transfer</queue>
</queues>
</batch_system>

<batch_system MACH="narwhal" type="pbs" >
<directives queue="debug">
<directive>-A {{ PROJECT }}</directive>
Expand Down Expand Up @@ -928,4 +951,50 @@
</queues>
</batch_system>

<batch_system MACH="warhawkm" type="pbs" >
<directives queue="debug">
<directive>-A {{ PROJECT }}</directive>
<directive>-l application=Regional-Arctic-System-Model</directive>
<directive>-l select={{ num_nodes }}:ncpus={{ MAX_MPITASKS_PER_NODE }}:mpiprocs={{ tasks_per_node }}</directive>
</directives>
<directives queue="standard">
<directive>-A {{ PROJECT }}</directive>
<directive>-l application=Regional-Arctic-System-Model</directive>
<directive>-l select={{ num_nodes }}:ncpus={{ MAX_MPITASKS_PER_NODE }}:mpiprocs={{ tasks_per_node }}</directive>
</directives>
<directives queue="transfer">
<directive>-A {{ PROJECT }}</directive>
<directive>-l application=Regional-Arctic-System-Model</directive>
<directive>-l select=1:ncpus=1</directive>
</directives>
<queues>
<queue walltimemax="00:59:00" nodemax="22" strict="true">debug</queue>
<queue walltimemax="04:00:00" default="true">standard</queue>
<queue default="true" walltimemax="12:00:00" jobmin="1" jobmax="1">transfer</queue>
</queues>
</batch_system>

<batch_system MACH="warhawku" type="pbs" >
<directives queue="debug">
<directive>-A {{ PROJECT }}</directive>
<directive>-l application=Regional-Arctic-System-Model</directive>
<directive>-l select={{ num_nodes }}:ncpus={{ MAX_MPITASKS_PER_NODE }}:mpiprocs={{ tasks_per_node }}</directive>
</directives>
<directives queue="standard">
<directive>-A {{ PROJECT }}</directive>
<directive>-l application=Regional-Arctic-System-Model</directive>
<directive>-l select={{ num_nodes }}:ncpus={{ MAX_MPITASKS_PER_NODE }}:mpiprocs={{ tasks_per_node }}</directive>
</directives>
<directives queue="transfer">
<directive>-A {{ PROJECT }}</directive>
<directive>-l application=Regional-Arctic-System-Model</directive>
<directive>-l select=1:ncpus=1</directive>
</directives>
<queues>
<queue walltimemax="00:59:00" nodemax="22" strict="true">debug</queue>
<queue walltimemax="04:00:00" default="true">standard</queue>
<queue default="true" walltimemax="12:00:00" jobmin="1" jobmax="1">transfer</queue>
</queues>
</batch_system>

</config_batch>
Loading