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

Jump to bottom

ale3d #248

Merged
merged 217 commits into from
Aug 13, 2024
Merged

ale3d #248

Show file tree
Hide file tree
Changes from 197 commits
Commits
Show all changes
217 commits
Select commit Hold shift + click to select a range
4d2fcc6
Fix versioning information, ..., prep for release
AlbertNichols3 Jan 27, 2023
b66c8f8
Fix path errors
AlbertNichols3 Jan 28, 2023
042f0df
Merge branch 'ale3d' into feature/tsuji1/spheral
ptsuji Feb 8, 2023
1073e94
Merge branch 'ale3d' into feature/dayton8/time_for_17
adayton1 Feb 8, 2023
4497540
Fixing porosity issues
AlbertNichols3 Feb 10, 2023
f963aa3
Adding the region numbers to the update of the state. Plumbing region
ptsuji Feb 13, 2023
1be4034
Add .gitignore for more windows build products
adayton1 Feb 13, 2023
a11e85b
More remove .gitignore changes associated with RAJA stack the Alan is…
AlbertNichols3 Feb 14, 2023
dab6e86
Move windows specific gitignore entries in spheral
adayton1 Feb 15, 2023
6c07bce
Merge branch 'ale3d' into feature/dayton8/update_raja_stack
adayton1 Feb 16, 2023
6bfa185
Silence iterateIdealH output if we call it with maxIterations = 1.
ptsuji Feb 17, 2023
990be6a
Merge branch 'ale3d' into feature/tsuji1/spheral
ptsuji Feb 17, 2023
a36d6f5
Merge branch 'pristine' into feature/tsuji1/spheral
ptsuji Feb 17, 2023
6829b49
Merge branch 'ale3d' into feature/dayton8/update_raja_stack
adayton1 Feb 19, 2023
fe9a725
GRAPE: merge from ale3d after conflict resolution.
adayton1 Feb 21, 2023
b7525ac
Use property page to set the language standards
adayton1 Feb 23, 2023
5e2396f
Undo uninintentional change in spheral
adayton1 Feb 24, 2023
5a001d4
Fixes for updated windows tool chain
AlbertNichols3 Mar 16, 2023
e139c39
More fixes
AlbertNichols3 Mar 21, 2023
2c1ce86
revert
AlbertNichols3 Mar 21, 2023
8717171
revert
AlbertNichols3 Mar 21, 2023
6b84001
Merge branch 'pristine' into feature/tsuji1/spheral
ptsuji Mar 30, 2023
a0f3e64
Adding back the CInterface to the list. Small change to fmt library s…
ptsuji Mar 30, 2023
313447a
Fix optimization, prepare projects for move out of src
AlbertNichols3 Mar 31, 2023
8ef7084
Update .gitignore
AlbertNichols3 Mar 31, 2023
0339131
GRAPE: merge from ale3d after conflict resolution.
adayton1 Apr 1, 2023
123f0e1
Merge branch 'ale3d' into feature/tsuji1/spheral
ptsuji Apr 3, 2023
5a24b42
Fix project files
AlbertNichols3 Apr 4, 2023
da2a1a9
Merge branch 'ale3d' into feature/tsuji1/spheral
ptsuji Apr 11, 2023
fc7e4e1
Merge branch 'pristine' into feature/tsuji1/sphgen
ptsuji May 22, 2023
b20b41e
Fixing the include directory for Polyclipper.
ptsuji May 22, 2023
67c1a97
Merge branch 'pristine' into feature/tsuji1/sphgen
ptsuji May 25, 2023
0ed36a0
Removing DbFileIO.hh from the Windows project.
ptsuji May 30, 2023
558965f
Response to Review, extra changes that were ment to be included
AlbertNichols3 May 31, 2023
dc7fe54
Merge branch 'ale3d_prod' into mergeback/benliu/v4.36.33
liu15 May 31, 2023
165db14
Add documentation
AlbertNichols3 Jul 6, 2023
fb7d936
Merge branch 'pristine' into feature/tsuji1/spheral
ptsuji Jul 6, 2023
0397e1c
It builds after adjusting CMake code.
Arlie-Capps Jul 11, 2023
d99ae71
Change CMake messages to DEBUG
Arlie-Capps Jul 11, 2023
a84b26f
Wire up CUDA and HIP; turn on CUDA for BlueOS
Arlie-Capps Jul 12, 2023
908cc96
Merge branch 'ale3d' of ssh://rzgitlab.llnl.gov:7999/ale/rzspheral in…
ptsuji Jul 14, 2023
47900ec
Removing stuff about the CInterface.
ptsuji Jul 14, 2023
2bb1854
Merge branch 'ale3d' into feature/tsuji1/spheral
ptsuji Jul 17, 2023
34df454
Several Windows build fixes; not done just yet
Arlie-Capps Jul 18, 2023
136818c
Merge branch 'ale3d' into feature/capps2/updateAxom
Arlie-Capps Jul 18, 2023
0ac0972
Remove CUDA references, other fixes
AlbertNichols3 Jul 19, 2023
fe26412
GRAPE: merge from ale3d after conflict resolution.
AlbertNichols3 Jul 20, 2023
71f8c01
Responses to review
Arlie-Capps Jul 26, 2023
6dda203
Remove blt_patch_target (it crashes the build on rzwhippet)
Arlie-Capps Jul 26, 2023
8a8b6c2
Fix name conflicts
AlbertNichols3 Jul 28, 2023
3d9c9c8
Merge branch 'ale3d' into feature/tsuji1/spheral
ptsuji Aug 3, 2023
b3b6bf9
Make Spheral C interface optional
adayton1 Aug 3, 2023
0873495
Adding the necessary DEM stuff for NodeLists.
ptsuji Aug 9, 2023
0db2652
Make ArtificalConduction and ExternalForce optional packages in Spheral
adayton1 Aug 14, 2023
65c2314
Make ArtificalConduction and ExternalForce optional packages in Spher…
adayton1 Aug 14, 2023
135a5b9
Make ArtificalConduction and ExternalForce optional packages in Spher…
adayton1 Aug 14, 2023
41c37b8
Merge branch 'ale3d' into feature/nichols/nocuda
AlbertNichols3 Aug 15, 2023
f535c5f
Make Gravity package optional
adayton1 Aug 21, 2023
2049e7d
Remove unused header and fix warnings
adayton1 Aug 21, 2023
506e19e
GRAPE: merge from ale3d after conflict resolution.
AlbertNichols3 Aug 25, 2023
736e080
Library updates and other minor fixes
AlbertNichols3 Sep 5, 2023
6e4c022
Small fix to allow for computing fragments in 2D; without this break,
ptsuji Sep 6, 2023
55cf91e
Axom and superlu_dist turned into dll's
AlbertNichols3 Sep 6, 2023
c844b7e
Merge branch 'ale3d' into feature/dayton8/modularize_spheral
adayton1 Sep 11, 2023
17baf9b
Merge branch 'ale3d' into bugfix/tsuji1/sph
ptsuji Sep 12, 2023
11e9e50
Add dll's for hypre and petsc, and get petsc to link with a serial build
AlbertNichols3 Sep 13, 2023
7596da3
Add resource files for new shared library version tags
AlbertNichols3 Sep 17, 2023
ce15bd0
Merge branch 'ale3d' into feature/nichols/tabaledll
AlbertNichols3 Sep 18, 2023
aece328
Merge branch 'ale3d' into feature/nichols/tabaledll
AlbertNichols3 Sep 19, 2023
df9bfbc
Fix dependency issues - build references even if not being used
AlbertNichols3 Sep 21, 2023
088a551
Add missing Windows build library reference
Arlie-Capps Sep 28, 2023
2385eee
Adding FSISPH as an option to the CInterface. Using some default values
ptsuji Sep 29, 2023
322961c
Resizing this array for 2D problems.
ptsuji Sep 29, 2023
e49313b
Making sumDensityNodeLists and SlideSurface objects persistent on
ptsuji Oct 4, 2023
40ff181
Fixes to get ascent to build on Windows
AlbertNichols3 Oct 5, 2023
3634877
Merge remote-tracking branch 'origin/feature/capps2/updateConduit0.8.…
AlbertNichols3 Oct 5, 2023
edf3b24
Merge branch 'ale3d' into feature/tsuji1/spheral
ptsuji Oct 5, 2023
9e701c4
Merge branch 'ale3d' into feature/capps2/updateConduit0.8.8
AlbertNichols3 Oct 6, 2023
872c794
Fix spheral, update ascent and vtkm projects
AlbertNichols3 Oct 6, 2023
ecd26f4
Merge branch 'bugfix/fix_external_polyclipper' of https://github.com/…
ptsuji Oct 11, 2023
b9ad9b4
Merge branch 'bugfix/fix_external_polyclipper' of https://github.com/…
ptsuji Oct 11, 2023
b52312a
Merge branch 'bugfix/fix_external_polyclipper' of https://github.com/…
ptsuji Oct 11, 2023
f8b675e
Merge branch 'bugfix/fix_external_polyclipper' of https://github.com/…
ptsuji Oct 12, 2023
8f0ee9b
Removing the SpheralC stuff, since we'll bring it in as a separate li…
ptsuji Oct 12, 2023
d284f78
Add appropriate project references, remove unnessessary headers
AlbertNichols3 Oct 13, 2023
61ae0ea
Merge branch 'ale3d' into feature/tsuji1/spheral
ptsuji Oct 27, 2023
b2bae6a
Merge branch 'bugfix/fix_external_polyclipper' of https://github.com/…
ptsuji Oct 27, 2023
056d575
Adding mfem to the list of axom dependencies.
ptsuji Nov 1, 2023
9f9e123
Merge branch 'bugfix/fix_external_polyclipper' of https://github.com/…
ptsuji Nov 14, 2023
3e72f54
Protecting with USE_MPI for the serial build.
ptsuji Nov 21, 2023
b32ecaa
Merge branch 'develop' into ale3d
ptsuji Nov 28, 2023
7d75e25
Merge branch 'ale3d' of ssh://rzgitlab.llnl.gov:7999/ale/rzspheral in…
ptsuji Nov 28, 2023
f7496d9
Merge branch 'develop' into ale3d
ptsuji Dec 5, 2023
69abf72
Merge branch 'develop' into ale3d
ptsuji Dec 13, 2023
e69c46f
Revert how the velocity divergence time step was calculated for RZ pr…
ptsuji Dec 13, 2023
f9b78f2
Revert how the velocity divergence time step is calculated for RZ.
ptsuji Dec 13, 2023
0fd2768
Merge branch 'ale3d_prod' into bugfix/tsuji1/class
ptsuji Dec 14, 2023
26f5d23
Merge branch 'develop' into ale3d
ptsuji Dec 18, 2023
65c6741
Moving this snippet into the USE_MPI block to avoid an unused var war…
ptsuji Dec 18, 2023
10bd8ee
Need to add this block for serial tests.
ptsuji Dec 19, 2023
aebf655
Merge branch 'develop' into ale3d
ptsuji Jan 4, 2024
a934720
Whoops, I think I missed these bits for the serial case.
ptsuji Jan 18, 2024
119e966
Merge branch 'develop' into ale3d
ptsuji Jan 18, 2024
3eb3a2b
Merge ssh://rzgitlab.llnl.gov:7999/ale/rzspheral into ale3d
ptsuji Jan 18, 2024
8b7fd1a
changes to build spheral shared on macOS
greene30 Jan 18, 2024
a85b820
Merge branch 'pristine' into feature/tsuji1/spheral
ptsuji Jan 22, 2024
f410f57
Add make_policy.hh header to the list of headers to install.
ptsuji Jan 22, 2024
dd1bcca
Merge commit '017f9e506' into ale3d
ptsuji Jan 22, 2024
545c2bb
Merge branch 'ale3d' of https://github.com/LLNL/spheral into feature/…
ptsuji Jan 22, 2024
256c4f4
Merge branch 'develop' into ale3d
ptsuji Jan 25, 2024
aa6d7e1
Merge branch 'bugfix/FSISPH-ALE3D' of https://github.com/LLNL/spheral…
ptsuji Jan 30, 2024
e326166
Fixing the summation of effViscousPressure here.
ptsuji Jan 31, 2024
525f59e
Merge branch 'ale3d' into feature/tsuji1/spheral
ptsuji Feb 6, 2024
f49b0aa
Merge https://github.com/LLNL/spheral into feature/tsuji1/spheral
ptsuji Feb 6, 2024
db730ce
Adding/removing files from the new release.
ptsuji Feb 6, 2024
273da9c
Removing more stuff that's not necessary.
ptsuji Feb 6, 2024
25be44f
Correcting the project file for the added python script instantiation.
ptsuji Feb 8, 2024
80c0ee0
Fixing a typo.
ptsuji Feb 8, 2024
ec2420c
Merge branch 'develop' into ale3d
ptsuji Feb 13, 2024
d4e95ca
Merge branch 'pristine' into feature/tsuji1/spheral
ptsuji Feb 13, 2024
fbb7cf6
Removing these extra lines.
ptsuji Feb 13, 2024
8beda0a
Merge branch 'ale3d' of https://github.com/LLNL/spheral into feature/…
ptsuji Feb 13, 2024
f688daa
Merge branch 'pristine' into feature/tsuji1/spheral
ptsuji Feb 14, 2024
c6b127c
Merge branch 'main' into ale3d
ptsuji Feb 21, 2024
4d36721
Merge branch 'develop' into ale3d
ptsuji Feb 29, 2024
ae1a2ee
Merge branch 'develop' into ale3d
ptsuji Mar 25, 2024
33b2d9a
Progress building on Windows---almost there
Arlie-Capps Mar 28, 2024
9e1485c
Adding a "mask" field to be used in computeFragmentField and other ca…
ptsuji Apr 1, 2024
b088e59
This conditional should be comparing the mask to an integer, not a do…
ptsuji Apr 1, 2024
4b1b2f1
Merge branch 'ale3d' into feature/probinso/blt_update
ptsuji Apr 3, 2024
f6e92c3
Merge branch 'develop' into ale3d
ptsuji Apr 8, 2024
3cc9206
Merge branch 'ale3d' of ssh://rzgitlab.llnl.gov:7999/ale/rzspheral in…
ptsuji Apr 8, 2024
7d1b354
Change to the python interface for computeFragmentField.
ptsuji Apr 15, 2024
aeeaecd
Modifying these cmake files.
ptsuji Apr 26, 2024
5822f5d
Fixing the PYB11 script for computeFragmentField.
ptsuji Apr 29, 2024
c2d3b03
Merge branch 'ale3d' of ssh://rzgitlab.llnl.gov:7999/ale/rzspheral in…
ptsuji May 11, 2024
e53325d
toss4 built
robinson96 May 14, 2024
c0f0c0d
Merge branch 'develop' into ale3d
ptsuji May 14, 2024
3bd393c
always instantiate lower dimensions of TableKernel in spheral
robinson96 May 14, 2024
0ef07b4
Revert "always instantiate lower dimensions of TableKernel in spheral"
robinson96 May 14, 2024
8510e98
drop unnecessary .hpp extensions.
robinson96 May 15, 2024
990f2d9
revert untested changes in Gravity package
robinson96 May 16, 2024
11aef5b
revert rest of Gravity
robinson96 May 16, 2024
9ecc63d
Remove the Windows project files, since we're the only code which use…
ptsuji May 20, 2024
c110bf9
Merge branch 'feature/probinso/update_axom' of ssh://rzgitlab.llnl.go…
ptsuji May 21, 2024
fa81d40
Move Communicator from Distributed to Utilities. Remove unnecessary i…
ptsuji May 22, 2024
b55f616
Whoops, we need this block with MPI_Allreduce since we call this func…
ptsuji May 22, 2024
6109083
Merge branch 'ale3d' into bugfix/tsuji1/loadbalance
ptsuji May 22, 2024
6f6fd2f
Merge branch 'ale3d' of https://github.com/LLNL/spheral into bugfix/t…
ptsuji May 22, 2024
fad85a7
Reinstating Windows project files after merging with standalone Spher…
ptsuji May 22, 2024
6b0ccde
Merge commit 'b55f61641c81b5cc1d8c86b1ab591e82a1c94092' of ssh://rzgi…
ptsuji May 22, 2024
ae8fe35
More changes to remove unnecessary ifdefs with USE_MPI.
ptsuji May 22, 2024
8b4bc84
Revert changes to cmake tpl files. Also fix what seems to be a bug in…
ptsuji May 22, 2024
2f7b4f6
Merge commit 'ae8fe356ca6de17a145739fab8a05498c9150cfe' of ssh://rzgi…
ptsuji May 22, 2024
b5aecee
Reverting adding the Windows build files again.
ptsuji May 22, 2024
f55a81a
enable disablement of cuda in spheral when axom is exporting cuda tar…
robinson96 May 22, 2024
c26e153
Reverting the removal of the USE_MPI ifdef here.
ptsuji May 23, 2024
250ddb7
Update to latest MS and Intel compilers
AlbertNichols3 May 31, 2024
99c7d54
Merge branch 'ale3d_prod' into mergeback/benliu/v4.38.40
liu15 May 31, 2024
f937c05
Merge branch 'ale3d' into bugfix/tsuji1/loadbalance
ptsuji May 31, 2024
4602aaa
Merge branch 'ale3d' into bugfix/tsuji1/loadbalance
ptsuji Jun 10, 2024
e8519ba
Update some project files to relax Windows target platform
Arlie-Capps Jun 11, 2024
1f705e1
Merge branch 'develop' into ale3d
ptsuji Jun 11, 2024
4c05df1
Merge branch 'ale3d' into bugfix/tsuji1/loadbalance
ptsuji Jun 12, 2024
ce6a248
Merge branch 'pristine' into bugfix/tsuji1/loadbalance
ptsuji Jun 12, 2024
fd7fc35
Merge branch 'develop' into ale3d
ptsuji Jun 28, 2024
4b91137
Merge branch 'ale3d' of https://github.com/LLNL/spheral into bugfix/t…
ptsuji Jun 28, 2024
f2c421d
Moving the Communicator class from Distributed to Utilities.
ptsuji Jun 28, 2024
3456ca7
Merge branch 'bugfix/central_mpi_calls' into ale3d
ptsuji Jul 1, 2024
fa5d78b
Missed this part of the merge.
ptsuji Jul 1, 2024
49ce96c
Merge branch 'ale3d' of https://github.com/LLNL/spheral into feature/…
ptsuji Jul 1, 2024
8935fc1
Merge tag 'v2024.06.0' of https://github.com/LLNL/spheral into featur…
ptsuji Jul 1, 2024
076f29d
Reverting the directory includes to Distributed/Communicator.hh.
ptsuji Jul 2, 2024
19153f6
Removing Windows project files.
ptsuji Jul 2, 2024
3dc32e1
Simplifying the changes to the cmake stuff here.
ptsuji Jul 2, 2024
4a9728c
Simplifying the cmake stuff here.
ptsuji Jul 2, 2024
e9468f2
Merge branch 'bugfix/central_mpi_calls' into ale3d
ptsuji Jul 8, 2024
c2b6a12
Reverting some changes which appear even after merging with Landon's …
ptsuji Jul 8, 2024
cbc4788
Resolving more diffs.
ptsuji Jul 8, 2024
7a40cfc
Merge branch 'ale3d' of https://github.com/LLNL/spheral into feature/…
ptsuji Jul 8, 2024
7f7f5ba
Reinstating Windows project files.
ptsuji Jul 8, 2024
455d815
Updating the project files for file location changes.
ptsuji Jul 9, 2024
604df6b
Merge branch 'bugfix/central_mpi_calls' into ale3d
ptsuji Jul 9, 2024
8337fe4
Merge branch 'ale3d' of https://github.com/LLNL/spheral into feature/…
ptsuji Jul 9, 2024
fea8f8d
Fix for hanging allReduce call. We need this logic because generateCy…
ptsuji Jul 9, 2024
5c5b8c8
Merge branch 'bugfix/central_mpi_calls' into ale3d
ptsuji Jul 9, 2024
02df7c5
Merge branch 'ale3d' of https://github.com/LLNL/spheral into feature/…
ptsuji Jul 9, 2024
d7f3bc9
Merge branch 'pristine' into feature/tsuji1/spheral
ptsuji Jul 10, 2024
00c6d93
Merge branch 'pristine' into feature/tsuji1/spheral
ptsuji Jul 11, 2024
f688e46
Merge branch 'main' into ale3d
ptsuji Jul 12, 2024
bb2307a
Adding a function to handle the shared library extension.
ptsuji Jul 15, 2024
c668e6d
Merge branch 'develop' into ale3d
ptsuji Jul 15, 2024
34d963b
Adding a function to handle the shared library extension.
ptsuji Jul 15, 2024
0a0c378
Merge branch 'develop' into ale3d
ptsuji Jul 18, 2024
c77f1c0
Merge branch 'bugfix/central_mpi_calls' into ale3d
ptsuji Jul 18, 2024
ede62ea
Merge branch 'bugfix/central_mpi_calls' into ale3d
ptsuji Jul 19, 2024
c891932
Merge branch 'ale3d' of https://github.com/LLNL/spheral into feature/…
ptsuji Jul 19, 2024
5d146fe
Merge branch 'develop' into ale3d
ptsuji Jul 19, 2024
f9e53f1
Reverting this, somehow it got missed in the merges.
ptsuji Jul 19, 2024
1b27c30
Merge branch 'develop' into ale3d
ptsuji Jul 23, 2024
005dbe4
Fixing some comments. Moving the include to InstallTPLs.cmake.
ptsuji Jul 23, 2024
223a275
Reinstating these.
ptsuji Jul 23, 2024
513e4f2
Making this function replace .so and .dylib extensions with .a for EN…
ptsuji Jul 24, 2024
5dde80f
Merge branch 'ale3d' of https://github.com/LLNL/spheral into feature/…
ptsuji Jul 24, 2024
1399ed0
Small edits to the comments here. Really just trying to trigger the g…
ptsuji Jul 29, 2024
2d670a9
Merge branch 'bugfix/export_chai' into ale3d
ptsuji Jul 29, 2024
37ea4f8
Merge branch 'ale3d' of https://github.com/LLNL/spheral into feature/…
ptsuji Jul 30, 2024
ae85b16
Merge branch 'develop' into ale3d
ptsuji Jul 30, 2024
00090ce
Remove this comment.
ptsuji Jul 31, 2024
d93897f
Removing most of the changes to create the "mask" field, we only need
ptsuji Aug 9, 2024
3f325d7
Merge branch 'develop' into ale3d
ptsuji Aug 9, 2024
db33d37
Merge branch 'feature/tsuji1/spheral' of ssh://rzgitlab.llnl.gov:7999…
ptsuji Aug 9, 2024
cc65f0d
Ugh, have to re-delete the Windows project files after merging since …
ptsuji Aug 9, 2024
affa3ce
Forgot to revert these changes in PYB11.
ptsuji Aug 9, 2024
a4bec1d
Fix for axisymmetric velocity gradient time step constraint.
ptsuji Aug 12, 2024
720d9de
Merge branch 'feature/tsuji1/spheral' of ssh://rzgitlab.llnl.gov:7999…
ptsuji Aug 12, 2024
c691472
Comment in RELEASE_NOTES about the time step fix.
ptsuji Aug 12, 2024
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
5 changes: 2 additions & 3 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,5 @@ src/PBGWraps/SpheralModules_WildMagic.C
build-*
src/*/*cc.2.cc
src/*/*cc.3.cc
/build/*/x64
/build/*/*.user
*.aps
src/*/*/*cc.2.cc
src/*/*/*cc.3.cc
455 changes: 0 additions & 455 deletions build/spheral_ArtificialViscosity/spheral_ArtificialViscosity.vcxproj
View file
Open in desktop
ptsuji marked this conversation as resolved.
Outdated Show resolved Hide resolved

This file was deleted.

101 changes: 0 additions & 101 deletions build/spheral_ArtificialViscosity/spheral_ArtificialViscosity.vcxproj.filters
View file
Open in desktop

This file was deleted.

Loading