Skip to content

Adds the multimat component to Axom#565

Merged
kennyweiss merged 127 commits intodevelopfrom
feature/kweiss/multimat-revamp
Jun 21, 2022
Merged

Adds the multimat component to Axom#565
kennyweiss merged 127 commits intodevelopfrom
feature/kweiss/multimat-revamp

Conversation

@kennyweiss
Copy link
Member

@kennyweiss kennyweiss commented May 22, 2021 •
edited
Loading

Summary

  • This PR adds a new component to Axom: Multmat
  • Multimat helps manage multimaterial field data
  • The vast majority of multimat was developed by @raineyeh over Summer 2018 in collaboration with @kennyweiss and @agcapps
  • I rebased the code on top of our current develop branch
TODO:

@kennyweiss kennyweiss added Slam Issues related to Axom's 'slam' component multimat Related to the Multimat component labels May 22, 2021
@kennyweiss
Copy link
Member Author

kennyweiss commented May 22, 2021

Note: I rebased this to develop starting from the following branch: feature/weiss27/multimat-rebase:
https://github.com/LLNL/axom/tree/feature/weiss27/multimat-rebase

@kennyweiss kennyweiss force-pushed the feature/kweiss/multimat-revamp branch from d6e3800 to c643a70 Compare June 19, 2021 02:41
@kennyweiss kennyweiss force-pushed the feature/kweiss/multimat-revamp branch from 30f0eb6 to c0c3a74 Compare July 24, 2021 00:44
@kennyweiss
Copy link
Member Author

kennyweiss commented Jul 24, 2021

I merged in the changes from @raineyeh (thanks Raine!), fixed the last remaining compiler errors and warnings and rebased against develop.

This branch is now ready for review.

raineyeh added 21 commits October 27, 2021 12:55
@raineyeh @kennyweiss
Adding host config file for Tangelo.
52e3714
@raineyeh @kennyweiss
Initial implementation for the multi-material class and some example …
c0ad72e 
…codes.
@raineyeh @kennyweiss
Redo MultiMat array so one can access everything with an non-template…
14b2546 
…d MultiMatArray class.
@raineyeh @kennyweiss
Added most access patterns from both Array class (templated and non-t…
1b7306b 
…emplated)
@raineyeh @kennyweiss
Add a little bit of code for using different data layout for MultiMat…
e742ee5 
… class.
@raineyeh @kennyweiss
Replace MultimatArray with slam maps and sets
75979c2
@raineyeh @kennyweiss
Incorporate BivariateSet and BivariateMap in the process of developin…
8358eff 
…g dense MultiMat field
@raineyeh @kennyweiss
add dense set-up in MultiMat example
68effa3
@raineyeh @kennyweiss
Added layout conversion with limited type support
ab58ac9
@raineyeh @kennyweiss
Adding back example of index set
80fdf4a 
Misc: fix BivariateMap->getSubset elements
@raineyeh @kennyweiss
Incorporate SubmapIterator so submap iterators can do iter.value() an…
7ebb3ea 
…d iter.index()

Misc: fix some warnings and compilation errors from lc compiler
@raineyeh @kennyweiss
change enum naming
dc88045
@raineyeh @kennyweiss
Added some basic MultiMat tests
49aab5d
@raineyeh @kennyweiss
MultiMat tests for combination of configurations (without converting)
100aaea 
Misc: small compilation fix
@raineyeh @kennyweiss
fix TinyHydro cout<< compilation error with Map
1363538
@raineyeh @kennyweiss
Added striding to MultiMat class
2d851be
@raineyeh @kennyweiss
Update after modifying slam's *Map function names and renaming Subset…
4db1823 
…Map to Submap.

Also: Fixes for compilation error/warnings on LC machine
@raineyeh @kennyweiss
Add functions specifically for adding and retriving volume fraction f…
1ce6b9f 
…ields
@raineyeh @kennyweiss
Change function name in MultiMat. Added documentations for Map and Ma…
74ca1b4 
…pBase.
@raineyeh @kennyweiss
Fix multimat example.
57ea1e4 
Deals with rename of slam's RelationSet (subset returned by relation operator[]) to RelationSubset
@raineyeh @kennyweiss
Fix multimat test bugs
10058ba
agcapps
agcapps reviewed Jun 20, 2022
View reviewed changes
agcapps
agcapps reviewed Jun 20, 2022
View reviewed changes
agcapps
agcapps reviewed Jun 20, 2022
View reviewed changes
agcapps
agcapps reviewed Jun 20, 2022
View reviewed changes
agcapps
agcapps reviewed Jun 20, 2022
View reviewed changes
agcapps
agcapps reviewed Jun 20, 2022
View reviewed changes
agcapps
agcapps reviewed Jun 20, 2022
View reviewed changes
src/axom/multimat/multimat.hpp
Comment on lines +494 to +495
std::vector<SetPosType> m_cellMatRel_beginsVec;
std::vector<SetPosType> m_cellMatRel_indicesVec;
Copy link
Member

@agcapps agcapps Jun 20, 2022

Choose a reason for hiding this comment

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

Still to be SLAM-ified?

Copy link
Member

@rhornung67 rhornung67 Jun 20, 2022

Choose a reason for hiding this comment

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

SLAM-ed? SLAM-erated?

Copy link
Contributor

@publixsubfan publixsubfan Jun 21, 2022

Choose a reason for hiding this comment

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

SLAM is designed not to own any data - these are probably the backing std::vectors for our relations.

agcapps
agcapps reviewed Jun 20, 2022
View reviewed changes
src/axom/multimat/multimat.hpp
Comment on lines +499 to +500
std::vector<SetPosType> m_matCellRel_beginsVec;
std::vector<SetPosType> m_matCellRel_indicesVec;
Copy link
Member

@agcapps agcapps Jun 20, 2022

Choose a reason for hiding this comment

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

Still to be converted to SLAM?

agcapps
agcapps reviewed Jun 20, 2022
View reviewed changes
src/axom/multimat/multimat.hpp
Comment on lines +513 to +518
std::vector<std::string> m_fieldNameVec;
std::vector<FieldMapping> m_fieldMappingVec;
std::vector<MapBaseType*> m_mapVec;
std::vector<DataTypeSupported> m_dataTypeVec;
std::vector<DataLayout> m_fieldDataLayoutVec;
std::vector<SparsityLayout> m_fieldSparsityLayoutVec;
Copy link
Member

@agcapps agcapps Jun 20, 2022

Choose a reason for hiding this comment

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

Convert, or not?

agcapps
agcapps reviewed Jun 20, 2022
View reviewed changes
src/axom/multimat/multimat.hpp
};

//Layout used during the static mode
std::vector<Layout> m_layout_when_static; //per field
Copy link
Member

@agcapps agcapps Jun 20, 2022

Choose a reason for hiding this comment

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

Convert?

@agcapps
Copy link
Member

agcapps commented Jun 20, 2022

@kanye-quest , @kennyweiss , I expect to approve this tomorrow early. I do have a few comments that I'd like addressed, most of which have to do with the Doxygen and/or obvious typos. I flagged a few uses of std::vector, not for this PR. If they should be converted to SLAM, that should go in a subsequent PR.

agcapps
agcapps reviewed Jun 21, 2022
View reviewed changes
agcapps
agcapps reviewed Jun 21, 2022
View reviewed changes
agcapps
agcapps reviewed Jun 21, 2022
View reviewed changes
agcapps
agcapps reviewed Jun 21, 2022
View reviewed changes
agcapps
agcapps reviewed Jun 21, 2022
View reviewed changes
agcapps
agcapps reviewed Jun 21, 2022
View reviewed changes
agcapps
agcapps approved these changes Jun 21, 2022
View reviewed changes
Copy link
Member

@agcapps agcapps left a comment

Choose a reason for hiding this comment

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

I found a few incautious uses of getFieldIdx that I'd like you to test before using return value. Please search for any other unguarded use of that function. Approved, pending those return value fixes and the documentation fixes I proposed.

@kennyweiss kennyweiss merged commit 87125b1 into develop Jun 21, 2022
@kennyweiss kennyweiss deleted the feature/kweiss/multimat-revamp branch June 21, 2022 23:16
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@publixsubfan publixsubfan publixsubfan approved these changes

@white238 white238 Awaiting requested review from white238

@rhornung67 rhornung67 Awaiting requested review from rhornung67

+1 more reviewer

@agcapps agcapps agcapps approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

multimat Related to the Multimat component Reviewed Slam Issues related to Axom's 'slam' component

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

5 participants

@kennyweiss @agcapps @rhornung67 @publixsubfan @raineyeh