Skip to content

Update operator infrastructure and change use statements for CMA operators (for #1738)#1740

Merged
arporter merged 22 commits intomasterfrom
update_operators
Jun 9, 2022
Merged

Update operator infrastructure and change use statements for CMA operators (for #1738)#1740
arporter merged 22 commits intomasterfrom
update_operators

Conversation

@TeranIvy
Copy link
Collaborator

@TeranIvy TeranIvy commented Jun 1, 2022

  • Updates CMA operator data (columnwise_matrix) to r_solver in test kernels and examples.
  • Updates operator and CMA operator infrastructure and separates them.
  • Removes the use of operator_mod for CMA operator and operator proxy types and adds the use of columnwise_operator_mod.

@TeranIvy TeranIvy added enhancement in progress LFRic Issue relates to the LFRic domain labels Jun 1, 2022
@TeranIvy TeranIvy self-assigned this Jun 1, 2022
@codecov
Copy link

codecov bot commented Jun 1, 2022

Codecov Report

Merging #1740 (52d35b4) into master (d3edc0d) will increase coverage by 0.00%.
The diff coverage is 100.00%.

@@           Coverage Diff           @@
##           master    #1740   +/-   ##
=======================================
  Coverage   99.38%   99.38%           
=======================================
  Files         250      250           
  Lines       37854    37858    +4     
=======================================
+ Hits        37623    37627    +4     
  Misses        231      231           
Impacted Files Coverage Δ
src/psyclone/domain/lfric/lfric_constants.py 100.00% <ø> (ø)
src/psyclone/tests/lfric_build.py 86.20% <ø> (ø)
src/psyclone/tests/dynamo0p3_cma_test.py 100.00% <100.00%> (ø)
src/psyclone/tests/dynamo0p3_test.py 99.83% <100.00%> (ø)

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update d3edc0d...52d35b4. Read the comment docs.

Copy link
Member

@arporter arporter left a comment

Choose a reason for hiding this comment

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

Great job Iva, I only have one small request.
All examples, tests and tutorials are OK with compilation.
Updated UG builds fine.
Does this branch work OK with LFRic?

@arporter
Copy link
Member

arporter commented Jun 9, 2022

Assuming the CI is green, is this ready for review again @TeranIvy?

@TeranIvy
Copy link
Collaborator Author

TeranIvy commented Jun 9, 2022

I am just testing this with LFRic, @arporter, so I will return it as soon as the test suite is done.

@TeranIvy
Copy link
Collaborator Author

TeranIvy commented Jun 9, 2022

I built the PSyclone test environment from this branch on Spice and Crays XC40 and XCS. I then ran an LFRic test branch that has all the changes for PSyclone 2.3.0 implemented (see LFRic ticket 3288, comment 6). The developer test suites were all fine.

This PR ready to go so I am returning it to @arporter for another look.

Copy link
Member

@arporter arporter left a comment

Choose a reason for hiding this comment

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

All requested changes have been made.
Tests and examples are still OK with compilation.
Proceeding to merge.

@arporter arporter merged commit 73d8ec3 into master Jun 9, 2022
@arporter arporter deleted the update_operators branch June 9, 2022 13:22
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

enhancement LFRic Issue relates to the LFRic domain ready to be merged

Projects

None yet

Development

Successfully merging this pull request may close these issues.

[LFRic] Update operator infrastructure and change use statements for CMA operators

2 participants