Enable threaded ocean and ice tests #1038
Conversation
This commit re-enables threading within the ocean and sea ice models for PET and PMT tests. [Non-BFB] Fixes: #828
|
@jgfouca This makes mods to cime2 test scripts. See if they need to be translated to cime5. |
|
@amametjanov can you take care of merging this? |
|
I would like this to reverted since it breaks PET tests for the Wcycle case. Unless you can figure out a way to turn threading off for WCYCLE but on for ocean-only PET tests. |
|
@jonbob This PR is yours to fix. |
|
This PR probably needs to be redone. @jgfouca I don't think those PET mods for ocn and sea ice made it in to CIME5 so they don't have to be undone. the PMT test no longer exists. The config_pe changes need to be redone for cime5. |
| # 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 |
There was a problem hiding this comment.
The new python version of PET sets nthrds to 2 for all components
| # @ nthrd = $NTHRDS_OCN * 2 | ||
| # ./xmlchange -file env_mach_pes.xml -id NTHRDS_OCN -val $nthrd | ||
| #endif | ||
| if ($NTHRDS_ICE == 1) then |
| @@ -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> | |||
There was a problem hiding this comment.
Needs to be ported to new config_pes for cime5
|
@jonbob I recommend closing this and redoing the pe layout changes in a new PR. |
|
Fixed by #1257 - PET tests now passing |
Big refactor of CaseStatus management Write a special handler in utils.py in order to be able to easily encapsulate the concept that a function needs to log its status to CaseStatus and be robust in the face of exceptions. Rearrange and rename some functions in build.py in order to make it more clear what is the public API and what are internal functions. Test suite: scripts_regression_tests Test baseline: Test namelist changes: Test status: bit for bit Fixes #1038 User interface changes?: CaseStatus will look slightly different Code review: @jedwards4b @bertinia
This merge re-enables threading within the ocean and sea ice models for
PET and PMT tests.
Fixes: #828