Fix the mpaso-conservation_check testdef #6659
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
jonbob
added
mpas-ocean
BFB
|
xylar
approved these changes
Oct 8, 2024
There was a problem hiding this comment.
I successfully ran the test:
./create_test --wait --walltime=1:00:00 ERS_Ld5_D.T62_oQU240.GMPAS-IAF.chrysalis_intel.mpaso-conservation_check
I see the modified mpaso section in env_archive.xml looks as expected:
<comp_archive_spec compclass="ocn" compname="mpaso">
<rest_file_extension>rst</rest_file_extension>
<rest_file_extension>rst.am.timeSeriesStatsMonthly</rest_file_extension>
<hist_file_extension>hist.am.conservationCheck\..*\.nc$</hist_file_extension>
<rest_history_varname>unset</rest_history_varname>
<rpointer>
<rpointer_file>rpointer.ocn$NINST_STRING</rpointer_file>
<rpointer_content>$MPAS_DATENAME</rpointer_content>
</rpointer>
<test_file_names>
<tfile disposition="copy">rpointer.ocn</tfile>
<tfile disposition="copy">casename.mpaso.rst.1976-01-01_00000.nc</tfile>
<tfile disposition="copy">casename.mpaso.rst.am.timeSeriesStatsMonthly.1976-01-01_00000.nc</tfile>
<tfile disposition="move">casename.mpaso.hist.am.conservationCheck.1976-01-01.nc</tfile>
</test_file_names>
</comp_archive_spec>
I also see that the outputs from the conservation check are successfully being compared:
$ head /lcrc/group/e3sm/ac.xasay-davis/scratch/chrys/ERS_Ld5_D.T62_oQU240.GMPAS-IAF.chrysalis_intel.mpaso-conservation_check.20241008_095746_8rndms/run/ERS_Ld5_D.T62_oQU240.GMPAS-IAF.chrysalis_intel.mpaso-conservation_check.20241008_095746_8rndms.mpaso.hist.am.conservationCheck.0001-01-01.nc.base.cprnc.out
file 1=
/lcrc/group/e3sm/ac.xasay-davis/scratch/chrys/ERS_Ld5_D.T62_oQU240.GMPAS-IAF.ch
rysalis_intel.mpaso-conservation_check.20241008_095746_8rndms/run/ERS_Ld5_D.T62
_oQU240.GMPAS-IAF.chrysalis_intel.mpaso-conservation_check.20241008_095746_8rnd
ms.mpaso.hist.am.conservationCheck.0001-01-01.nc.base
file 2=
/lcrc/group/e3sm/ac.xasay-davis/scratch/chrys/ERS_Ld5_D.T62_oQU240.GMPAS-IAF.ch
rysalis_intel.mpaso-conservation_check.20241008_095746_8rndms/run/ERS_Ld5_D.T62
_oQU240.GMPAS-IAF.chrysalis_intel.mpaso-conservation_check.20241008_095746_8rnd
ms.mpaso.hist.am.conservationCheck.0001-01-01.nc.rest
$ tail /lcrc/group/e3sm/ac.xasay-davis/scratch/chrys/ERS_Ld5_D.T62_oQU240.GMPAS-IAF.chrysalis_intel.mpaso-conservation_check.20241008_095746_8rndms/run/ERS_Ld5_D.T62_oQU240.GMPAS-IAF.chrysalis_intel.mpaso-conservation_check.20241008_095746_8rndms.mpaso.hist.am.conservationCheck.0001-01-01.nc.base.cprnc.out
and 0 had differences in fill patterns
and 0 had different dimension sizes
and 0 had different data types
A total number of 5 fields could not be analyzed
A total number of 0 time-varying fields on file 1 were not found on file 2.
A total number of 0 time-constant fields on file 1 were not found on file 2.
A total number of 0 time-varying fields on file 2 were not found on file 1.
A total number of 0 time-constant fields on file 2 were not found on file 1.
diff_test: the two files seem to be IDENTICAL
jonbob
added a commit
that referenced
this pull request
Oct 10, 2024
Fix the mpaso-conservation_check testdef Add sed commands to modify env_archive.xml to correctly test the conservation am. As is, the test runs and makes the hist.am.conservationCheck files just fine, but does not run cprnc on them and include its results in the TestStatus. [BFB]
|
Passes:
merged to next |
|
merged to master and expected DIFF blessed (for new required baseline from adding the conservationCheck am file to testing) |
xylar
added a commit
to xylar/compass
that referenced
this pull request
Oct 26, 2024
This merge updates the E3SM-Project submodule from [727ad81](https://github.com/E3SM-Project/E3SM/tree/727ad81) to [1442143](https://github.com/E3SM-Project/E3SM/tree/1442143). This update includes the following MPAS-Ocean and MPAS-Frameworks PRs (check mark indicates bit-for-bit with previous PR in the list): - [ ] (ocn) E3SM-Project/E3SM#6509 - [ ] (ocn) E3SM-Project/E3SM#6508 - [ ] (fwk) E3SM-Project/E3SM#6575 - [ ] (ocn) E3SM-Project/E3SM#6590 - [ ] (fwk) E3SM-Project/E3SM#6643 - [ ] (ocn) E3SM-Project/E3SM#6656 - [ ] (ocn) E3SM-Project/E3SM#6672 - [ ] (ocn) E3SM-Project/E3SM#6659 - [ ] (ocn) E3SM-Project/E3SM#6497 - [ ] (ocn) E3SM-Project/E3SM#6485 - [ ] (ocn) E3SM-Project/E3SM#6566
11 tasks
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Add sed commands to modify env_archive.xml to correctly test the conservation am. As is, the test runs and makes the hist.am.conservationCheck files just fine, but does not run cprnc on them and include its results in the TestStatus.
[BFB]