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.

Sign up for GitHub

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

Feature/sina/hdf5 output support #1480

Open
wants to merge 46 commits into
base: develop
Choose a base branch
from
Open

Feature/sina/hdf5 output support #1480

Show file tree
Hide file tree
Changes from 42 commits
Commits
Show all changes
46 commits
Select commit Hold shift + click to select a range
3f09c5e
created a clean new branch from Gabriel's work to push to github repo
doutriaux1 Dec 19, 2024
e0cd5bf
Comments Implemented
gwaegner Dec 19, 2024
d2f38ac
More Comments
gwaegner Dec 19, 2024
6c32398
Fix?
gwaegner Dec 19, 2024
31242a6
Fix??
gwaegner Dec 19, 2024
aa9073d
Final Fix
gwaegner Dec 19, 2024
b553c44
Axom Changes
gwaegner Dec 20, 2024
c5c0cb4
Brian's Changes, Wait to hear back on createFromNode
gwaegner Jan 8, 2025
8dd8a84
Merge branch 'develop' into sina_hdf5_implementation
doutriaux1 Jan 9, 2025
8e6afc1
Create From Node Changes
gwaegner Jan 24, 2025
247591f
Forgot to delete some leftover comments
gwaegner Jan 24, 2025
703dbd1
Small fix
gwaegner Jan 24, 2025
e1d7631
Merge remote-tracking branch 'llnl/develop' into sina_hdf5_implementa…
doutriaux1 Jan 25, 2025
0df65b3
merged github's develop in
doutriaux1 Jan 25, 2025
e118d24
Pipeline Fix
gwaegner Jan 27, 2025
0f5851e
Clang Format
gwaegner Jan 28, 2025
1168000
More ClangFormat
gwaegner Jan 28, 2025
429d9ce
bringing sumbodule back to develop version
doutriaux1 Feb 3, 2025
b71b05d
New Changes + Guarding
gwaegner Feb 4, 2025
0b689db
Merge remote-tracking branch 'llnl/feature/sina/hdf5_output_support' …
doutriaux1 Feb 4, 2025
ccfa513
bringing in submodule updates
doutriaux1 Feb 4, 2025
c05979d
Build Fix
gwaegner Feb 4, 2025
7c5d7cc
Documentation Update
gwaegner Feb 6, 2025
d036b67
Merge branch 'develop' into feature/sina/hdf5_output_support
doutriaux1 Feb 10, 2025
79f3729
Fixes submodule pointers
kennyweiss Feb 18, 2025
f92080d
Merge branch 'develop' into feature/sina/hdf5_output_support
kennyweiss Feb 18, 2025
4310ee1
Fixes includes in sina
kennyweiss Feb 19, 2025
0fd3a35
Guards usage of sina::Protocol::HDF5
kennyweiss Feb 19, 2025
1145c29
Guarding and Fortran tests
gwaegner Feb 22, 2025
4043d3e
Merge branch 'develop' into feature/sina/hdf5_output_support
doutriaux1 Feb 24, 2025
3ccfbb3
submodule fix?
doutriaux1 Feb 24, 2025
9429b60
more submodule fix
doutriaux1 Feb 24, 2025
45ee75b
Fix Fortran Test
gwaegner Feb 24, 2025
0f016bb
CMakeLists Fix
gwaegner Feb 24, 2025
4a2cf7e
Minor Fix
gwaegner Feb 24, 2025
2499896
Another minor change
gwaegner Feb 25, 2025
209ee7d
Maybe this change?
gwaegner Feb 25, 2025
35bf45b
Syntax fixes
gwaegner Feb 26, 2025
64e5026
Test Update
gwaegner Feb 26, 2025
a0341da
Syntax Fix
gwaegner Feb 26, 2025
baf2492
Test Pipeline for Not HDF5
gwaegner Feb 27, 2025
3e03355
Reset
gwaegner Feb 28, 2025
8370a21
New Changes
gwaegner Mar 7, 2025
50f17e1
Minor Fix
gwaegner Mar 11, 2025
6160d87
Merge branch 'develop' into feature/sina/hdf5_output_support
gwaegner Mar 11, 2025
fb3554d
Merge branch 'develop' into feature/sina/hdf5_output_support
gwaegner Mar 11, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 9 additions & 2 deletions src/axom/sina/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,10 +50,17 @@ blt_list_append( TO sina_headers ELEMENTS core/AdiakWriter.hpp IF AXOM_USE_ADIAK
blt_list_append( TO sina_sources ELEMENTS core/AdiakWriter.cpp IF AXOM_USE_ADIAK )

# Add fortran interface for Sina
if(AXOM_USE_HDF5 AND ENABLE_FORTRAN)
set(AXOM_USE_HDF5_FORTRAN ".true.")
else()
set(AXOM_USE_HDF5_FORTRAN ".false.")
endif()
Comment on lines +56 to +60
Copy link
Member

Choose a reason for hiding this comment

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

As an aside, exposing the enum values will be a lot cleaner w/ shroud

Copy link
Author

Choose a reason for hiding this comment

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

@kennyweiss yes at some point we should convert to shroud as a separate PR. But it's kind of "if it's ain't broken why fix it?" at the moment 😉


if (ENABLE_FORTRAN)
blt_list_append( TO sina_headers ELEMENTS interface/sina_fortran_interface.h)
blt_list_append( TO sina_sources
ELEMENTS interface/sina_fortran_interface.cpp interface/sina_fortran_interface.f)
ELEMENTS interface/sina_fortran_interface.cpp interface/sina_fortran_interface.f.in)
Copy link
Member

Choose a reason for hiding this comment

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

I don't think we want to include the template file interface/sina_fortran_interface.f.in,

Copy link

Choose a reason for hiding this comment

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

Updated to remove .f.in's inclusion

configure_file(interface/sina_fortran_interface.f.in interface/sina_fortran_interface.f @ONLY)
Copy link
Member

Choose a reason for hiding this comment

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

We'll likely also need to install the generated file interface/sina_fortran_interface.f

Copy link

Choose a reason for hiding this comment

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

.f file is now explicitly installed.

endif()

#------------------------------------------------------------------------------
Expand Down Expand Up @@ -87,4 +94,4 @@ endif()

if(AXOM_ENABLE_EXAMPLES)
add_subdirectory(examples)
endif()
endif()
Loading