Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
148 commits
Select commit Hold shift + click to select a range
f808d59
Olivier's changes from develop. Also updated LPT class to include ene…
Nov 7, 2022
6aed7db
Shock-particle example case
Nov 7, 2022
ecbfe62
Some updates to Makefiles
Nov 7, 2022
23fd21b
Example MAST cases from Olivier's develop branch
jessecaps Nov 7, 2022
714298c
Update to MAST
jessecaps Nov 7, 2022
c334b71
Particle mod
jessecaps Nov 7, 2022
d72f61d
Fixed Tenneti correlation
jessecaps Nov 7, 2022
adaf88f
Update to MAST
jessecaps Nov 7, 2022
09a1e4f
Added HIT from new_linsol branch
jessecaps Nov 18, 2022
c7e8178
Update lpt_class.f90
jessecaps Nov 29, 2022
d9b56f6
Update lpt_class.f90
jessecaps Nov 30, 2022
b674f28
Update simulation.f90
jessecaps Nov 30, 2022
c6d27d3
Fluidized Bed Initialization With Grid Problems
rgrawe Dec 5, 2022
2126f7a
Merge branch 'jcaps' of https://github.com/jessecaps/NGA2 into jcaps
rgrawe Dec 5, 2022
a769c4e
Merge pull request #1 from rgrawe/develop
jessecaps Dec 5, 2022
a311987
Delete .#lpt_class.f90
jessecaps Dec 5, 2022
7305337
Update lpt_class.f90
jessecaps Dec 7, 2022
be802f8
fbed input
jessecaps Dec 7, 2022
55eeef5
Update .gitignore
jessecaps Dec 7, 2022
c2aebbf
Updates to fluidized bed
jessecaps Dec 7, 2022
ab391b2
Output part vector to EnSight
jessecaps Dec 7, 2022
8f9a8cf
New diagonal solver class
jessecaps Dec 9, 2022
6016beb
fixed bad tab character
johnpwakefield Dec 9, 2022
b0a321e
diag solver updates
jessecaps Dec 10, 2022
677da16
New LPT capabilities
jessecaps Dec 17, 2022
dc0922e
LPT updates
jessecaps Dec 17, 2022
6260927
Update simulation.f90
jessecaps Dec 17, 2022
bb645e1
Update lpt_class.f90
jessecaps Dec 17, 2022
248792c
new LPT CFL
jessecaps Dec 17, 2022
4849175
LPT updates
jessecaps Dec 18, 2022
9180874
Update lowmach_class.f90
jessecaps Dec 20, 2022
cf9d4a1
More LPT changes
jessecaps Dec 20, 2022
4cf4506
Remove print statement
jessecaps Dec 20, 2022
e3d440f
Fluidize bed works!
jessecaps Dec 21, 2022
d6d3e64
New direct forcing IBM solver
jessecaps Dec 23, 2022
563b1d0
direct forcing update
jessecaps Dec 23, 2022
bdba18b
Update mathtools.f90
jessecaps Dec 23, 2022
ea4b12b
Update df_class.f90
jessecaps Dec 23, 2022
620e9f7
Update df_class.f90
jessecaps Dec 25, 2022
9d3b0be
IBM update
jessecaps Dec 25, 2022
ab9668a
LPT and DF update
jessecaps Dec 26, 2022
f626d04
added error message for bad write; exposed additional method
johnpwakefield Dec 29, 2022
3218987
exposed additional method until issue can be debugged
johnpwakefield Dec 29, 2022
90577ff
Update simulation.f90
jessecaps Dec 29, 2022
953e7de
first draft of muscl solver
johnpwakefield Dec 29, 2022
057fa6c
Update df_class.f90
jessecaps Dec 30, 2022
5705bd5
Rename variable
jessecaps Dec 31, 2022
55478fd
Simple IB pipe case
jessecaps Dec 31, 2022
c4645da
Add fluctuations to pipe
jessecaps Dec 31, 2022
85bd226
ib_pipe updates
jessecaps Dec 31, 2022
12523eb
Update README
jessecaps Jan 1, 2023
0328a00
Part_inject makefil
jessecaps Jan 2, 2023
b78a1f3
Update GNUmakefile
jessecaps Jan 2, 2023
042b250
Update simulation.f90
jessecaps Jan 3, 2023
4b3f51c
Update simulation.f90
jessecaps Jan 3, 2023
65dd294
Update simulation.f90
jessecaps Jan 3, 2023
319148b
Update lpt_class.f90
jessecaps Jan 4, 2023
2f95259
LPT implicit filter now works and doesn't print warnings
jessecaps Jan 4, 2023
cd0cbd4
Update lpt_class.f90
jessecaps Jan 4, 2023
5780cd5
LPT updates
jessecaps Jan 4, 2023
7a2b63e
Delete matm_class.f90
jessecaps Jan 5, 2023
644f8b8
Updates to SGS
jessecaps Jan 5, 2023
ced0d79
Update lowmach_class.f90
jessecaps Jan 6, 2023
4a52436
channel case
jessecaps Jan 7, 2023
9ec1db7
Channel update
jessecaps Jan 7, 2023
0616fb5
Create GNUmakefile
jessecaps Jan 8, 2023
19cc1c1
Delete matm_class.f90
jessecaps Jan 8, 2023
42c6afb
Port new LPT routines to Master
jessecaps Jan 8, 2023
b533e73
Simple IB pipe case
jessecaps Jan 8, 2023
ec6fad5
Channel case added
jessecaps Jan 8, 2023
4d62407
Direct forcing solver added
jessecaps Jan 8, 2023
8e5df3b
Update sgsmodel_class.f90
jessecaps Jan 8, 2023
0e80a30
Part inject
jessecaps Jan 8, 2023
49fc8e8
Update simulation.f90
jessecaps Jan 9, 2023
aad15ec
Merge branch 'master' into develop
jessecaps Jan 10, 2023
8420943
Update diag_class.f90
jessecaps Jan 13, 2023
2224e25
Remove case
jessecaps Jan 14, 2023
1ea6e4d
make localization interface public in iterator_class.f90
johnpwakefield Jan 19, 2023
d816cfc
fixed boundary conditions
johnpwakefield Jan 19, 2023
dfcdc78
advection and detonation test cases with and without periodic boundaries
johnpwakefield Jan 19, 2023
c51814e
fixed periodic bcs
johnpwakefield Jan 20, 2023
60c0861
updated test cases
johnpwakefield Jan 20, 2023
83f05aa
added sod case
johnpwakefield Jan 21, 2023
04509fc
fixed bad comment
johnpwakefield Jan 23, 2023
c8761db
Update lpt_class.f90
jessecaps Jan 24, 2023
30c26b7
current (not working) p3dfft class; same error as library example whe…
johnpwakefield Jan 25, 2023
b0d6e7b
fixed ref_stencil for non-root processes
johnpwakefield Jan 25, 2023
53a06cf
fixed processor-local indices in fourier space
johnpwakefield Jan 25, 2023
8a3d5a9
New riser case
jessecaps Jan 25, 2023
092cee5
Merge branch 'develop' of https://github.com/desjardi/NGA2 into develop
jessecaps Jan 25, 2023
dd5fb99
Update lowmach_class.f90
jessecaps Jan 25, 2023
f805f3d
Resolve issues from previous merge
jessecaps Jan 25, 2023
30016ba
Merge branch 'p3dfft' into develop
jessecaps Jan 26, 2023
90ca7e4
Remove old example case
jessecaps Jan 26, 2023
82f803f
Update incomp_class.f90
jessecaps Jan 26, 2023
0a0a86e
fixing merge issues
jessecaps Jan 26, 2023
3060d19
Update Make.p3dfft
jessecaps Jan 26, 2023
0dc01ce
Update Make.p3dfft
jessecaps Jan 26, 2023
475fade
fixed off by one error
johnpwakefield Jan 27, 2023
5781f18
added Poisson equation with point sources test case for p3dfft solver
johnpwakefield Jan 27, 2023
3afc9c9
Update to pipe cases
jessecaps Jan 27, 2023
ccae70d
fixed scaling
johnpwakefield Jan 28, 2023
766c357
Update lpt_class.f90
jessecaps Jan 28, 2023
a8f65c1
Merge branch 'p3dfft' into develop
jessecaps Jan 30, 2023
3b1639b
p3dfft merge
jessecaps Jan 30, 2023
e9773ce
Update pfft3d_class.f90
jessecaps Jan 31, 2023
73720a6
Update pfft3d_class.f90
jessecaps Jan 31, 2023
1247ef2
Merge branch 'develop' of https://github.com/desjardi/NGA2 into develop
jessecaps Feb 1, 2023
0750caf
Fix conflicts with merge
jessecaps Feb 1, 2023
2d5aba0
Update poissontest
jessecaps Feb 1, 2023
ec09e9f
Update pfft3d_class.f90
jessecaps Feb 1, 2023
917ece4
Update pfft3d_class.f90
jessecaps Feb 1, 2023
2aa1478
Particle-laden pipe flow is working
jessecaps Feb 2, 2023
5842d2e
Update pfft3d_class.f90
jessecaps Feb 2, 2023
ef24ad8
Update pfft3d_class.f90
jessecaps Feb 2, 2023
7aefa45
Update geometry.f90
jessecaps Feb 2, 2023
3278fd0
Update geometry.f90
jessecaps Feb 3, 2023
9e56801
Merge branch 'develop' of https://github.com/desjardi/NGA2 into develop
jessecaps Feb 3, 2023
b7dbc2b
P3DFFT allows for general decomposition
jessecaps Feb 4, 2023
5c4d232
Update simulation.f90
jessecaps Feb 4, 2023
be5f1f9
In-house P3DFFT
jessecaps Feb 7, 2023
cac0ade
nothing important
jessecaps Feb 7, 2023
ee68f90
IB collision + linsol integration
jessecaps Feb 7, 2023
5b56d8f
LPT updates
jessecaps Feb 8, 2023
3be151f
Update GNUmakefile
jessecaps Feb 8, 2023
8461ee6
remove p3dfft decomp
jessecaps Feb 8, 2023
9d83c8e
Squashed commit of the following:
jessecaps Feb 8, 2023
9217d19
Sync w/ Olivier
jessecaps Feb 8, 2023
9a4ccf4
Riser case
jessecaps Feb 8, 2023
2b6e5f7
Riser update
jessecaps Feb 9, 2023
aae1e0b
moved several definitions to a hyperbolic_general.f90 module in prepa…
johnpwakefield Feb 9, 2023
78c63e6
added reflection bc test
johnpwakefield Feb 9, 2023
6996865
Merge branch 'develop' of github.com:johnpwakefield/NGA2 into develop
johnpwakefield Feb 9, 2023
bf28b38
Merge branch 'develop' into muscl
johnpwakefield Feb 9, 2023
2762043
extensive style cleanup in preparation of merging with upstream
johnpwakefield Feb 9, 2023
1cef485
reverted to upstream makefile in HIT case
johnpwakefield Feb 9, 2023
a3bbdc5
fixed issues with monitor files
johnpwakefield Feb 9, 2023
b522515
MUSCL (#5)
johnpwakefield Feb 9, 2023
7e71780
Update pgrid_class.f90
jessecaps Feb 9, 2023
5bb6c65
Update sgsmodel_class.f90
jessecaps Feb 9, 2023
d9dfdb9
added rusanov scheme
johnpwakefield Feb 9, 2023
66dcb74
fixed issues with monitor files
johnpwakefield Feb 9, 2023
a1efa41
fixed number of ghost cells to one for Rusanov
johnpwakefield Feb 9, 2023
c0eb31d
added Rusanov advection test case
johnpwakefield Feb 9, 2023
70252d5
Update sgsmodel_class.f90
jessecaps Feb 9, 2023
03159b4
Merge branch 'jessecaps:develop' into develop
johnpwakefield Feb 9, 2023
cd9e65e
Merge branch 'muscl' into rusanov
johnpwakefield Feb 9, 2023
1bd264e
fixed conflicts with upstream branch
johnpwakefield Feb 9, 2023
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: 1 addition & 4 deletions examples/MAST_drop/GNUmakefile
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,7 @@ include $(Upack)
INCLUDE_LOCATIONS += $(Ulocs)
VPATH_LOCATIONS += $(Ulocs)

# Define external libraries - this can also be in .profile
HYPRE_DIR = /Users/mbk225/NGA_libs/hypre
LAPACK_DIR= /Users/mbk225/NGA_libs/lapack
IRL_DIR = /Users/mbk225/NGA_libs/interfacereconstructionlibrary/install/Release
# External libraries are defined in .profile/.bashrc/.zshrc, but could be defined here as well

# NGA compilation definitions
include $(NGA_HOME)/tools/GNUMake/Make.defs
Expand Down
50 changes: 50 additions & 0 deletions examples/advection/GNUmakefile
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
# NGA location if not yet defined
NGA_HOME ?= ../..

# Compilation parameters
PRECISION = DOUBLE
USE_MPI = TRUE
USE_FFTW = FALSE
USE_HYPRE = FALSE
USE_LAPACK = TRUE
PROFILE = FALSE
DEBUG = TRUE
COMP = gnu
EXEBASE = nga

# Directories that contain user-defined code
Udirs := src

# Include user-defined sources
Upack += $(foreach dir, $(Udirs), $(wildcard $(dir)/Make.package))
Ulocs += $(foreach dir, $(Udirs), $(wildcard $(dir)))
include $(Upack)
INCLUDE_LOCATIONS += $(Ulocs)
VPATH_LOCATIONS += $(Ulocs)

# Define external libraries - this can also be in .profile
HDF5_DIR = /opt/hdf5
HYPRE_DIR = /opt/hypre
LAPACK_DIR = /opt/lapack-3.10.1
FFTW_DIR = /opt/fftw-3.3.10

# NGA compilation definitions
include $(NGA_HOME)/tools/GNUMake/Make.defs

# Include NGA base code
Bdirs := particles core hyperbolic data solver config grid libraries
Bpack += $(foreach dir, $(Bdirs), $(NGA_HOME)/src/$(dir)/Make.package)
include $(Bpack)

# Inform user of Make.packages used
ifdef Ulocs
$(info Taking user code from: $(Ulocs))
endif
$(info Taking base code from: $(Bdirs))

# Target definition
all: $(executable)
@echo COMPILATION SUCCESSFUL

# NGA compilation rules
include $(NGA_HOME)/tools/GNUMake/Make.rules
2 changes: 2 additions & 0 deletions examples/advection/README
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
standard advection test case advecting different shapes over a periodic domain
to evaluate accuracy and diffusion
24 changes: 24 additions & 0 deletions examples/advection/input
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
# Parallelization
Partition : 2 1 1

# Mesh definition
Lx : 1.0
nx : 128
Ly : 1.0
ny : 128
Lz : 1.0
nz : 1
Periodic : true

# Initialization
Shapes : c

# Direction
Advection direction : 1 1 0

# Time integration
Max cfl number : 0.5

# Ensight output
Ensight output period : 0.01

80 changes: 80 additions & 0 deletions examples/advection/src/geometry.f90
Original file line number Diff line number Diff line change
@@ -0,0 +1,80 @@
!> Various definitions and tools for initializing NGA2 config
module geometry
use config_class, only: config
use precision, only: WP
implicit none
private

!> Single config
type(config), public :: cfg

public :: geometry_init

contains

!> Initialization of problem geometry
subroutine geometry_init
use sgrid_class, only: sgrid
use param, only: param_read
implicit none
type(sgrid) :: grid

! Create a grid from input params
create_grid: block
use sgrid_class, only: cartesian
logical :: periodic
integer :: i, j, k, nx, ny, nz
real(WP) :: Lx, Ly, Lz
real(WP), dimension(:), allocatable :: x, y, z

! read in grid definition
call param_read('Lx', Lx)
call param_read('nx', nx)
call param_read('Ly', Ly)
call param_read('ny', ny)
call param_read('Lz', Lz)
call param_read('nz', nz)
call param_read('Periodic', periodic)

! allocate
allocate(x(nx+1), y(ny+1), z(nz+1))

! create simple rectilinear grid
do i = 1, nx+1
x(i) = real(i-1,WP) / real(nx, WP) * Lx
end do
do j = 1, ny+1
y(j) = real(j-1,WP) / real(ny, WP) * Ly
end do
do k = 1, nz+1
z(k) = real(k-1,WP) / real(nz, WP) * Lz
end do

! generate serial grid object
grid=sgrid(coord=cartesian, no=2, x=x, y=x, z=x, xper=periodic, &
& yper=periodic, zper=periodic)

end block create_grid

! create a config from that grid on our entire group
create_cfg: block
use parallel, only: group
integer, dimension(3) :: partition

! read in partition
call param_read('Partition', partition, short='p')

! create partitioned grid
cfg = config(grp=group, decomp=partition, grid=grid)

end block create_cfg

! Create masks for this config
create_walls: block
cfg%VF=1.0_WP
end block create_walls

end subroutine geometry_init

end module geometry

Loading