-
Notifications
You must be signed in to change notification settings - Fork 155
cam6_4_087: Update CAM testing. #1285
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.
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
Changes from all commits
6843aeb
12bd9c3
d91909b
6d8d4e9
6bd8576
37a766c
4ab33e4
e210f3d
c0cdc98
61fcdea
588102a
3c8adcd
24f10ac
f6b7f5f
1eb295a
11c3488
bc7a79d
247fab9
a835898
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,12 @@ | ||
<?xml version="1.0"?> | ||
|
||
<namelist_defaults> | ||
|
||
<start_ymd> 10101 </start_ymd> | ||
|
||
<!-- Force PHIS to be set to zero --> | ||
<use_topo_file>.false.</use_topo_file> | ||
|
||
<analytic_ic_type>'moist_baroclinic_wave_dcmip2016'</analytic_ic_type> | ||
|
||
</namelist_defaults> |
+1 −1 | component_grids_nuopc.xml | |
+14 −0 | machines/casper/casper.cmake | |
+3 −3 | machines/casper/config_batch.xml | |
+31 −76 | machines/casper/config_machines.xml | |
+44 −0 | machines/casper/gnu_casper.cmake | |
+26 −6 | machines/casper/intel_casper.cmake | |
+43 −9 | machines/casper/nvhpc_casper.cmake | |
+0 −15 | machines/casper/pgi_casper.cmake | |
+9 −7 | machines/cmake_macros/gnu.cmake | |
+13 −40 | machines/cmake_macros/intel.cmake | |
+32 −32 | machines/cmake_macros/nvhpc.cmake | |
+47 −28 | machines/derecho/config_machines.xml | |
+46 −0 | machines/derecho/gnu_derecho.cmake | |
+17 −1 | machines/derecho/intel_derecho.cmake | |
+33 −4 | machines/derecho/nvhpc_derecho.cmake | |
+136 −73 | modelgrid_aliases_nuopc.xml |
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -463,16 +463,6 @@ | |
<option name="wallclock">00:30:00</option> | ||
</options> | ||
</test> | ||
<!-- 339 tsm ter tbl --> | ||
<test compset="FADIAB" grid="f10_f10_mg37" name="ERC_D_Ln9" testmods="cam/terminator"> | ||
<machines> | ||
<machine name="izumi" compiler="gnu" category="aux_cam"/> | ||
</machines> | ||
<options> | ||
<option name="comment" >339 tsm, ter</option> | ||
<option name="wallclock">00:30:00</option> | ||
</options> | ||
</test> | ||
<!-- 368 --> | ||
<test compset="QPC6" grid="f10_f10_mg37" name="ERC_D_Ln9" testmods="cam/outfrq3s"> | ||
<machines> | ||
|
@@ -1012,76 +1002,7 @@ | |
<option name="wallclock">00:20:00</option> | ||
</options> | ||
</test> | ||
<!-- 700 --> | ||
<test compset="FADIAB" grid="ne5_ne5_mg37" name="ERI_D_Ln18" testmods="cam/outfrq3s_bwic"> | ||
<machines> | ||
<machine name="izumi" compiler="nag" category="aux_cam"/> | ||
</machines> | ||
<options> | ||
<option name="comment" >700 tsm, ter, tbr</option> | ||
<option name="wallclock">00:30:00</option> | ||
</options> | ||
</test> | ||
<!-- 702 --> | ||
<test compset="FADIAB" grid="ne5pg3_ne5pg3_mg37" name="ERI_D_Ln18" testmods="cam/outfrq3s_bwic"> | ||
<machines> | ||
<machine name="izumi" compiler="nag" category="aux_cam"/> | ||
</machines> | ||
<options> | ||
<option name="comment" >702 tsm, ter, tbr</option> | ||
<option name="wallclock">00:30:00</option> | ||
</options> | ||
</test> | ||
<!-- 704 tsm ter tbl --> | ||
<test compset="FADIAB" grid="ne5pg3_ne5pg3_mg37" name="ERC_D_Ln9" testmods="cam/outfrq3s"> | ||
<machines> | ||
<machine name="izumi" compiler="gnu" category="aux_cam"/> | ||
</machines> | ||
<options> | ||
<option name="comment" >704 tsm, ter</option> | ||
<option name="wallclock">00:30:00</option> | ||
</options> | ||
</test> | ||
<!-- 705 tsm --> | ||
<test compset="FADIAB" grid="ne5_ne5_mg37" name="SMS_D_Ln9_P1x1" testmods="cam/outfrq3s"> | ||
<machines> | ||
<machine name="izumi" compiler="nag" category="aux_cam"/> | ||
</machines> | ||
<options> | ||
<option name="comment" >705 tsm</option> | ||
<option name="wallclock">00:30:00</option> | ||
</options> | ||
</test> | ||
<!-- 705 teq --> | ||
<test compset="FADIAB" grid="ne5_ne5_mg37" name="PEM_D_Ln9" testmods="cam/outfrq3s"> | ||
<machines> | ||
<machine name="izumi" compiler="nag" category="aux_cam"/> | ||
</machines> | ||
<options> | ||
<option name="comment" >705 teq</option> | ||
<option name="wallclock">00:30:00</option> | ||
</options> | ||
</test> | ||
<!-- 706 tsm teq --> | ||
<test compset="FADIAB" grid="ne5pg3_ne5pg3_mg37" name="PEM_D_Ln9" testmods="cam/outfrq3s"> | ||
Comment on lines
-1056
to
-1066
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Do we no longer need to run a PEM test (whatever that does)? There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. The PEM test runs two smoke tests at different PE counts. Since FADIAB doesn't run any physics this would only test that the dycore gets answers that are independent of task count. This functionality is verified in many other tests. The testing now includes just 1 test for FADIAB (per Peter and Jesse). It is using test ERC_D_Ln9_P1x1 and is the only test that runs the model serially. |
||
<machines> | ||
<machine name="izumi" compiler="gnu" category="aux_cam"/> | ||
</machines> | ||
<options> | ||
<option name="comment" >706 tsm, teq</option> | ||
<option name="wallclock">00:30:00</option> | ||
</options> | ||
</test> | ||
<!-- 707 tsm teq --> | ||
<test compset="FADIAB" grid="ne5pg2_ne5pg2_mg37" name="ERC_D_Ln9" testmods="cam/outfrq3s"> | ||
<machines> | ||
<machine name="izumi" compiler="gnu" category="aux_cam"/> | ||
</machines> | ||
<options> | ||
<option name="comment" >707 tsm, ter</option> | ||
<option name="wallclock">00:30:00</option> | ||
</options> | ||
</test> | ||
|
||
<!-- 711 ter --> | ||
<test compset="QPC5" grid="ne5_ne5_mg37" name="ERC_D_Ln9" testmods="cam/outfrq3s_ttrac"> | ||
<machines> | ||
|
@@ -1326,16 +1247,6 @@ | |
<option name="wallclock">01:00:00</option> | ||
</options> | ||
</test> | ||
<!-- 730 --> | ||
<test compset="FADIAB" grid="ne16_ne16_mg17" name="ERC_D_Ln9" testmods="cam/terminator"> | ||
<machines> | ||
Comment on lines
-1329
to
-1331
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Both terminator tests were eliminated. Don't we still need to test terminator chemistry? There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. FKESSLER is set up with terminator chemistry. This is done in config_component.xml. |
||
<machine name="derecho" compiler="intel" category="aux_cam"/> | ||
</machines> | ||
<options> | ||
<option name="comment" >730 tsm, ter</option> | ||
<option name="wallclock">00:30:00</option> | ||
</options> | ||
</test> | ||
<!-- 735 --> | ||
<test compset="QPC5HIST" grid="ne16_ne16_mg17" name="ERC_D_Ln9" testmods="cam/outfrq3s_usecase"> | ||
<machines> | ||
|
@@ -1394,40 +1305,62 @@ | |
</options> | ||
</test> | ||
|
||
<test compset="FHS94" grid="mpasa480z32_mpasa480" name="ERC_D_Ln9" testmods="cam/outfrq3s_usecase"> | ||
<test compset="F2000dev" grid="ne30pg3_ne30pg3_mg17" name="MGP_D_Ln9" testmods="cam/outfrq3s"> | ||
<machines> | ||
<machine name="derecho" compiler="intel" category="prealpha"/> | ||
Comment on lines
-1397
to
-1399
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. You removed several prealpha simple model tests. I always looked to them as being our first line of defense against externals breaking CAM jobs (CESM testing would uncover problems with externals before we bring those externals into CAM). Did you feel like this functionality is captured with other tests? There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Exactly. Since the simple model tests use all stub components except for CAM, the testing only involves the CAM component and the infrastructure components. The infrastructure components are tested in our other tests. Simple models are basically CAM component only, so I think they should be tested in aux_cam. |
||
<machine name="derecho" compiler="intel" category="aux_pumas"/> | ||
</machines> | ||
<options> | ||
<option name="wallclock">00:30:00</option> | ||
<option name="wallclock">01:00:00</option> | ||
<option name="comment"> Ensuring PUMAS and MG3 config options give the same answers.</option> | ||
</options> | ||
</test> | ||
|
||
<test compset="FHS94" grid="mpasa480z32_mpasa480" name="ERC_D_Ln9" testmods="cam/outfrq3s_usecase"> | ||
<!-- CAM Simple Models --> | ||
|
||
<test compset="FADIAB" grid="ne3pg3_ne3pg3_mt232" name="ERC_D_Ln9_P1x1" testmods="cam/outfrq9s"> | ||
<machines> | ||
<machine name="izumi" compiler="nag" category="aux_cam"/> | ||
</machines> | ||
<options> | ||
<option name="wallclock">00:30:00</option> | ||
<option name="comment" >Adiabatic, analytic ICs</option> | ||
<option name="wallclock">00:10:00</option> | ||
</options> | ||
</test> | ||
|
||
<test compset="F2000dev" grid="ne30pg3_ne30pg3_mg17" name="MGP_D_Ln9" testmods="cam/outfrq3s"> | ||
<test compset="FHS94" grid="mpasa480_mpasa480_mt232" name="ERC_D_Ln9" testmods="cam/outfrq9s"> | ||
<machines> | ||
<machine name="derecho" compiler="intel" category="aux_pumas"/> | ||
<machine name="izumi" compiler="nag" category="aux_cam"/> | ||
</machines> | ||
<options> | ||
<option name="wallclock">01:00:00</option> | ||
<option name="comment"> Ensuring PUMAS and MG3 config options give the same answers.</option> | ||
<option name="wallclock">00:10:00</option> | ||
</options> | ||
</test> | ||
|
||
<!-- CAM Simple Models --> | ||
<test compset="FKESSLER" grid="ne3pg3_ne3pg3_mt232" name="ERC_D_Ln27" testmods="cam/outfrq9s"> | ||
<machines> | ||
<machine name="izumi" compiler="nag" category="aux_cam"/> | ||
</machines> | ||
<options> | ||
<option name="wallclock">00:10:00</option> | ||
</options> | ||
</test> | ||
|
||
<test compset="FKESSLER" grid="f19_f19_mg17" name="ERP_D_Ln9" testmods="cam/outfrq9s"> | ||
<test compset="FTJ16" grid="ne3pg3_ne3pg3_mt232" name="ERC_D_Ln9" testmods="cam/outfrq9s"> | ||
<machines> | ||
<machine name="izumi" compiler="nag" category="prealpha"/> | ||
<machine name="izumi" compiler="gnu" category="aux_cam"/> | ||
</machines> | ||
<options> | ||
<option name="wallclock">00:10:00</option> | ||
</options> | ||
</test> | ||
|
||
<test compset="FGRAYRAD" grid="ne3pg3_ne3pg3_mt232" name="ERC_D_Ln9" testmods="cam/outfrq9s"> | ||
<machines> | ||
<machine name="izumi" compiler="gnu" category="aux_cam"/> | ||
</machines> | ||
<options> | ||
<option name="wallclock">00:10:00</option> | ||
</options> | ||
</test> | ||
|
||
<test compset="FHIST_DARTC6" grid="f09_f09_mg17" name="SMS_C80_P128x1_Lh1" testmods="cam/dartcambigens"> | ||
|
@@ -1753,6 +1686,15 @@ | |
<option name="comment">CAM7 mid top ~80 km</option> | ||
</options> | ||
</test> | ||
<test compset="QPC7" grid="ne30pg2_ne30pg2_mt232" name="ERC_D_Ln9" testmods="cam/outfrq9s"> | ||
<machines> | ||
<machine name="derecho" compiler="intel" category="aux_cam"/> | ||
</machines> | ||
<options> | ||
<option name="wallclock">00:20:00</option> | ||
<option name="comment">CAM7-LT aquaplanet</option> | ||
</options> | ||
</test> | ||
<test compset="FHISTC_MTso" grid="ne30pg3_ne30pg3_mt232" name="ERP_D_Ln9" testmods="cam/outfrq9s"> | ||
<machines> | ||
<machine name="derecho" compiler="intel" category="prealpha"/> | ||
|
@@ -1980,13 +1922,6 @@ | |
</options> | ||
</test> | ||
|
||
<!-- Test of finite volume CAM-SE grid with CSLAM tracer advection --> | ||
<test compset="FKESSLER" grid="ne5pg3_ne5pg3_mg37" name="ERS_Ln27" testmods="cam/outfrq9s" supported="false"> | ||
<machines> | ||
<machine name="izumi" compiler="nag" category="aux_cam"/> | ||
</machines> | ||
</test> | ||
|
||
<!-- @@@@@@@@@@@@@@@@@@@@@@@@@@@ --> | ||
<!-- FV3CAM COMPSETS for testing only --> | ||
<!-- (unsupported) --> | ||
|
@@ -2777,37 +2712,4 @@ | |
</options> | ||
</test> | ||
|
||
<test compset="FHS94" grid="ne5_ne5_mg37" name="ERP_Ln9" testmods="cam/outfrq9s"> | ||
<machines> | ||
<machine name="izumi" compiler="gnu" category="aux_cam"/> | ||
</machines> | ||
</test> | ||
|
||
<test compset="FADIAB" grid="ne5_ne5_mg37" name="ERS_Ln9" testmods="cam/outfrq9s"> | ||
<machines> | ||
<machine name="izumi" compiler="nag" category="aux_cam"/> | ||
</machines> | ||
</test> | ||
|
||
|
||
<test compset="FADIAB" grid="ne0TESTONLYne5x4_ne0TESTONLYne5x4_mg37" name="ERS_Ln9" testmods="cam/outfrq3s_refined" supported="false"> | ||
<machines> | ||
<machine name="derecho" compiler="intel" category="aux_cam"/> | ||
</machines> | ||
<options> | ||
<option name="wallclock">00:10:00</option> | ||
</options> | ||
</test> | ||
|
||
<!-- @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@ --> | ||
<!-- Release tests --> | ||
<!-- @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@ --> | ||
|
||
|
||
<test compset="FTJ16" grid="f09_f09_mg17" name="ERP_Ln9" testmods="cam/outfrq9s"> | ||
<machines> | ||
<machine name="derecho" compiler="intel" category="prealpha"/> | ||
</machines> | ||
</test> | ||
|
||
</testlist> |
This file was deleted.
This file was deleted.
This file was deleted.
This file was deleted.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Was the test case outfrq3s_bwic testing a feature which should continue to be tested?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The outfrq3s_bwic testmods set analytic initial conditions to baroclinic wave. This is now the default for FADIAB and it's set in config_component.xml.