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 issame functions for boxarray and distromap. Add "hdf5" to dep.py #4172

Closed
wants to merge 146 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
146 commits
Select commit Hold shift + click to select a range
f8a83e8
First commit
dunhamsj Sep 10, 2021
9a0e3f0
Sync with development
dunhamsj Nov 10, 2021
f394619
Sync with development
dunhamsj Nov 11, 2021
48d02ae
Added stubs for 3d
dunhamsj Nov 11, 2021
d3c9d21
Merge branch 'development' into MeshRefinement_DG
dunhamsj Nov 29, 2021
0b45dd2
Merge branch 'development' into MeshRefinement_DG
dunhamsj Dec 1, 2021
48f350f
Merge remote-tracking branch 'upstream/development' into MeshRefineme…
dunhamsj Jan 11, 2022
701c6ff
Merge branch 'MeshRefinement_DG' of github.com:dunhamsj/amrex into Me…
dunhamsj Jan 12, 2022
65aab24
Merge remote-tracking branch 'upstream/development' into MeshRefineme…
dunhamsj Jan 14, 2022
b9e8147
Merge remote-tracking branch 'upstream/development' into MeshRefineme…
dunhamsj Jan 20, 2022
98f0e0d
Merge remote-tracking branch 'upstream/development' into MeshRefineme…
dunhamsj Jan 25, 2022
01e3d94
Implemented CrseInit_DG
dunhamsj Jan 26, 2022
678fc1e
First implementation of FineAdd and reflux (1D).
dunhamsj Feb 12, 2022
9980a31
Merge branch 'development' into MeshRefinement_DG
dunhamsj Feb 12, 2022
53ad26b
Added stubs for 2D and 3D and removed some unused variables
dunhamsj Feb 13, 2022
137953c
ignore unused variables in multi-d stubs
dunhamsj Feb 13, 2022
9d5c154
Added thornado directory
dunhamsj Feb 19, 2022
e28e39d
Progress on reflux function
dunhamsj Feb 19, 2022
268803f
Merge remote-tracking branch 'upstream/development' into MeshRefineme…
dunhamsj Feb 19, 2022
56a2388
bugfix: order of variables in multi-D reflux
dunhamsj Feb 19, 2022
58f8ffb
style: removed tabs
dunhamsj Feb 19, 2022
9d50443
Wrapped couts in AMREX_USE_GPU pragma
dunhamsj Feb 19, 2022
7bf632f
Implementing AMReX_thornado.H
dunhamsj Feb 19, 2022
48c4189
Added FinalizeMeshRefinement_Thornado Fortran interface
dunhamsj Feb 19, 2022
22a50b2
removed debug statement
dunhamsj Feb 28, 2022
25ef547
Misc. changes
dunhamsj Feb 28, 2022
bdb213e
Added AMReX_thornado.H to MultiFabUtils_3D
dunhamsj Feb 28, 2022
5d6ff08
Added variables to thornado interface
dunhamsj Mar 1, 2022
2d71ca6
Updated CrseInit to use thornado variables from amrex
dunhamsj Mar 1, 2022
33878e7
Updated FineAdd to use thornado-amrex variables
dunhamsj Mar 1, 2022
0a1e6d0
Added CMakeLists.txt and modified Make.package
dunhamsj Mar 1, 2022
823ec1a
Added thornado to CMakeLists.txt
dunhamsj Mar 1, 2022
c4d0297
Fixes to 3D
dunhamsj Mar 1, 2022
a659de8
Explicitly convert float to int
dunhamsj Mar 2, 2022
392a0f4
Change if if to if else if
dunhamsj Mar 2, 2022
3331171
Removed shadowed variables
dunhamsj Mar 2, 2022
c33500e
Added thornado to GNUmakefile.in
dunhamsj Mar 2, 2022
2fa1519
Merge remote-tracking branch 'upstream/development' into MeshRefineme…
dunhamsj Mar 2, 2022
b757535
Changed thornado to DG
dunhamsj Mar 2, 2022
33eb405
Initialized some variables
dunhamsj Mar 2, 2022
1b2de71
Made interface names all lowercase
dunhamsj Mar 2, 2022
0b1edda
Ported flux register to use amrex variables
dunhamsj Mar 3, 2022
fddebe3
Fixed unused variables bug
dunhamsj Mar 3, 2022
33d031a
Initialized some variables
dunhamsj Mar 3, 2022
4a753d7
Added DG to Plotfile GNUmakefile
dunhamsj Mar 3, 2022
8bb8250
Added DG to HDF5Benchmark GNUmakefile
dunhamsj Mar 3, 2022
71f3a5e
Merge branch 'development' into MeshRefinement_DG
dunhamsj Mar 11, 2022
4dfcb90
bugfix: Loop bounds for CrseInit_DG
dunhamsj Mar 13, 2022
aa0506a
Aesthetic changes
dunhamsj Mar 13, 2022
e2c00d2
Added fineadd_dg and reflux_dg for 2D
dunhamsj Mar 13, 2022
a41d5b2
bugfix: iCrse -> iCrseF
dunhamsj Mar 13, 2022
e241edf
Merge branch 'development' into MeshRefinement_DG
dunhamsj Mar 13, 2022
26914b2
Allow 3D average down
dunhamsj Mar 13, 2022
e8b5f8e
bugfix: commented out #endif
dunhamsj Mar 13, 2022
6feb18c
Aesthetic changes and added 3D tools
dunhamsj Mar 13, 2022
e87b3c4
feature add: incorporated metric
dunhamsj Mar 17, 2022
8046d80
Merge remote-tracking branch 'upstream/development' into MeshRefineme…
dunhamsj Mar 17, 2022
988f9e2
Merge branch 'development' into MeshRefinement_DG
dunhamsj Mar 28, 2022
841be0b
Merge branch 'development' into MeshRefinement_DG
dunhamsj Apr 1, 2022
420ca19
Merge branch 'development' into MeshRefinement_DG
dunhamsj Apr 4, 2022
b27991b
feature add: copied arrays to device
dunhamsj Apr 5, 2022
f56fca3
Merge branch 'development' into MeshRefinement_DG
dunhamsj Apr 11, 2022
7f26684
bugfix: hopefully things work on accelerators now
dunhamsj Apr 12, 2022
436963a
uncommented gpu region
dunhamsj Apr 12, 2022
d8df197
Merge branch 'development' into MeshRefinement_DG
dunhamsj Apr 13, 2022
83fda29
Merge branch 'development' into MeshRefinement_DG
dunhamsj Apr 20, 2022
e16196e
put gpu stuff in separate file
dunhamsj Apr 21, 2022
6a61b12
change dginterp to 10
dunhamsj Apr 27, 2022
6b9ce51
sync with development
dunhamsj Apr 27, 2022
8ab1ea1
added documentation for inclusion of metric
dunhamsj Jun 14, 2022
66f59f3
allow for t_new - t_old == 0.0
dunhamsj Jun 14, 2022
6981c0f
Merge branch 'development' into MeshRefinement_DG
dunhamsj Jun 14, 2022
905d6a1
Merge remote-tracking branch 'origin/development' into MeshRefinement_DG
dunhamsj Jul 14, 2022
100dffd
Merge branch 'development' into MeshRefinement_DG
dunhamsj Aug 19, 2022
676714f
bugfix: allocated wrong size to LX_X#_Up(Dn)
dunhamsj Aug 26, 2022
5d4d8cc
Merge branch 'development' into MeshRefinement_DG
dunhamsj Aug 26, 2022
73a07cc
Merge remote-tracking branch 'upstream/development' into MeshRefineme…
dunhamsj Sep 6, 2022
40c1ad9
merging
dunhamsj Sep 28, 2022
ebb4bf8
Merge branch 'development' into MeshRefinement_DG
dunhamsj Oct 5, 2022
e5ccfbd
sync with development
dunhamsj Jan 10, 2023
1da0ded
Merge branch 'development' into MeshRefinement_DG
dunhamsj Jan 24, 2023
4a98405
Merge remote-tracking branch 'upstream/development' into MeshRefineme…
dunhamsj Feb 21, 2023
ee012f3
changed pow to std::pow
dunhamsj Feb 21, 2023
43f2dad
Merge remote-tracking branch 'upstream/development' into MeshRefineme…
dunhamsj Mar 15, 2023
1074169
Merge remote-tracking branch 'origin/development' into MeshRefinement_DG
dunhamsj Apr 3, 2023
c06c595
Merge remote-tracking branch 'upstream/development' into MeshRefineme…
dunhamsj Apr 14, 2023
b132bec
Merge remote-tracking branch 'upstream/development' into MeshRefineme…
dunhamsj May 24, 2023
bf4d6ea
updated CMakeLists for DG directory
dunhamsj May 26, 2023
33edef7
updated CMakeLists for DG directory (take 2)
dunhamsj May 26, 2023
c50a012
updating to c++20 standards
dunhamsj May 26, 2023
f7928dc
make function declaration parameter names same as function definition…
dunhamsj May 26, 2023
e8e91b2
changed name in function declaration
dunhamsj May 26, 2023
884f37c
removed most yml and updating to c++20
dunhamsj May 26, 2023
5edaa67
updates
dunhamsj May 26, 2023
741372f
NULL -> nullptr
dunhamsj May 26, 2023
3b10adc
removed destructors from DGInterp
dunhamsj May 26, 2023
2fedf7f
made some args constant
dunhamsj May 26, 2023
0d2a372
removed const from iGF_SqrtGm in function declaration
dunhamsj May 26, 2023
b3e8c52
restored all yml files
dunhamsj May 26, 2023
25bb372
Merge remote-tracking branch 'upstream/development' into MeshRefineme…
dunhamsj Jul 13, 2023
deefba9
add private clause to OMP PARALLEL in CrseInit_DG
dunhamsj Jul 20, 2023
e903d45
Merge remote-tracking branch 'upstream/development' into MeshRefineme…
dunhamsj Jul 20, 2023
0cb0984
sync and remove most yml files
dunhamsj Aug 16, 2023
49eb3c8
added debugging line
dunhamsj Aug 17, 2023
5fa54ec
lifted FaceRatio to function argument to FineAdd_DG
dunhamsj Aug 17, 2023
440dbe5
lifted variables to reflux_dg to function arguments
dunhamsj Aug 19, 2023
bfda41d
bugfix: was using wrong indices for LX_XX arrays
dunhamsj Aug 20, 2023
c62fb85
lifted variables from average_down_dg to function arguments
dunhamsj Aug 20, 2023
594f48b
send in DG variables as arguments to interp_Xd
dunhamsj Aug 23, 2023
21ff490
send in Array4 instead of pointers
dunhamsj Aug 24, 2023
6d3ddf7
Merge remote-tracking branch 'upstream/development' into MeshRefineme…
dunhamsj Aug 24, 2023
e2abdf9
ymll to yml
dunhamsj Aug 24, 2023
2b99ee9
Added issame routines for box arrays and distro maps. Needed for Pose…
jrober50 Aug 28, 2023
bbb6315
bugfix: send in dX in code units
dunhamsj Sep 3, 2023
cf44cbe
removed trailing whitespace
dunhamsj Sep 3, 2023
82994d5
added DG to EB/Make.package
dunhamsj Sep 3, 2023
8c4ea1e
sync with development
dunhamsj Sep 20, 2023
1bc94e3
Merge remote-tracking branch 'refs/remotes/origin/MeshRefinement_DG' …
dunhamsj Sep 20, 2023
6e2a95b
Merge remote-tracking branch 'upstream/development' into MeshRefineme…
dunhamsj Nov 27, 2023
bf9e968
added cg interpolation routine (1D, averagedown only)
dunhamsj Dec 3, 2023
7e96b51
Merge remote-tracking branch 'upstream/development' into MeshRefineme…
dunhamsj Dec 3, 2023
388bc90
Merge remote-tracking branch 'upstream/development' into MeshRefineme…
dunhamsj Dec 8, 2023
2ec5376
big update with amr
dunhamsj Dec 9, 2023
0b7309c
implemented new code in other dimensions
dunhamsj Dec 9, 2023
9a81a47
attempt to hide virtual functions
dunhamsj Dec 9, 2023
d1e3c59
removed semicolon
dunhamsj Dec 9, 2023
d48339e
fix naming error
dunhamsj Dec 9, 2023
aec44dc
removed const keyword
dunhamsj Dec 9, 2023
0cc87d8
removed DG module
dunhamsj Dec 9, 2023
627c8ea
removed DG directory from CMakeList
dunhamsj Dec 9, 2023
cd6a6dc
removed more references to DG package
dunhamsj Dec 9, 2023
b6c30a3
removing still more references to DG
dunhamsj Dec 9, 2023
6732e74
restored all github runners
dunhamsj Dec 9, 2023
908fd8c
paricular => particular
dunhamsj Dec 9, 2023
8eb5d03
commented out amrex_avgdown_cg
dunhamsj Dec 10, 2023
ade1b74
Merge remote-tracking branch 'upstream/development' into MeshRefineme…
dunhamsj Dec 31, 2023
6348722
added hdf5 to IGNORES
dunhamsj Feb 7, 2024
f69d59e
Merge remote-tracking branch 'upstream/development' into MeshRefineme…
dunhamsj Feb 7, 2024
164edc7
sync
dunhamsj Jun 18, 2024
ff5e2ef
bugfix
dunhamsj Jun 18, 2024
50233d8
sync with upstream
dunhamsj Sep 29, 2024
ffd68b5
merge with development
dunhamsj Sep 29, 2024
87eab2a
restore issame functions
dunhamsj Sep 29, 2024
57ea033
tweaks to issame functions
dunhamsj Sep 29, 2024
4ccc80c
add hdf5 to dep.py
dunhamsj Sep 29, 2024
9594f74
more tweaks to issame functions
dunhamsj Sep 29, 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: 5 additions & 0 deletions Src/F_Interfaces/Base/AMReX_boxarray_fi.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -86,4 +86,9 @@ extern "C" {
Box bx(IntVect(lo), IntVect(hi), ba->ixType());
return ba->intersects(bx);
}

bool amrex_fi_boxarray_issame (const BoxArray& baa, const BoxArray& bab)
{
return baa == bab;
}
}
16 changes: 15 additions & 1 deletion Src/F_Interfaces/Base/AMReX_boxarray_mod.F90
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,8 @@ module amrex_boxarray_module

private

public :: amrex_boxarray_build, amrex_boxarray_destroy, amrex_print
public :: amrex_boxarray_build, amrex_boxarray_destroy, amrex_print, &
amrex_boxarray_issame

type, public :: amrex_boxarray
logical :: owner = .false.
Expand Down Expand Up @@ -128,6 +129,12 @@ pure integer function amrex_fi_boxarray_intersects_box (ba, lo, hi) bind(c)
type(c_ptr), value, intent(in) :: ba
integer, intent(in) :: lo(*), hi(*)
end function amrex_fi_boxarray_intersects_box

pure logical function amrex_fi_boxarray_issame (baa, bab) bind(c)
import
implicit none
type(c_ptr), value, intent(in) :: baa, bab
end function amrex_fi_boxarray_issame
end interface

contains
Expand Down Expand Up @@ -258,4 +265,11 @@ pure function amrex_boxarray_intersects_box (this, bx) result(r)
r = ir .ne. 0
end function amrex_boxarray_intersects_box

pure function amrex_boxarray_issame(baa, bab) result(r)
class(amrex_boxarray), intent(in) :: baa
class(amrex_boxarray), intent(in) :: bab
logical :: r
r = amrex_fi_boxarray_issame(baa%p, bab%p)
end function amrex_boxarray_issame

end module amrex_boxarray_module
5 changes: 5 additions & 0 deletions Src/F_Interfaces/Base/AMReX_distromap_fi.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -41,4 +41,9 @@ extern "C" {
{
AllPrint() << *dm;
}

bool amrex_fi_distromap_issame (const DistributionMapping& dma, const DistributionMapping& dmb)
{
return dma == dmb;
}
}
15 changes: 14 additions & 1 deletion Src/F_Interfaces/Base/AMReX_distromap_mod.F90
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,8 @@ module amrex_distromap_module

private

public :: amrex_distromap_build, amrex_distromap_destroy, amrex_print
public :: amrex_distromap_build, amrex_distromap_destroy, amrex_print, &
amrex_distromap_issame

type, public :: amrex_distromap
logical :: owner = .false.
Expand Down Expand Up @@ -89,6 +90,12 @@ subroutine amrex_fi_print_distromap (dm) bind(c)
implicit none
type(c_ptr), value :: dm
end subroutine amrex_fi_print_distromap

pure logical function amrex_fi_distromap_issame (dma, dmb) bind(c)
import
implicit none
type(c_ptr), value :: dma, dmb
end function amrex_fi_distromap_issame
end interface

contains
Expand Down Expand Up @@ -158,4 +165,10 @@ subroutine amrex_distromap_print (dm)
call amrex_fi_print_distromap(dm%p)
end subroutine amrex_distromap_print

pure function amrex_distromap_issame (dma, dmb) result(r)
type(amrex_distromap), intent(in) :: dma, dmb
logical :: r
r = amrex_fi_distromap_issame(dma%p, dmb%p)
end function amrex_distromap_issame

end module amrex_distromap_module
2 changes: 1 addition & 1 deletion Tools/F_scripts/dep.py
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
import preprocess

# modules to ignore in the dependencies
IGNORES = ["iso_c_binding", "iso_fortran_env", "omp_lib", "mpi", "cudafor", "openacc", "hdf"]
IGNORES = ["iso_c_binding", "iso_fortran_env", "omp_lib", "mpi", "cudafor", "openacc", "hdf", "hdf5"]

# regular expression for "{}module{}name", where {} can be any number
# of spaces. We use 4 groups here, denoted by (), so the name of the
Expand Down