Skip to content
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

Update FARM Submodule #1907

Merged
merged 4 commits into from
Jul 29, 2022
Merged

Update FARM Submodule #1907

merged 4 commits into from
Jul 29, 2022

Conversation

wanghy-anl
Copy link
Contributor

@wanghy-anl wanghy-anl commented Jul 22, 2022


Pull Request Description

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

FARM Delta validator is developed
gold files for FARM validator tests are provided for both Windows and Linux systems
#1548

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

FARM Delta is developed, which supports the constraints enforcement of an MIMO system. In addition, the MIMO FMU is used as the downstream high-fidelity model to validate the adjusted set-points.


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.

@wanghy-anl wanghy-anl changed the title modified FARM to devel Update FARM Submodule Jul 22, 2022
wangcj05
wangcj05 previously approved these changes Jul 27, 2022
@wangcj05
Copy link
Collaborator

@wanghy-anl Can you merge your branch with devel and push to your remote branch to enable the test option?

@wanghy-anl
Copy link
Contributor Author

@wangcj05 Congjian, I need your instructions on how to do so. My naive understanding is, do you need me to re-submit the PR, and make it with something like "wanghy-anl wants to merge 2 commits into idaholab:devel from wanghy-anl:devel"?

@wangcj05 wangcj05 changed the title Update FARM Submodule WIP: Update FARM Submodule Jul 27, 2022
@wangcj05 wangcj05 changed the title WIP: Update FARM Submodule Update FARM Submodule Jul 27, 2022
@wangcj05
Copy link
Collaborator

@wanghy-anl never mind. I managed to enable the test for your PR. When all tests pass, I will merge your PR. Thanks for your contribution.

@wanghy-anl
Copy link
Contributor Author

@wanghy-anl never mind. I managed to enable the test for your PR. When all tests pass, I will merge your PR. Thanks for your contribution.

Thank you Congjian. I can see all the tests are Pending -- Waiting now.
Just curious, in the future, should I still follow this manner (making a new branch and submit the PR), or should I make all the changes in my own "wanghy-anl:devel" branch and submit the PR from there?

@wangcj05
Copy link
Collaborator

@wanghy-anl never mind. I managed to enable the test for your PR. When all tests pass, I will merge your PR. Thanks for your contribution.

Thank you Congjian. I can see all the tests are Pending -- Waiting now. Just curious, in the future, should I still follow this manner (making a new branch and submit the PR), or should I make all the changes in my own "wanghy-anl:devel" branch and submit the PR from there?

I suggest you make a new branch on your fork, and keep your devel consistent with RAVEN devel.

@wanghy-anl
Copy link
Contributor Author

Thank you Congjian, I will ensure that in the future. In fact my devel branch was up-to-date when submitting this PR, but some changes were made on the official devel branch while we are waiting for the test server.

I saw a "failed" flag for "Test Ubuntu 18 PIP". Could you share the failing message so I can try replicate it on my Ubuntu 18.04 LTS machine?

@wangcj05
Copy link
Collaborator

Thank you Congjian, I will ensure that in the future. In fact my devel branch was up-to-date when submitting this PR, but some changes were made on the official devel branch while we are waiting for the test server.

I saw a "failed" flag for "Test Ubuntu 18 PIP". Could you share the failing message so I can try replicate it on my Ubuntu 18.04 LTS machine?

Let's wait. The failure is caused from our end. We have a fix and a PR is pending, since our test system just came back, It seems there is still some issue with the testing system. We are trying to fix it right now. I will keep you posted.

@wanghy-anl
Copy link
Contributor Author

Thank you Congjian, I will ensure that in the future. In fact my devel branch was up-to-date when submitting this PR, but some changes were made on the official devel branch while we are waiting for the test server.
I saw a "failed" flag for "Test Ubuntu 18 PIP". Could you share the failing message so I can try replicate it on my Ubuntu 18.04 LTS machine?

Let's wait. The failure is caused from our end. We have a fix and a PR is pending, since our test system just came back, It seems there is still some issue with the testing system. We are trying to fix it right now. I will keep you posted.

OK I got you. Thank you for the insights.

@wanghy-anl
Copy link
Contributor Author

@wangcj05 Hello Congjian, I made some tiny changes to the FARM code, and also merged the idaholab:devel branch to it. Could you re-initialize the review and tests? Thanks. Haoyu

@wangcj05
Copy link
Collaborator

@wanghy-anl FYI, there were several issues we have identified with our windows test machine. It seems they have been fixed today. I have enabled all the tests for your PR. If tests are green, I will merge your PR.

@wanghy-anl
Copy link
Contributor Author

Thanks!

@wangcj05
Copy link
Collaborator

@wanghy-anl FYI, the following test on windows failed:
image

@wangcj05
Copy link
Collaborator

here is the error message:
image

@wanghy-anl
Copy link
Contributor Author

here is the error message:
image

Hello Congjian, thank you for sharing. This “FARM_Delta_FMU” is in HERON/arc/validators/factory.py, and I plan to open a PR to submit this change to HERON after this Raven #1907 gets merged.
Could you merge this PR?
Thanks,
Haoyu

@wangcj05
Copy link
Collaborator

PR looks good. Tests passed, one plugin test failed which require HERON update. Checklist passed.

@wangcj05 wangcj05 merged commit 8f15ab9 into idaholab:devel Jul 29, 2022
@wangcj05
Copy link
Collaborator

@wanghy-anl FYI, I have merged your PR, thanks for your contribution.

@wanghy-anl
Copy link
Contributor Author

Thank you Congjian, I will submit a PR to HERON this afternoon. Best, Haoyu

@wanghy-anl wanghy-anl deleted the UpdateFarmSubmodule2022July branch July 29, 2022 16:10
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants