-
Notifications
You must be signed in to change notification settings - Fork 136
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Dump HistorySet MetaData into the correct output csv files (#987)
* enable historyset to handle both scalar and vector meta data, and add check for NAN from code collections * fix * fix HistorySet * fix reading vector meta data * update tests * add unit test for meta data load, print, reload * fix * modify test to test only the mechanics
- Loading branch information
Showing
12 changed files
with
498 additions
and
100 deletions.
There are no files selected for viewing
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
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
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
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
66 changes: 66 additions & 0 deletions
66
tests/framework/PostProcessors/BasicStatistics/gold/timeDepMeta/Back_to_MASTER.xml
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,66 @@ | ||
<DataObjectMetadata name="SET_Back_to_MASTER"> | ||
<DataSet type="Static"> | ||
<dims> | ||
<avg_EXP_MaxCtoF_a>Time_aligned</avg_EXP_MaxCtoF_a> | ||
<avg_EXP_PCT_a>Time_aligned</avg_EXP_PCT_a> | ||
<avg_EXP_P_a>Time_aligned</avg_EXP_P_a> | ||
<avg_REP_MaxCtoF_a>Time_aligned</avg_REP_MaxCtoF_a> | ||
<avg_REP_PCT_a>Time_aligned</avg_REP_PCT_a> | ||
<avg_REP_P_a>Time_aligned</avg_REP_P_a> | ||
<avg_ste_EXP_MaxCtoF_a>Time_aligned</avg_ste_EXP_MaxCtoF_a> | ||
<avg_ste_EXP_PCT_a>Time_aligned</avg_ste_EXP_PCT_a> | ||
<avg_ste_EXP_P_a>Time_aligned</avg_ste_EXP_P_a> | ||
<avg_ste_REP_MaxCtoF_a>Time_aligned</avg_ste_REP_MaxCtoF_a> | ||
<avg_ste_REP_PCT_a>Time_aligned</avg_ste_REP_PCT_a> | ||
<avg_ste_REP_P_a>Time_aligned</avg_ste_REP_P_a> | ||
<sen_EXP_MaxCtoF_a_HTcoeff>Time_aligned</sen_EXP_MaxCtoF_a_HTcoeff> | ||
<sen_EXP_MaxCtoF_a_LinPow>Time_aligned</sen_EXP_MaxCtoF_a_LinPow> | ||
<sen_EXP_MaxCtoF_a_RodPitch>Time_aligned</sen_EXP_MaxCtoF_a_RodPitch> | ||
<sen_EXP_MaxCtoF_a_TCool>Time_aligned</sen_EXP_MaxCtoF_a_TCool> | ||
<sen_EXP_MaxCtoF_a_VCool>Time_aligned</sen_EXP_MaxCtoF_a_VCool> | ||
<sen_EXP_PCT_a_HTcoeff>Time_aligned</sen_EXP_PCT_a_HTcoeff> | ||
<sen_EXP_PCT_a_LinPow>Time_aligned</sen_EXP_PCT_a_LinPow> | ||
<sen_EXP_PCT_a_RodPitch>Time_aligned</sen_EXP_PCT_a_RodPitch> | ||
<sen_EXP_PCT_a_TCool>Time_aligned</sen_EXP_PCT_a_TCool> | ||
<sen_EXP_PCT_a_VCool>Time_aligned</sen_EXP_PCT_a_VCool> | ||
<sen_EXP_P_a_HTcoeff>Time_aligned</sen_EXP_P_a_HTcoeff> | ||
<sen_EXP_P_a_LinPow>Time_aligned</sen_EXP_P_a_LinPow> | ||
<sen_EXP_P_a_RodPitch>Time_aligned</sen_EXP_P_a_RodPitch> | ||
<sen_EXP_P_a_TCool>Time_aligned</sen_EXP_P_a_TCool> | ||
<sen_EXP_P_a_VCool>Time_aligned</sen_EXP_P_a_VCool> | ||
<sen_REP_MaxCtoF_a_HTcoeff>Time_aligned</sen_REP_MaxCtoF_a_HTcoeff> | ||
<sen_REP_MaxCtoF_a_LinPow>Time_aligned</sen_REP_MaxCtoF_a_LinPow> | ||
<sen_REP_MaxCtoF_a_RodPitch>Time_aligned</sen_REP_MaxCtoF_a_RodPitch> | ||
<sen_REP_MaxCtoF_a_TCool>Time_aligned</sen_REP_MaxCtoF_a_TCool> | ||
<sen_REP_MaxCtoF_a_VCool>Time_aligned</sen_REP_MaxCtoF_a_VCool> | ||
<sen_REP_PCT_a_HTcoeff>Time_aligned</sen_REP_PCT_a_HTcoeff> | ||
<sen_REP_PCT_a_LinPow>Time_aligned</sen_REP_PCT_a_LinPow> | ||
<sen_REP_PCT_a_RodPitch>Time_aligned</sen_REP_PCT_a_RodPitch> | ||
<sen_REP_PCT_a_TCool>Time_aligned</sen_REP_PCT_a_TCool> | ||
<sen_REP_PCT_a_VCool>Time_aligned</sen_REP_PCT_a_VCool> | ||
<sen_REP_P_a_HTcoeff>Time_aligned</sen_REP_P_a_HTcoeff> | ||
<sen_REP_P_a_LinPow>Time_aligned</sen_REP_P_a_LinPow> | ||
<sen_REP_P_a_TCool>Time_aligned</sen_REP_P_a_TCool> | ||
<sen_REP_P_a_VCool>Time_aligned</sen_REP_P_a_VCool> | ||
<var_EXP_MaxCtoF_a>Time_aligned</var_EXP_MaxCtoF_a> | ||
<var_EXP_PCT_a>Time_aligned</var_EXP_PCT_a> | ||
<var_EXP_P_a>Time_aligned</var_EXP_P_a> | ||
<var_REP_MaxCtoF_a>Time_aligned</var_REP_MaxCtoF_a> | ||
<var_REP_PCT_a>Time_aligned</var_REP_PCT_a> | ||
<var_REP_P_a>Time_aligned</var_REP_P_a> | ||
<var_ste_EXP_MaxCtoF_a>Time_aligned</var_ste_EXP_MaxCtoF_a> | ||
<var_ste_EXP_PCT_a>Time_aligned</var_ste_EXP_PCT_a> | ||
<var_ste_EXP_P_a>Time_aligned</var_ste_EXP_P_a> | ||
<var_ste_REP_MaxCtoF_a>Time_aligned</var_ste_REP_MaxCtoF_a> | ||
<var_ste_REP_PCT_a>Time_aligned</var_ste_REP_PCT_a> | ||
<var_ste_REP_P_a>Time_aligned</var_ste_REP_P_a> | ||
</dims> | ||
<general> | ||
<inputs>avg_VCool,avg_TCool,avg_LinPow,avg_HTcoeff,avg_RodPitch,var_VCool,var_TCool,var_LinPow,var_HTcoeff,var_RodPitch</inputs> | ||
<outputs>sen_EXP_PCT_a_VCool,sen_EXP_MaxCtoF_a_VCool,sen_EXP_P_a_VCool,sen_EXP_PCT_a_TCool,sen_EXP_MaxCtoF_a_TCool,sen_EXP_P_a_TCool,sen_EXP_PCT_a_LinPow,sen_EXP_MaxCtoF_a_LinPow,sen_EXP_P_a_LinPow,sen_EXP_PCT_a_HTcoeff,sen_EXP_MaxCtoF_a_HTcoeff,sen_EXP_P_a_HTcoeff,sen_EXP_PCT_a_RodPitch,sen_EXP_MaxCtoF_a_RodPitch,sen_EXP_P_a_RodPitch,sen_REP_PCT_a_VCool,sen_REP_MaxCtoF_a_VCool,sen_REP_P_a_VCool,sen_REP_PCT_a_TCool,sen_REP_MaxCtoF_a_TCool,sen_REP_P_a_TCool,sen_REP_PCT_a_LinPow,sen_REP_MaxCtoF_a_LinPow,sen_REP_P_a_LinPow,sen_REP_PCT_a_HTcoeff,sen_REP_MaxCtoF_a_HTcoeff,sen_REP_P_a_HTcoeff,sen_REP_PCT_a_RodPitch,sen_REP_MaxCtoF_a_RodPitch,avg_EXP_PCT_a,avg_EXP_MaxCtoF_a,avg_EXP_P_a,avg_REP_PCT_a,avg_REP_MaxCtoF_a,avg_REP_P_a,var_EXP_PCT_a,var_EXP_MaxCtoF_a,var_EXP_P_a,var_REP_PCT_a,var_REP_MaxCtoF_a,var_REP_P_a</outputs> | ||
<pointwise_meta>avg_ste_EXP_MaxCtoF_a,avg_ste_EXP_PCT_a,avg_ste_EXP_P_a,avg_ste_HTcoeff,avg_ste_LinPow,avg_ste_REP_MaxCtoF_a,avg_ste_REP_PCT_a,avg_ste_REP_P_a,avg_ste_RodPitch,avg_ste_TCool,avg_ste_VCool,var_ste_EXP_MaxCtoF_a,var_ste_EXP_PCT_a,var_ste_EXP_P_a,var_ste_HTcoeff,var_ste_LinPow,var_ste_REP_MaxCtoF_a,var_ste_REP_PCT_a,var_ste_REP_P_a,var_ste_RodPitch,var_ste_TCool,var_ste_VCool</pointwise_meta> | ||
<sampleTag>RAVEN_sample_ID</sampleTag> | ||
</general> | ||
</DataSet> | ||
|
||
</DataObjectMetadata> |
157 changes: 157 additions & 0 deletions
157
tests/framework/PostProcessors/BasicStatistics/test_time_dep_meta.xml
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,157 @@ | ||
<?xml version="1.0" ?> | ||
<Simulation verbosity="debug"> | ||
|
||
<TestInfo> | ||
<name>framework/PostProcessors/BasicStatistics.timeDepMeta</name> | ||
<author>wangc</author> | ||
<created>2019-05-10</created> | ||
<classesTested>PostProcessors.BasicStatistics, DataObjects.HistorySet</classesTested> | ||
<description> | ||
This test checks the metadata printing of history set, the scalar meta data should be printed with | ||
the input of HistorySet, while vector meta data should be printed with output of HistorySet. See issue #986. | ||
With the fix of #986, The HistorySet will handle scalar and vector meta data separately. | ||
</description> | ||
</TestInfo> | ||
|
||
<RunInfo> | ||
<WorkingDir>timeDepMeta</WorkingDir> | ||
<Sequence>Read_raw, SensPost_1, Back_to_MASTER</Sequence> | ||
<internalParallel>True</internalParallel> | ||
<deleteOutExtension>o,plt,rst,csv,i</deleteOutExtension> | ||
</RunInfo> | ||
|
||
<Files> | ||
<Input name="myinputfile" type="">RawData</Input> | ||
</Files> | ||
|
||
<VariableGroups> | ||
<Group name="GRO_SensPost_in_features_scalar"> | ||
VCool, | ||
TCool, | ||
LinPow, | ||
HTcoeff, | ||
RodPitch | ||
</Group> | ||
<Group name="GRO_SensPost_in_targets_Timealigned"> | ||
EXP_PCT_a, | ||
EXP_MaxCtoF_a, | ||
EXP_P_a, | ||
REP_PCT_a, | ||
REP_MaxCtoF_a, | ||
REP_P_a | ||
</Group> | ||
<Group name="GRO_SensPost_out_scalar"> | ||
avg_VCool, | ||
avg_TCool, | ||
avg_LinPow, | ||
avg_HTcoeff, | ||
avg_RodPitch, | ||
var_VCool, | ||
var_TCool, | ||
var_LinPow, | ||
var_HTcoeff, | ||
var_RodPitch | ||
</Group> | ||
<Group name="GRO_SensPost_out_Timealigned"> | ||
sen_EXP_PCT_a_VCool, | ||
sen_EXP_MaxCtoF_a_VCool, | ||
sen_EXP_P_a_VCool, | ||
sen_EXP_PCT_a_TCool, | ||
sen_EXP_MaxCtoF_a_TCool, | ||
sen_EXP_P_a_TCool, | ||
sen_EXP_PCT_a_LinPow, | ||
sen_EXP_MaxCtoF_a_LinPow, | ||
sen_EXP_P_a_LinPow, | ||
sen_EXP_PCT_a_HTcoeff, | ||
sen_EXP_MaxCtoF_a_HTcoeff, | ||
sen_EXP_P_a_HTcoeff, | ||
sen_EXP_PCT_a_RodPitch, | ||
sen_EXP_MaxCtoF_a_RodPitch, | ||
sen_EXP_P_a_RodPitch, | ||
sen_REP_PCT_a_VCool, | ||
sen_REP_MaxCtoF_a_VCool, | ||
sen_REP_P_a_VCool, | ||
sen_REP_PCT_a_TCool, | ||
sen_REP_MaxCtoF_a_TCool, | ||
sen_REP_P_a_TCool, | ||
sen_REP_PCT_a_LinPow, | ||
sen_REP_MaxCtoF_a_LinPow, | ||
sen_REP_P_a_LinPow, | ||
sen_REP_PCT_a_HTcoeff, | ||
sen_REP_MaxCtoF_a_HTcoeff, | ||
sen_REP_P_a_HTcoeff, | ||
sen_REP_PCT_a_RodPitch, | ||
sen_REP_MaxCtoF_a_RodPitch, | ||
sen_REP_P_a_HTcoeff, | ||
avg_EXP_PCT_a, | ||
avg_EXP_MaxCtoF_a, | ||
avg_EXP_P_a, | ||
avg_REP_PCT_a, | ||
avg_REP_MaxCtoF_a, | ||
avg_REP_P_a, | ||
var_EXP_PCT_a, | ||
var_EXP_MaxCtoF_a, | ||
var_EXP_P_a, | ||
var_REP_PCT_a, | ||
var_REP_MaxCtoF_a, | ||
var_REP_P_a | ||
</Group> | ||
</VariableGroups> | ||
<Models> | ||
<PostProcessor name="SensPost_1" subType="BasicStatistics" verbosity="debug"> | ||
<pivotParameter>Time_aligned</pivotParameter> | ||
<sensitivity prefix="sen"> | ||
<targets>GRO_SensPost_in_targets_Timealigned</targets> | ||
<features>GRO_SensPost_in_features_scalar</features> | ||
</sensitivity> | ||
<expectedValue prefix="avg"> | ||
GRO_SensPost_in_targets_Timealigned, GRO_SensPost_in_features_scalar | ||
</expectedValue> | ||
<variance prefix="var"> | ||
GRO_SensPost_in_targets_Timealigned, GRO_SensPost_in_features_scalar | ||
</variance> | ||
</PostProcessor> | ||
</Models> | ||
|
||
<DataObjects> | ||
<HistorySet name="SET_SensPost_aligned"> | ||
<Input>GRO_SensPost_in_features_scalar</Input> | ||
<Output>GRO_SensPost_in_targets_Timealigned</Output> | ||
<options> | ||
<pivotParameter>Time_aligned</pivotParameter> | ||
</options> | ||
</HistorySet> | ||
<HistorySet name="SET_Back_to_MASTER"> | ||
<Input>GRO_SensPost_out_scalar</Input> | ||
<Output>GRO_SensPost_out_Timealigned</Output> | ||
<options> | ||
<pivotParameter>Time_aligned</pivotParameter> | ||
</options> | ||
</HistorySet> | ||
</DataObjects> | ||
|
||
<Steps> | ||
<IOStep name="Read_raw"> | ||
<Input class="Files" type="csv">myinputfile</Input> | ||
<Output class="DataObjects" type="HiostorySet">SET_SensPost_aligned</Output> | ||
</IOStep> | ||
|
||
<PostProcess name="SensPost_1"> | ||
<Input class="DataObjects" type="HistorySet">SET_SensPost_aligned</Input> | ||
<Model class="Models" type="PostProcessor">SensPost_1</Model> | ||
<Output class="DataObjects" type="HistorySet">SET_Back_to_MASTER</Output> | ||
</PostProcess> | ||
|
||
<IOStep name="Back_to_MASTER"> | ||
<Input class="DataObjects" type="HistorySet">SET_Back_to_MASTER</Input> | ||
<Output class="OutStreams" type="Print">Back_to_MASTER</Output> | ||
</IOStep> | ||
</Steps> | ||
|
||
<OutStreams> | ||
<Print name="Back_to_MASTER"> | ||
<type>csv</type> | ||
<source>SET_Back_to_MASTER</source> | ||
</Print> | ||
</OutStreams> | ||
</Simulation> |
Oops, something went wrong.