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

Logical Model #1232

Merged
merged 21 commits into from
May 28, 2020
Merged

Logical Model #1232

merged 21 commits into from
May 28, 2020

Conversation

wangcj05
Copy link
Collaborator

@wangcj05 wangcj05 commented May 6, 2020


Pull Request Description

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

Close #1202

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

Added LOGICAL MODEL CLASS

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.

@wangcj05 wangcj05 changed the title WIP: Logical Model Logical Model May 7, 2020
@moosebuild
Copy link

Job Test Fedora 28 on 51ef98b : invalidated by @wangcj05

python environment issue

@wangcj05 wangcj05 requested review from alfoa and mandd May 12, 2020 23:08
@wangcj05
Copy link
Collaborator Author

@mandd @alfoa Please take a look at this PR regarding the LogicalModel Implementation.

@wangcj05 wangcj05 added RAVENv2.1 All tasks and defects that will go in RAVEN v2.1 Ready To Review labels May 13, 2020
@alfoa
Copy link
Collaborator

alfoa commented May 13, 2020

Can you update issue #1225? I know it is tedious but we did not implement an automatic system yet.

@moosebuild
Copy link

Job Mingw Test on f4b8567 : invalidated by @wangcj05

fetch issue

@wangcj05
Copy link
Collaborator Author

Can you update issue #1225? I know it is tedious but we did not implement an automatic system yet.

Updated.

doc/user_manual/logical_model.tex Outdated Show resolved Hide resolved
doc/user_manual/logical_model.tex Outdated Show resolved Hide resolved
doc/user_manual/logical_model.tex Outdated Show resolved Hide resolved
<Steps>
<MultiRun name="logicalModelCode">
<Input class="Files" type="">gen.one</Input>
<Input class="Files" type="">gen.two</Input>
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

how do we understand which input goes where? If I use codes that require the same input extension (e.g. *.i) how do I know which input goes to which code?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Are you fine if I work on this issue in another pull request? Since the changes will also affect EnsembleModel and CodeInterface Entities. It may take longer and further discussion on the solution for this issue.

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes. Please, reference a new issue about this.
Thank you.

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Issue #1240 is created.

framework/Models/HybridModels/LogicalModel.py Show resolved Hide resolved
tests/framework/hybridModel/multiple/control.py Outdated Show resolved Hide resolved
tests/framework/hybridModel/test_logical_code.xml Outdated Show resolved Hide resolved
tests/framework/hybridModel/test_logical_model.xml Outdated Show resolved Hide resolved
tests/framework/hybridModel/test_logical_rom.xml Outdated Show resolved Hide resolved
@alfoa
Copy link
Collaborator

alfoa commented May 14, 2020

Sorry some "comments" are repeated but are just "place holders:

@wangcj05
Copy link
Collaborator Author

@alfoa I have addressed all your comments except how to handle files for codes.
Are you fine if I work on this issue in another pull request? Since the changes will also affect EnsembleModel and CodeInterface Entities. It may take longer and further discussion on the solution for this issue.

@alfoa
Copy link
Collaborator

alfoa commented May 20, 2020

when the test pass, we can merge this

@wangcj05
Copy link
Collaborator Author

A new issue is created to standardize the way to handle inputs for codes. #1240 @alfoa

@moosebuild
Copy link

All jobs on 17a8ae9 : invalidated by @wangcj05

fetch issue on Linux machines

@moosebuild
Copy link

Job Mingw Test on 17a8ae9 : invalidated by @wangcj05

fetch issue

@moosebuild
Copy link

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

restarted civet

@wangcj05
Copy link
Collaborator Author

@alfoa Could you merge this PR? All tests have passed now.

@alfoa alfoa mentioned this pull request May 28, 2020
10 tasks
@alfoa
Copy link
Collaborator

alfoa commented May 28, 2020

Checklist passed...

Merging...

@alfoa alfoa merged commit 8849fe3 into devel May 28, 2020
@alfoa alfoa deleted the wangc/hybrid_ext branch May 28, 2020 19:39
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
RAVENv2.1 All tasks and defects that will go in RAVEN v2.1 Ready To Review
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[TASK] Restructure HybridModel class
3 participants