Adding DSS capabilities #1619

yoshiurr-INL · 2021-07-21T22:30:27Z

Pull Request Description

What issue does this change request address? (Use "#" before the issue to link it, i.e., #42.)

Closes #1617

What are the significant changes in functionality due to this change request?

The main function of this pull request is to add Dynamical System Scaling (DSS) to wangc/validation_pp_base.
The addition of metric and postprocessor DSS code is part of the PR.
To pass DSS specific data to metric code DSS, the MetricDistributor.py has been modified. When "DSS" is added as the metric in the xml file, the modified code will pass postprossed data to only the DSS metric code.
Test files showing the DSS functionality is added as well.

For Change Control Board: Change Request Review

The following review must be completed by an authorized member of the Change Control Board.

1. Review all computer code.
2. If any changes occur to the input syntax, there must be an accompanying change to the user manual and xsd schema. If the input syntax change deprecates existing input files, a conversion script needs to be added (see Conversion Scripts).
3. Make sure the Python code and commenting standards are respected (camelBack, etc.) - See on the wiki for details.
4. Automated Tests should pass, including run_tests, pylint, manual building and xsd tests. If there are changes to Simulation.py or JobHandler.py the qsub tests must pass.
5. If significant functionality is added, there must be tests added to check this. Tests should cover all possible options. Multiple short tests are preferred over one large test. If new development on the internal JobHandler parallel system is performed, a cluster test must be added setting, in XML block, the node <internalParallel> to True.
6. If the change modifies or adds a requirement or a requirement based test case, the Change Control Board's Chair or designee also needs to approve the change. The requirements and the requirements test shall be in sync.
7. The merge request must reference an issue. If the issue is closed, the issue close checklist shall be done.
8. If an analytic test is changed/added is the the analytic documentation updated/added?
9. If any test used as a basis for documentation examples (currently found in raven/tests/framework/user_guide and raven/docs/workshop) have been changed, the associated documentation must be reviewed and assured the text matches the example.

Jimmy-INL · 2021-07-25T16:14:03Z

framework/Models/PostProcessors/validationAlgorithms/PPDSS.py

+    # assert
+    assert(isinstance(inputIn, list))
+    assert(isinstance(inputIn[0], xr.Dataset) or isinstance(inputIn[0], DataObjects.DataSet))
+    # the input can be either be a list of dataobjects or a list of datasets (xarray)


These asserts will error out!
If they are necessary, maybe assert(isinstance(inputIn['Data][0][-1],xr.Dataset)) ?

Edited due to invalid assert errors.

moosebuild · 2021-07-27T15:26:22Z

Job Precheck on 07da9b7 : invalidated by @joshua-cogliati-inl

checking civet.

Jimmy-INL · 2021-07-28T17:54:36Z

framework/Models/PostProcessors/validationAlgorithms/PPDSS.py

+    """
+    # assert
+    assert(isinstance(inputIn["Data"], list))
+    assert(isinstance(inputIn["Data"][0][-1], xr.Dataset) and isinstance(inputI["Data"][1][-1], xr.Dataset))


There is a missing n in inputI['Data'][1][-1]

I tried to push it my self but it gave me:
remote: Password authentication is temporarily disabled as part of a brownout. Please use a personal access token instead. remote: Please see https://github.blog/2020-07-30-token-authentication-requirements-for-api-and-git-operations/ for more information. fatal: unable to access 'https://github.com/idaholab/raven.git/': The requested URL returned error: 403

wangcj05 · 2021-09-29T01:49:56Z

@yoshiurr-INL Can you rebase your branch with devel and try to resolve the conflicts?

Edited due to invalid assert errors.

As part of last fiscal year's milestone completion, the code was repeatedly tested under various types of time dependent data. The code was improved for each issue encountered. The import for "Validation" has been updated to "ValidationBase".

After rebase, forgot to select which head to change before committing changes to this branch.

Changed line 173 to adapt with new input format implemented after converting to ValidationBase.py.

…/raven into yoshrk-dss-validation_pp

wangcj05 · 2021-10-18T16:19:45Z

@yoshiurr-INL @Jimmy-INL This branch has been cleaned up.

wangcj05 · 2021-10-19T20:47:56Z

@yoshiurr-INL Is it ready to be reviewed?

Readjusted the postprocessed data output name.

The output name is changed according to the Probabilistic model in the user manual.

Added more test files

Deleting to test civet errors

Returning to previous state

moosebuild · 2021-11-08T23:20:02Z

Job Test Fedora 31 on cbc7fe1 : invalidated by @wangcj05

retesting

moosebuild · 2021-11-08T23:53:53Z

Job Test Fedora 32 on cbc7fe1 : invalidated by @Jimmy-INL

Edited the "inputI" to"inputIn"

wangcj05 · 2021-11-17T22:28:12Z

doc/theory_manual/raven_theory_manual.tex

@@ -404,6 +404,7 @@
 \input{reducedOrderModeling.tex}
 \input{statisticalAnalysis.tex}
 \input{dataMining.tex}
+\input{dssPostProcessor.tex}


This file is not uploaded to your remote branch.

wangcj05

@yoshiurr-INL I have some additional comments for your consideration. In addition:

there is a missing .tex file for theory manual
I am wondering if you can desire a analytic test case for DSS in future PR.

wangcj05 · 2021-11-18T16:30:44Z

doc/user_manual/metrics.tex

+
+The specifications of a DSS metric is defined within the \xmlNode{Metric} XML block. The attribute \xmlAttr{subType} must be \textbf{PPDSS} (see \ref{subsubsec:Validation}) in the \xmlNode{PostProcessor} for the outputs of the post-processor to be in the right format for DSS metric inputs.
+
+This XML node needs to contain the attributes:


It seems 'attributes' is still used.

doc/user_manual/metrics.tex

framework/Models/PostProcessors/Validations/PPDSS.py

…/raven into yoshrk-dss-validation_pp

wangcj05 · 2021-12-01T04:16:37Z

@yoshiurr-INL There are some compiling issue with the theory manual, could you check that?

moosebuild · 2021-12-02T05:15:11Z

Job Test qsubs falcon on 9632050 : invalidated by @yoshiurr-INL

wangcj05

This PR is good to me.

moosebuild · 2021-12-06T15:46:37Z

Job Mingw Test on f81f692 : invalidated by @joshua-cogliati-inl

restarted civet

moosebuild · 2021-12-06T16:04:13Z

Job Mingw Test on f81f692 : invalidated by @yoshiurr-INL

Need to restart checking process due to win-mingw was not restarted.

Ramon Yoshiura and others added 4 commits July 21, 2021 15:32

Adding DSS capabilities

12e252d

DSS xml file

2f16b46

Added external models and xml output files

a3f78e3

Added golded files for DSS xml

28dd729

Jimmy-INL reviewed Jul 25, 2021

View reviewed changes

Update PPDSS.py

07da9b7

Edited due to invalid assert errors.

Jimmy-INL reviewed Jul 28, 2021

View reviewed changes

Base automatically changed from wangc/validation_pp_base to devel September 28, 2021 17:08

Ramon Yoshiura and others added 6 commits October 11, 2021 08:31

Adding DSS capabilities

c090ef4

DSS xml file

d811a31

Added external models and xml output files

260a287

Added golded files for DSS xml

639267d

Update PPDSS.py

4145b8f

Edited due to invalid assert errors.

rebased branch, and updated PPDSS.py and MetricDistributor.py

18f460f

yoshiurr-INL added the Do Not Merge label Oct 11, 2021

yoshiurr-INL and others added 6 commits October 11, 2021 09:57

rebased branch, and updated PPDSS.py and MetricDistributor.py

ab1a2dd

Update PPDSS.py

65b6b3d

As part of last fiscal year's milestone completion, the code was repeatedly tested under various types of time dependent data. The code was improved for each issue encountered. The import for "Validation" has been updated to "ValidationBase".

Update DSS.py

5759f1f

After rebase, forgot to select which head to change before committing changes to this branch.

Update PPDSS.py

15b9e45

Changed line 173 to adapt with new input format implemented after converting to ValidationBase.py.

Updating with local branch to remote branch

4eb77fa

Merge branch 'yoshrk-dss-validation_pp' of http://github.com/idaholab…

4b7b291

…/raven into yoshrk-dss-validation_pp

wangcj05 added the RAVENv2.2 for RAVENv2.2 Release label Oct 16, 2021

wangcj05 added 2 commits October 18, 2021 10:15

Merge branch 'devel' into yoshrk-dss-validation_pp

94a2676

remove unneeded files

5bc793d

yoshiurr-INL added 2 commits October 29, 2021 12:41

Update test_validation_dss.xml

00b2a50

Readjusted the postprocessed data output name.

Update PPDSS.py

c364967

The output name is changed according to the Probabilistic model in the user manual.

yoshiurr-INL added 8 commits November 8, 2021 15:10

Add files via upload

4bd7eb0

Added more test files

Delete pp2_print_9.csv

b078b6d

Deleting to test civet errors

Delete pp2_print_8.csv

cc2120f

Deleting to test civet errors

Delete pp2_print_7.csv

ab621f4

Deleting to test civet errors

Delete pp2_print_6.csv

3c4777b

Deleting to test civet errors

Delete pp2_print_5.csv

76c17df

Deleting to test civet errors

Delete pp2_print_4.csv

56482a2

Deleting to test civet errors

Update tests

cbc7fe1

Returning to previous state

yoshiurr-INL and others added 3 commits November 8, 2021 17:55

Update PPDSS.py

d6b0f3d

Edited the "inputI" to"inputIn"

Modified files according to review comments

f5b7e94

Merge branch 'devel' into yoshrk-dss-validation_pp

539ad3c

yoshiurr-INL requested a review from wangcj05 November 17, 2021 18:07

wangcj05 reviewed Nov 17, 2021

View reviewed changes

wangcj05 requested changes Nov 18, 2021

View reviewed changes

yoshiurr-INL added 3 commits November 30, 2021 16:20

Added the final changes from the last review

4b81abe

Merge branch 'yoshrk-dss-validation_pp' of http://github.com/idaholab…

64777b2

…/raven into yoshrk-dss-validation_pp

Added final adjustments based on comments from 12 days ago

337730f

yoshiurr-INL added 2 commits December 1, 2021 09:37

Fixing Theory Manual Build Error

0d72aeb

Added userpackages required by dssPostProcessor.tex

9632050

Added tabls userpackage

f81f692

yoshiurr-INL requested a review from wangcj05 December 2, 2021 20:18

wangcj05 approved these changes Dec 2, 2021

View reviewed changes

yoshiurr-INL merged commit 9d8db47 into devel Dec 6, 2021

yoshiurr-INL deleted the yoshrk-dss-validation_pp branch December 6, 2021 18:05

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Adding DSS capabilities #1619

Adding DSS capabilities #1619

yoshiurr-INL commented Jul 21, 2021 •

edited by wangcj05

Loading

Jimmy-INL Jul 25, 2021

moosebuild commented Jul 27, 2021

Jimmy-INL Jul 28, 2021 •

edited

Loading

Jimmy-INL Jul 28, 2021

wangcj05 commented Sep 29, 2021

wangcj05 commented Oct 18, 2021

wangcj05 commented Oct 19, 2021

moosebuild commented Nov 8, 2021

moosebuild commented Nov 8, 2021

wangcj05 Nov 17, 2021

wangcj05 left a comment

wangcj05 Nov 18, 2021

wangcj05 commented Dec 1, 2021

moosebuild commented Dec 2, 2021

wangcj05 left a comment

moosebuild commented Dec 6, 2021

moosebuild commented Dec 6, 2021


		The specifications of a DSS metric is defined within the \xmlNode{Metric} XML block. The attribute \xmlAttr{subType} must be \textbf{PPDSS} (see \ref{subsubsec:Validation}) in the \xmlNode{PostProcessor} for the outputs of the post-processor to be in the right format for DSS metric inputs.

		This XML node needs to contain the attributes:

Adding DSS capabilities #1619

Adding DSS capabilities #1619

Conversation

yoshiurr-INL commented Jul 21, 2021 • edited by wangcj05 Loading

Pull Request Description

What issue does this change request address? (Use "#" before the issue to link it, i.e., #42.)

What are the significant changes in functionality due to this change request?

For Change Control Board: Change Request Review

Jimmy-INL Jul 25, 2021

Choose a reason for hiding this comment

moosebuild commented Jul 27, 2021

Jimmy-INL Jul 28, 2021 • edited Loading

Choose a reason for hiding this comment

Jimmy-INL Jul 28, 2021

Choose a reason for hiding this comment

wangcj05 commented Sep 29, 2021

wangcj05 commented Oct 18, 2021

wangcj05 commented Oct 19, 2021

moosebuild commented Nov 8, 2021

moosebuild commented Nov 8, 2021

wangcj05 Nov 17, 2021

Choose a reason for hiding this comment

wangcj05 left a comment

Choose a reason for hiding this comment

wangcj05 Nov 18, 2021

Choose a reason for hiding this comment

wangcj05 commented Dec 1, 2021

moosebuild commented Dec 2, 2021

wangcj05 left a comment

Choose a reason for hiding this comment

moosebuild commented Dec 6, 2021

moosebuild commented Dec 6, 2021

yoshiurr-INL commented Jul 21, 2021 •

edited by wangcj05

Loading

Jimmy-INL Jul 28, 2021 •

edited

Loading