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

Enable threaded ocean and ice tests #1038

Closed
wants to merge 2 commits into from
Closed

Enable threaded ocean and ice tests #1038

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
50f6906
Enable threaded ocean and ice tests
douglasjacobsen Aug 30, 2016
2d524fb
Re-enable threading of OCN and ICE in default PEs.
amametjanov Oct 1, 2016
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
10 changes: 5 additions & 5 deletions cime/machines-acme/config_pes.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -231,8 +231,8 @@
<pes PECOUNT="T" MACH="redsky|skybridge">
<NTASKS_ATM>128</NTASKS_ATM> <NTHRDS_ATM>4</NTHRDS_ATM> <ROOTPE_ATM>0</ROOTPE_ATM> <NINST_ATM>1</NINST_ATM>
<NTASKS_LND>$NTASKS_ATM</NTASKS_LND> <NTHRDS_LND>$NTHRDS_ATM</NTHRDS_LND> <ROOTPE_LND>$ROOTPE_ATM</ROOTPE_LND> <NINST_LND>1</NINST_LND>
<NTASKS_ICE>$NTASKS_ATM</NTASKS_ICE> <NTHRDS_ICE>1</NTHRDS_ICE> <ROOTPE_ICE>$ROOTPE_ATM</ROOTPE_ICE> <NINST_ICE>1</NINST_ICE>
<NTASKS_OCN>$NTASKS_ATM</NTASKS_OCN> <NTHRDS_OCN>1</NTHRDS_OCN> <ROOTPE_OCN>$ROOTPE_ATM</ROOTPE_OCN> <NINST_OCN>1</NINST_OCN>
<NTASKS_ICE>$NTASKS_ATM</NTASKS_ICE> <NTHRDS_ICE>$NTHRDS_ATM</NTHRDS_ICE> <ROOTPE_ICE>$ROOTPE_ATM</ROOTPE_ICE> <NINST_ICE>1</NINST_ICE>
<NTASKS_OCN>$NTASKS_ATM</NTASKS_OCN> <NTHRDS_OCN>$NTHRDS_ATM</NTHRDS_OCN> <ROOTPE_OCN>$ROOTPE_ATM</ROOTPE_OCN> <NINST_OCN>1</NINST_OCN>
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Needs to be ported to new config_pes for cime5

<NTASKS_ROF>$NTASKS_ATM</NTASKS_ROF> <NTHRDS_ROF>$NTHRDS_ATM</NTHRDS_ROF> <ROOTPE_ROF>$ROOTPE_ATM</ROOTPE_ROF> <NINST_ROF>1</NINST_ROF>
<NTASKS_CPL>$NTASKS_ATM</NTASKS_CPL> <NTHRDS_CPL>$NTHRDS_ATM</NTHRDS_CPL> <ROOTPE_CPL>$ROOTPE_ATM</ROOTPE_CPL>
<NTASKS_GLC>$NTASKS_ATM</NTASKS_GLC> <NTHRDS_GLC>$NTHRDS_ATM</NTHRDS_GLC> <ROOTPE_GLC>$ROOTPE_ATM</ROOTPE_GLC> <NINST_GLC>1</NINST_GLC>
Expand Down Expand Up @@ -282,7 +282,7 @@
</pes>

<pes GRID="a%T62" MACH="edison">
<NTASKS_ATM>48</NTASKS_ATM> <NTHRDS_ATM>1</NTHRDS_ATM> <ROOTPE_ATM>0</ROOTPE_ATM>
<NTASKS_ATM>48</NTASKS_ATM> <NTHRDS_ATM>2</NTHRDS_ATM> <ROOTPE_ATM>0</ROOTPE_ATM>
<PES_LEVEL>1r</PES_LEVEL>
</pes>

Expand Down Expand Up @@ -1421,8 +1421,8 @@
<pes PECOUNT="T" MACH="edison|corip1">
<NTASKS_ATM>240</NTASKS_ATM> <NTHRDS_ATM>4</NTHRDS_ATM> <ROOTPE_ATM>0</ROOTPE_ATM> <NINST_ATM>1</NINST_ATM>
<NTASKS_LND>$NTASKS_ATM</NTASKS_LND> <NTHRDS_LND>$NTHRDS_ATM</NTHRDS_LND> <ROOTPE_LND>$ROOTPE_ATM</ROOTPE_LND> <NINST_LND>1</NINST_LND>
<NTASKS_ICE>$NTASKS_ATM</NTASKS_ICE> <NTHRDS_ICE>1</NTHRDS_ICE> <ROOTPE_ICE>$ROOTPE_ATM</ROOTPE_ICE> <NINST_ICE>1</NINST_ICE>
<NTASKS_OCN>$NTASKS_ATM</NTASKS_OCN> <NTHRDS_OCN>1</NTHRDS_OCN> <ROOTPE_OCN>$ROOTPE_ATM</ROOTPE_OCN> <NINST_OCN>1</NINST_OCN>
<NTASKS_ICE>$NTASKS_ATM</NTASKS_ICE> <NTHRDS_ICE>$NTHRDS_ATM</NTHRDS_ICE> <ROOTPE_ICE>$ROOTPE_ATM</ROOTPE_ICE> <NINST_ICE>1</NINST_ICE>
<NTASKS_OCN>$NTASKS_ATM</NTASKS_OCN> <NTHRDS_OCN>$NTHRDS_ATM</NTHRDS_OCN> <ROOTPE_OCN>$ROOTPE_ATM</ROOTPE_OCN> <NINST_OCN>1</NINST_OCN>
<NTASKS_ROF>$NTASKS_ATM</NTASKS_ROF> <NTHRDS_ROF>$NTHRDS_ATM</NTHRDS_ROF> <ROOTPE_ROF>$ROOTPE_ATM</ROOTPE_ROF> <NINST_ROF>1</NINST_ROF>
<NTASKS_CPL>$NTASKS_ATM</NTASKS_CPL> <NTHRDS_CPL>$NTHRDS_ATM</NTHRDS_CPL> <ROOTPE_CPL>$ROOTPE_ATM</ROOTPE_CPL>
<NTASKS_GLC>$NTASKS_ATM</NTASKS_GLC> <NTHRDS_GLC>$NTHRDS_ATM</NTHRDS_GLC> <ROOTPE_GLC>$ROOTPE_ATM</ROOTPE_GLC> <NINST_GLC>1</NINST_GLC>
Expand Down
16 changes: 8 additions & 8 deletions cime/scripts/Testing/Testcases/PET_build.csh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,14 +36,14 @@ if ( $NTHRDS_ROF <= 1) then
echo "WARNING: component ROF is not threaded, changing NTHRDS_ROF to 2"
./xmlchange -file env_mach_pes.xml -id NTHRDS_ROF -val 2
endif
#if ( $NTHRDS_ICE <= 1) then
# echo "WARNING: component ICE is not threaded, changing NTHRDS_ICE to 2"
# ./xmlchange -file env_mach_pes.xml -id NTHRDS_ICE -val 2
#endif
#if ( $NTHRDS_OCN <= 1) then
# echo "WARNING: component OCN is not threaded, changing NTHRDS_OCN to 2"
# ./xmlchange -file env_mach_pes.xml -id NTHRDS_OCN -val 2
#endif
if ( $NTHRDS_ICE <= 1) then
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The new python version of PET sets nthrds to 2 for all components

echo "WARNING: component ICE is not threaded, changing NTHRDS_ICE to 2"
./xmlchange -file env_mach_pes.xml -id NTHRDS_ICE -val 2
endif
if ( $NTHRDS_OCN <= 1) then
echo "WARNING: component OCN is not threaded, changing NTHRDS_OCN to 2"
./xmlchange -file env_mach_pes.xml -id NTHRDS_OCN -val 2
endif
if ( $NTHRDS_GLC <= 1) then
echo "WARNING: component GLC is not threaded, changing NTHRDS_GOC to 2"
./xmlchange -file env_mach_pes.xml -id NTHRDS_GLC -val 2
Expand Down
16 changes: 8 additions & 8 deletions cime/scripts/Testing/Testcases/PMT_build.csh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,14 +89,14 @@ if ($NTHRDS_LND == 1) then
@ nthrd = $NTHRDS_LND * 2
./xmlchange -file env_mach_pes.xml -id NTHRDS_LND -val $nthrd
endif
#if ($NTHRDS_ICE == 1) then
# @ nthrd = $NTHRDS_ICE * 2
# ./xmlchange -file env_mach_pes.xml -id NTHRDS_ICE -val $nthrd
#endif
#if ($NTHRDS_OCN == 1) then
# @ nthrd = $NTHRDS_OCN * 2
# ./xmlchange -file env_mach_pes.xml -id NTHRDS_OCN -val $nthrd
#endif
if ($NTHRDS_ICE == 1) then
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

test no longer exists.

@ nthrd = $NTHRDS_ICE * 2
./xmlchange -file env_mach_pes.xml -id NTHRDS_ICE -val $nthrd
endif
if ($NTHRDS_OCN == 1) then
@ nthrd = $NTHRDS_OCN * 2
./xmlchange -file env_mach_pes.xml -id NTHRDS_OCN -val $nthrd
endif
if ($NTHRDS_CPL == 1) then
@ nthrd = $NTHRDS_CPL * 2
./xmlchange -file env_mach_pes.xml -id NTHRDS_CPL -val $nthrd
Expand Down