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

Add Cardinal to FENIX #53

Merged
merged 28 commits into from
Aug 29, 2024
Merged

Add Cardinal to FENIX #53

merged 28 commits into from
Aug 29, 2024

Conversation

cticenhour
Copy link
Member

@cticenhour cticenhour commented Jul 5, 2024

Closes #38

@meltawila As discussed earlier, please build this version of FENIX and run it against your Cardinal inputs from #30 (and any other inputs you are working on, as you like). Please also add any comments you have on build instructions and usage issues to this thread so that they can be addressed as part of the review process. Thanks!

Requesting @simopier for the formal review once this test run is complete and any comments from that test are fully addressed.

@cticenhour cticenhour self-assigned this Jul 5, 2024
@cticenhour
Copy link
Member Author

Note that some changes to the FENIX recipes need to occur before this can be merged. I am working on a recipe PR that I will get reviewed and merged next week.

@cticenhour
Copy link
Member Author

All - also happy to take feedback on the script configuration currently used here. An alternative is doing everything in the Makefile, which should remove at least one step from the process as currently outlined, and require fewer recipe changes.

@meltawila
Copy link
Collaborator

Thank you Casey! I was able to follow your instructions and install FENIX with Cardinal enabled. I ran Cardinal test suite as well and got 384 passed, 254 skipped, 0 pending, 6 FAILED. The failed tests are probably out of the scope of this PR (i.e. one of them uses THM which we're not including here). otherwise it looks great to me!

Copy link
Collaborator

@simopier simopier left a comment

Choose a reason for hiding this comment

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

Looks good to me. Thank you @cticenhour for adding this!
I'll re-review after the new FENIX recipe is added.

doc/content/getting_started/installation.md Show resolved Hide resolved
doc/content/getting_started/installation.md Outdated Show resolved Hide resolved
@simopier simopier marked this pull request as draft July 6, 2024 16:38
@simopier
Copy link
Collaborator

simopier commented Jul 6, 2024

Converting as draft until we get the new recipe merged.

@simopier
Copy link
Collaborator

simopier commented Jul 6, 2024

I think it would be nice to get @loganharbour's review as well.

@cticenhour
Copy link
Member Author

The failed tests are probably out of the scope of this PR (i.e. one of them uses THM which we're not including here).

@meltawila Could also be related to our MOOSE submodule being ahead of Cardinal's; that would be my guess with only a few tests failing.

Thanks for checking with your workflow!

@cticenhour
Copy link
Member Author

cticenhour commented Jul 6, 2024

With the most-recent documentation commit, a small adjustment to TMAP8 is now required. idaholab/TMAP8#153 is pending review and merge.

Copy link
Collaborator

@simopier simopier left a comment

Choose a reason for hiding this comment

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

Just a couple questions.

doc/config.yml Outdated Show resolved Hide resolved
doc/config.yml Show resolved Hide resolved
doc/sqa_fenix.yml Show resolved Hide resolved
@cticenhour
Copy link
Member Author

Based on a discussion today with @loganharbour, I think I will adjust this script slightly and the FENIX Makefile in order to facilitate the running of the script as part of the normal make command. This would bring the build process back to something more in-line with a "normal" MOOSE application and ease potential build complications for users.

@cticenhour
Copy link
Member Author

One last adjustment to MOOSE was required, which has now been merged. Once that makes it to the MOOSE submodule, I think we'll be ready to go.

@moosebuild
Copy link
Contributor

All jobs on d887e3b : invalidated by @GiudGiud

post-submodule update

@GiudGiud
Copy link
Collaborator

I think the desired submodule update was not done yet

@moosebuild
Copy link
Contributor

All jobs on d887e3b : invalidated by @simopier

submodule update

Copy link
Collaborator

@simopier simopier left a comment

Choose a reason for hiding this comment

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

Just a small documentation fix given the latest update.

doc/content/getting_started/installation.md Outdated Show resolved Hide resolved
@cticenhour
Copy link
Member Author

cticenhour commented Aug 22, 2024

@meltawila good call - the HPC instructions need to be updated a bit. EDIT: Actually, we do include common directions between files. They are updated automatically with these changes.

However, I don't think we need to add the update and rebuild instructions. They should be provided with the latest moose-dev module. Has this not been your experience?

@moosebuild
Copy link
Contributor

Job Precheck on 7b654de wanted to post the following:

Your code requires style changes.

A patch was auto generated and copied here
You can directly apply the patch by running, in the top level of your repository:

curl -s https://mooseframework.inl.gov/fenix/docs/PRs/53/clang_format/style.patch | git apply -v

Alternatively, with your repository up to date and in the top level of your repository:

git clang-format dfac9c018af808cd6681cc0097d231578182b28b

@cticenhour cticenhour force-pushed the add_cardinal branch 2 times, most recently from c41ae36 to c10bb9a Compare August 27, 2024 16:27
Makefile Outdated Show resolved Hide resolved
Default for Cardinal is changed to 'yes' instead of 'no'
Leni-Yeo pushed a commit to Leni-Yeo/moose that referenced this pull request Aug 28, 2024
Copy link
Collaborator

@simopier simopier left a comment

Choose a reason for hiding this comment

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

Some small questions and a minor request for a documentation update to explain how to not build FENIX with Cardinal.

Makefile Show resolved Hide resolved
config/check_deps.mk Show resolved Hide resolved
config/check_deps.mk Outdated Show resolved Hide resolved
unit/Makefile Show resolved Hide resolved
doc/content/getting_started/installation.md Show resolved Hide resolved
doc/content/getting_started/installation.md Show resolved Hide resolved
cticenhour and others added 3 commits August 28, 2024 08:48
Co-authored-by: Pierre-Clement Simon <[email protected]>
This is also reflected in the HPC instructions. Finally, improve spacing for warning message when Cardinal is disabled.
Copy link
Collaborator

@simopier simopier left a comment

Choose a reason for hiding this comment

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

One last thing

doc/content/getting_started/installation.md Show resolved Hide resolved
Co-authored-by: Pierre-Clement Simon <[email protected]>
Copy link
Collaborator

@simopier simopier left a comment

Choose a reason for hiding this comment

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

Looks great to me, and this is a great contribution! Thank you @cticenhour!!

@simopier
Copy link
Collaborator

@loganharbour, do you want to give this a another review before we merge it?

Copy link
Member

@loganharbour loganharbour left a comment

Choose a reason for hiding this comment

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

Looks good to me. We just need a no optional recipe

@cticenhour
Copy link
Member Author

cticenhour commented Aug 29, 2024

@loganharbour I had already updated the follow-on recipe PR to include it if you want to do it there, or I can pull it out separately.

EDIT: We're doing it separately, idaholab/civet_recipes#1874

Copy link
Member

@loganharbour loganharbour left a comment

Choose a reason for hiding this comment

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

Let's do it

@cticenhour cticenhour merged commit d5de85f into idaholab:devel Aug 29, 2024
10 checks passed
@cticenhour cticenhour deleted the add_cardinal branch August 29, 2024 15:51
cticenhour added a commit to cticenhour/fenix that referenced this pull request Aug 29, 2024
Refs idaholab#52

This aligns with the status of Cardinal, which was also made optional in idaholab#53
@cticenhour cticenhour mentioned this pull request Aug 29, 2024
cticenhour added a commit to cticenhour/fenix that referenced this pull request Aug 29, 2024
Refs idaholab#52

This aligns with the status of Cardinal, which was also made optional in idaholab#53
cticenhour added a commit to cticenhour/fenix that referenced this pull request Aug 29, 2024
Refs idaholab#52

This aligns with the status of Cardinal, which was also made optional in idaholab#53
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.

Add Cardinal to FENIX
6 participants