Implemented a tentative fix for SSP tests #5965
Conversation
|
Tests completed: SMS_D_Ln5.ne4_oQU240.F2010.chrysalis_intel.eam-cosplite_nhtfrq5, PASS baseline |
| @@ -47,9 +47,10 @@ | |||
| <values modifier='additive'> | |||
| <value compset="" >-mach $MACH</value> | |||
| <value compset="_EAM" >-phys default</value> | |||
| <value compset="_EAM%CMIP6_" >&eam_phys_defaults; &eam_chem_defaults;</value> | |||
| <value compset="^((?!SSP).)*_EAM%CMIP6_" >&eam_phys_defaults; &eam_chem_defaults;</value> | |||
There was a problem hiding this comment.
Changed to use this negative lookaround to exclude SSP cases from using the config options at this line. Otherwise would not be able to get rid of '-vbs' option for standard config.
| @@ -1285,7 +1285,7 @@ subroutine read_next_trcdata(state, flds, file ) | |||
| cnt3(flds(f)%coords(ZA_TIMDIM)) = 1 | |||
| strt3(flds(f)%coords(ZA_TIMDIM)) = recnos(i) | |||
| !! | |||
| if (file%linoz_v3.eqv..true..or.file%linoz_v2.eqv..true.) then | |||
| if (file%linoz_v3 .or. file%linoz_v2) then | |||
There was a problem hiding this comment.
In the original form, even when linoz_v2 is true, this if-block would not be executed.
|
checking on unexpected diffs for |
Implemented a tentative fix for SSP tests Future scenario forcing files for new species introduced by v3atm are not ready. The cime SSP tests using default v3 configuration therefore failed to be created. The tentative fix uses config that mixes v3 physics with v2 chemistry. Also fixed a couple misuses of eqv operator in linoz-related code that do not properly consider the precedence relative to AND/OR operators. The misuses have no impact on default v3 configuration, but would cause fatal runtime error when using the hybrid configuration as implemented here. [BFB] for existing tests.
|
Merged to next. The BGC tests diffs mentioned above are not a concern for this PR. The tests were created without specifying |
|
Merged to master. |
Future scenario forcing files for new species introduced by v3atm are not ready.
The cime SSP tests using default v3 configuration therefore failed to be created.
The tentative fix uses config that mixes v3 physics with v2 chemistry.
Also fixed a couple misuses of eqv operator in linoz-related code that do not
properly consider the precedence relative to AND/OR operators. The misuses have
no impact on default v3 configuration, but would cause fatal runtime error when using
the hybrid configuration as implemented here.
[BFB] for existing tests.