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

Front #2

Open
wants to merge 71 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
71 commits
Select commit Hold shift + click to select a range
d829d21
Update README.md
johnryantaylor Jul 28, 2016
5af2b30
Added case for surface boundary layer
johnryantaylor Jul 28, 2016
3f7c37a
updated to include thermal wind
johnryantaylor Jul 29, 2016
0ec6c69
Added case for thermal wind at front
johnryantaylor Jul 29, 2016
5553e9b
Added thermal wind advection and sponge layers
johnryantaylor Jul 29, 2016
d403338
corrected lower Neumann BC
johnryantaylor Jul 29, 2016
4d06355
Fixed bug in calculation of |S|
johnryantaylor Aug 1, 2016
64f45f2
Updated les to fix Neumann BCs
johnryantaylor Aug 2, 2016
1140bc8
Removed temporary lines
johnryantaylor Aug 2, 2016
3d05620
Now allow only some scalars to be restarted
johnryantaylor Aug 2, 2016
c9eee9f
Added the SGS cross terms back
johnryantaylor Aug 3, 2016
f337b03
Fixed bug in calculating CFL number for rotating flow
johnryantaylor Aug 3, 2016
f98d058
Fixed calculation of nk_th
johnryantaylor Aug 4, 2016
2eaf3eb
Fixed bug in ReadHDF5
johnryantaylor Aug 9, 2016
cad9316
Update README.md
johnryantaylor Jul 28, 2016
62ca157
Added case for surface boundary layer
johnryantaylor Jul 28, 2016
2c6bddd
updated to include thermal wind
johnryantaylor Jul 29, 2016
07cf343
Added case for thermal wind at front
johnryantaylor Jul 29, 2016
4c5fe42
Resolving conflict with user_rhs
johnryantaylor Jun 20, 2017
cdd7f8d
Resolved conflict
johnryantaylor Jun 20, 2017
81fde97
Fixed bug in calculating CFL number for rotating flow
johnryantaylor Aug 3, 2016
dba3273
Resolved conflict in readmean.m
johnryantaylor Jun 20, 2017
99e04ee
Added another index to output time
johnryantaylor Jun 22, 2017
d6536d1
Changed user_rhs to add sponge layer for TF2010 case
johnryantaylor Jun 22, 2017
ba711a2
Added input files for T+F2010 test case
johnryantaylor Jun 22, 2017
29c34dd
Merge branch 'front' of https://github.com/johnryantaylor/DIABLO into…
johnryantaylor Jun 22, 2017
341b26d
Update README.md
johnryantaylor Jul 28, 2016
04449e7
Added case for surface boundary layer
johnryantaylor Jul 28, 2016
1d88ed8
updated to include thermal wind
johnryantaylor Jul 29, 2016
ad45f14
Added case for thermal wind at front
johnryantaylor Jul 29, 2016
42d034c
Added changes to branch front in user_rhs after rebase
johnryantaylor Nov 1, 2017
6813086
fixed conflict in les.f
johnryantaylor Nov 1, 2017
8aca6a6
Fixed LES conflict
johnryantaylor Nov 1, 2017
3d818ac
Added the SGS cross terms back
johnryantaylor Aug 3, 2016
aaf119b
Fixed bug in calculating CFL number for rotating flow
johnryantaylor Aug 3, 2016
60dda58
fixed conflict
johnryantaylor Nov 1, 2017
314035b
fixed conflict
johnryantaylor Nov 1, 2017
34f8d48
fixed commit
johnryantaylor Nov 1, 2017
c82c576
fixed conflict
johnryantaylor Nov 1, 2017
389cead
fixed conflict
johnryantaylor Nov 1, 2017
4616025
Added input files for T+F2010 test case
johnryantaylor Jun 22, 2017
8591477
Merge branch 'front' of https://github.com/johnryantaylor/DIABLO into…
johnryantaylor Nov 1, 2017
4975f82
fixed spurious lines left over from rebase
johnryantaylor Nov 1, 2017
87dc42b
updated on pontus
johnryantaylor Nov 2, 2017
fb64505
Fixed bug in writing wv to hdf5
johnryantaylor Nov 27, 2017
2309c71
Fixed a bug in the calculation of epsilon
johnryantaylor Jul 10, 2018
ab2d8c7
Merge branch 'master' into front
johnryantaylor Jul 10, 2018
57340ea
minor changes to channel.f
johnryantaylor Jul 10, 2018
900e0e5
Fixed bug in tkebudget
johnryantaylor Jul 19, 2018
3e5467f
constant subgrid-scale Prandtl number
johnryantaylor Nov 2, 2018
09a2bbe
removed spurious FFT call after les_chan
johnryantaylor Mar 6, 2019
09fae55
Removed comments used for de-bugging
johnryantaylor Mar 6, 2019
ae7c9de
Merge branch 'front' of https://github.com/johnryantaylor/DIABLO into…
johnryantaylor Mar 6, 2019
b8aa886
Fixes a number of issues contributing to mpi striping -- both diagnos…
wienkers Jul 17, 2019
a400c6f
Merge pull request #7 from wienkers/front
johnryantaylor Jul 17, 2019
105a101
fixed a bug with two lines over the max length
johnryantaylor Dec 12, 2019
816cc36
moved call to sponge subroutine into Front flavor
johnryantaylor Dec 12, 2019
11d7024
fixed indexing of array in ghost_CSij2_mpi
johnryantaylor Mar 12, 2020
38a89fa
Fixed viscous timestep criterion in courant.f
johnryantaylor Apr 9, 2020
d6a55a5
Fixed bug causing 'striping' problems in large aspect ratio domains
johnryantaylor Oct 14, 2020
5a1ea84
Fixed mpi treatment of sponge_th for damping mean
johnryantaylor Nov 11, 2020
323b9eb
Added AMD model to LES
johnryantaylor Apr 24, 2021
62144e0
Added AMD model to LES
johnryantaylor Apr 24, 2021
522c53c
Added AMD model to LES
johnryantaylor Apr 24, 2021
59c40af
Added AMD model to LES
johnryantaylor Apr 24, 2021
a271b3c
Added AMD model to LES
johnryantaylor Apr 24, 2021
eac585c
Removed some debugging lines
johnryantaylor Apr 24, 2021
789031c
Updated the les_chan_th calling sequence
johnryantaylor Apr 24, 2021
86ad4dd
updated file directory
johnryantaylor Jul 1, 2022
8764a50
updated to match KH_test parameters
johnryantaylor Jul 1, 2022
f0cac67
Update input.dat
johnryantaylor Jul 1, 2022
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
3 changes: 3 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
# DIABLO
DNS In A Box...Laptop Optimized!

This branch includes background density gradients and thermal wind
and is designed for frontal zone simulations

A brief description of DIABLO

diablo.f Main program, define grid, read/write flow, statistics
Expand Down
2 changes: 1 addition & 1 deletion diablo_2.0/KH_test/input.dat
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ C CREATE_FLOW_TH(1) Create new field or Read from DIABLO_TH.START
C FILTER_TH(1) FILTER_INT(1) (If and how often to filter)
.FALSE. 10
C RI_TAU(1) PR(1)
0.15 1.0
0.05 1.0


C When including scalar advection, include 6 lines like the following for each scalar
Expand Down
1 change: 1 addition & 0 deletions diablo_2.0/T2016/MOVIE.dat
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
0.0 -10.0 0.0
Binary file added diablo_2.0/T2016/grid.h5
Binary file not shown.
8 changes: 8 additions & 0 deletions diablo_2.0/T2016/grid_def
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
!----*|--.---------.---------.---------.---------.---------.---------.-|-------|
! grid_def, the portion of the header that defines the grid size for diablo.
!----*|--.---------.---------.---------.---------.---------.---------.-|-------|
PARAMETER (NX=512)
PARAMETER (NY=33)
PARAMETER (NZ=512)
PARAMETER (N_TH=1)
!----*|--.---------.---------.---------.---------.---------.---------.-|-------|
8 changes: 8 additions & 0 deletions diablo_2.0/T2016/grid_def.all
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
!----*|--.---------.---------.---------.---------.---------.---------.-|-------|
! grid_def, the portion of the header that defines the grid size for diablo.
!----*|--.---------.---------.---------.---------.---------.---------.-|-------|
PARAMETER (NX=512)
PARAMETER (NY=65)
PARAMETER (NZ=512)
PARAMETER (N_TH=1)
!----*|--.---------.---------.---------.---------.---------.---------.-|-------|
3 changes: 3 additions & 0 deletions diablo_2.0/T2016/grid_mpi
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
PARAMETER(NPROCS=16)
PARAMETER(NPROCY=2)
PARAMETER(NPROCZ=NPROCS/NPROCY)
35 changes: 35 additions & 0 deletions diablo_2.0/T2016/input.dat
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
C A data file for diablo. This is a generic, easy method of data
C input, as long as you don't change the number of comment lines.
C Note that the grid size is defined in the file grid_def.
C FLAVOR VERSION
'Front' 2.0
C USE_MPI USE_LES (note, also change these flags in Makefile):
.TRUE. .TRUE.
C Parameters: NU, BETA, LX, LY, LZ
0.000001 1.0 1000.0 140.0 1000.0
C Vertical viscosity scale factor NU_V_SCALE (NU_V=NU*NU_V_SCALE)
1.0
C Method: NUM_PER_DIR, CREATE_NEW_FLOW
2 .TRUE.
C Time March: N_TIME_STEPS, TIME_LIMIT, DELTA_T, RESET_TIME, VARIABLE_DT, CFL, UPDATE_DT
20000 500000 0.1 .FALSE. .TRUE. 0.5 1
C I/O: VERBOSITY, SAVE_FLOW_INT, SAVE_STATS_INT, MOVIE
4 100 10 .TRUE.
C Here include 6*N_TH lines, see below for format
C CREATE_FLOW_TH(1) Create new field or Read from DIABLO_TH.START
.TRUE.
C FILTER_TH(1) FILTER_INT(1) (If and how often to filter)
.FALSE. 10
C RI_TAU(1) PR(1)
1.0 1.0


C When including scalar advection, include 6 lines like the following for each scalar

C CREATE_FLOW_TH(1) Create new field or Read from DIABLO_TH.START
.TRUE.
C FILTER_TH(1) FILTER_INT(1) (If and how often to filter)
.TRUE. 10
C RI_TAU(1) PR(1) BACKGROUND_TH(N)
0.0 1.0 .FALSE.

60 changes: 60 additions & 0 deletions diablo_2.0/T2016/input_chan.dat
Original file line number Diff line number Diff line change
@@ -0,0 +1,60 @@
C A data file for diablo. This is a generic, easy method of data
C input, as long as you don't change the number of comment lines.
C Note that the grid size is defined in the file grid_def.
C VERSION
2.0
C TIME_AD_METH
1
C LES: LES_MODEL_TYPE
1
C ICs: IC_TYPE, KICK
4 0.001
C Rotation: I_RO (or Coriolis parameter, f)
0.0001
C Upward vertical vector components, GRAV_X, GRAV_Y, GRAV_Z
0.0 1.0 0.0
C Forcing: F_TYPE, UBULK0, PX0, OMEGA0, AMP_OMEGA0
3 0.0 -1.0 6.28 0.0
C BCs: U_BC_YMIN, U_BC_YMIN_C1, U_BC_YMIN_C2, U_BC_YMIN_C3
1 0.0 0.0 0.0
C BCs: V_BC_YMIN, V_BC_YMIN_C1, V_BC_YMIN_C2, V_BC_YMIN_C3
0 0.0 0.0 0.0
C BCs: W_BC_YMIN, W_BC_YMIN_C1, W_BC_YMIN_C2, W_BC_YMIN_C3
1 0.0 0.0 0.0
C BCs: U_BC_YMAX, U_BC_YMAX_C1, U_BC_YMAX_C2, U_BC_YMAX_C3
1 0.0 0.0 0.0
C BCs: V_BC_YMAX, V_BC_YMAX_C1, V_BC_YMAX_C2, V_BC_YMAX_C3
0 0.0 0.0 0.0
C BCs: W_BC_YMAX, W_BC_YMAX_C1, W_BC_YMAX_C2, W_BC_YMAX_C3
1 0.0 0.0 0.0
C Here include 6*N_TH lines, see below for format
C BCs: TH_BC_YMIN(1), TH_BC_YMIN_C1(1), TH_BC_YMIN_C2(1), TH_BC_YMIN_C3(1)
1 0.0000018 0.0 0.0
C BCs: TH_BC_YMAX(1), TH_BC_YMAX_C1(1), TH_BC_YMAX_C2(1), TH_BC_YMAX_C3(1)
1 -0.0019 0.0 0.0
C Background scalar gradients, DRHODX(1), DRHODZ(1)
0.00000003 0.0


C Description
C For channnel flows (NUM_PER_DIR=2):
C IC_TYPE specifies the functional form for the initial velocity
C KICK is a scale factor on the noise added when creating a new flow.
C F_TYPE=0 gives constant mass flux flow (maintaining UBULK0).
C F_TYPE=1 gives constant pressure gradient flow (PX0 constant).
C F_TYPE=2 is for an oscillatory pressure gradient of the form:
C PX0+AMP_OMEGA0*cos(OMEGA0*TIME)
C U_BC_YMIN is the BC TYPE on the U velocity component at the lower wall
C (0 for Dirichlet, 1 for Neumann)
C U_BC_YMIN_C1 is the value of the velocity (if Dirichlet) or it's gradient (if Neumann)

C When including scalar advection, include 4 lines like the following for each scalar

C BCs: TH_BC_YMIN(1), TH_BC_YMIN_C1(1), TH_BC_YMIN_C2(1), TH_BC_YMIN_C3(1)
1 0.0 0.0 0.0
C BCs: TH_BC_YMAX(1), TH_BC_YMAX_C1(1), TH_BC_YMAX_C2(1), TH_BC_YMAX_C3(1)
1 0.0 0.0 0.0




35 changes: 35 additions & 0 deletions diablo_2.0/T2016/input_per.dat
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
C A data file for diablo. This is a generic, easy method of data
C input, as long as you don't change the number of comment lines.
C Note that the grid size is defined in the file grid_def.
C VERSION
1.0
C TIME_AD_METH
1
C LES: LES_MODEL_TYPE
2
C ICs: IC_TYPE, KICK
0 .0010
C FLAGS: TRUCK, GUST,
.FALSE. .FALSE.
C BACKGROUND_GRAD(N): Include this and the next three lines for each scalar
.FALSE.
C BACTERIAL MOTILITY CHI(N):
0.0
C BACKGROUND_GRAD(N): Include one of the following lines for each scalar
.FALSE.
C BACTERIAL MOTILITY CHI(N):
0.001
C BACKGROUND_GRAD(N): Include one of the following lines for each scalar
.FALSE.
C BACTERIAL MOTILITY CHI(N):
0.01





C Description
C For triply-periodic flows (NUM_PER_DIR=3):
C IC_TYPE specifies the functional form for the initial velocity
C KICK is a scale factor on the noise added when creating a new flow.
C BACKGROUND_GRAD(N) specifies if the scalar should be considered as a perturbation to a linear background gradient. This is designed to allow simulations of stratified flows in the triply periodic flow geometry.
Binary file added diablo_2.0/TF2010/grid.h5
Binary file not shown.
8 changes: 8 additions & 0 deletions diablo_2.0/TF2010/grid_def
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
!----*|--.---------.---------.---------.---------.---------.---------.-|-------|
! grid_def, the portion of the header that defines the grid size for diablo.
!----*|--.---------.---------.---------.---------.---------.---------.-|-------|
PARAMETER (NX=256)
PARAMETER (NY=26)
PARAMETER (NZ=64)
PARAMETER (N_TH=1)
!----*|--.---------.---------.---------.---------.---------.---------.-|-------|
8 changes: 8 additions & 0 deletions diablo_2.0/TF2010/grid_def.all
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
!----*|--.---------.---------.---------.---------.---------.---------.-|-------|
! grid_def, the portion of the header that defines the grid size for diablo.
!----*|--.---------.---------.---------.---------.---------.---------.-|-------|
PARAMETER (NX=256)
PARAMETER (NY=51)
PARAMETER (NZ=64)
PARAMETER (N_TH=1)
!----*|--.---------.---------.---------.---------.---------.---------.-|-------|
3 changes: 3 additions & 0 deletions diablo_2.0/TF2010/grid_mpi
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
PARAMETER(NPROCS=4)
PARAMETER(NPROCY=2)
PARAMETER(NPROCZ=NPROCS/NPROCY)
35 changes: 35 additions & 0 deletions diablo_2.0/TF2010/input.dat
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
C A data file for diablo. This is a generic, easy method of data
C input, as long as you don't change the number of comment lines.
C Note that the grid size is defined in the file grid_def.
C FLAVOR VERSION
'Front' 2.0
C USE_MPI USE_LES (note, also change these flags in Makefile):
.TRUE. .TRUE.
C Parameters: NU, BETA, LX, LY, LZ
0.000001 1.0 1000.0 50.0 250.0
C Vertical viscosity scale factor NU_V_SCALE (NU_V=NU*NU_V_SCALE)
1.0
C Method: NUM_PER_DIR, CREATE_NEW_FLOW
2 .TRUE.
C Time March: N_TIME_STEPS, TIME_LIMIT, DELTA_T, RESET_TIME, VARIABLE_DT, CFL, UPDATE_DT
10000 500000 0.1 .FALSE. .TRUE. 0.5 1
C I/O: VERBOSITY, SAVE_FLOW_INT, SAVE_STATS_INT, MOVIE
4 10000 100 .TRUE.
C Here include 6*N_TH lines, see below for format
C CREATE_FLOW_TH(1) Create new field or Read from DIABLO_TH.START
.TRUE.
C FILTER_TH(1) FILTER_INT(1) (If and how often to filter)
.FALSE. 10
C RI_TAU(1) PR(1)
-0.00981 7.0


C When including scalar advection, include 6 lines like the following for each scalar

C CREATE_FLOW_TH(1) Create new field or Read from DIABLO_TH.START
.TRUE.
C FILTER_TH(1) FILTER_INT(1) (If and how often to filter)
.TRUE. 10
C RI_TAU(1) PR(1) BACKGROUND_TH(N)
0.0 1.0 .FALSE.

60 changes: 60 additions & 0 deletions diablo_2.0/TF2010/input_chan.dat
Original file line number Diff line number Diff line change
@@ -0,0 +1,60 @@
C A data file for diablo. This is a generic, easy method of data
C input, as long as you don't change the number of comment lines.
C Note that the grid size is defined in the file grid_def.
C VERSION
2.0
C TIME_AD_METH
1
C LES: LES_MODEL_TYPE
1
C ICs: IC_TYPE, KICK
1 0.001
C Rotation: I_RO (or Coriolis parameter, f)
0.0001
C Upward vertical vector components, GRAV_X, GRAV_Y, GRAV_Z
0.0 1.0 0.0
C Forcing: F_TYPE, UBULK0, PX0, OMEGA0, AMP_OMEGA0
3 0.0 -1.0 6.28 0.0
C BCs: U_BC_YMIN, U_BC_YMIN_C1, U_BC_YMIN_C2, U_BC_YMIN_C3
1 0.0 0.0 0.0
C BCs: V_BC_YMIN, V_BC_YMIN_C1, V_BC_YMIN_C2, V_BC_YMIN_C3
0 0.0 0.0 0.0
C BCs: W_BC_YMIN, W_BC_YMIN_C1, W_BC_YMIN_C2, W_BC_YMIN_C3
1 0.0 0.0 0.0
C BCs: U_BC_YMAX, U_BC_YMAX_C1, U_BC_YMAX_C2, U_BC_YMAX_C3
1 0.0 0.0 0.0
C BCs: V_BC_YMAX, V_BC_YMAX_C1, V_BC_YMAX_C2, V_BC_YMAX_C3
0 0.0 0.0 0.0
C BCs: W_BC_YMAX, W_BC_YMAX_C1, W_BC_YMAX_C2, W_BC_YMAX_C3
1 0.0 0.0 0.0
C Here include 6*N_TH lines, see below for format
C BCs: TH_BC_YMIN(1), TH_BC_YMIN_C1(1), TH_BC_YMIN_C2(1), TH_BC_YMIN_C3(1)
1 -0.00917 0.0 0.0
C BCs: TH_BC_YMAX(1), TH_BC_YMAX_C1(1), TH_BC_YMAX_C2(1), TH_BC_YMAX_C3(1)
1 30.24 0.0 0.0
C Background scalar gradients, DRHODX(1), DRHODZ(1)
0.0000432 0.0


C Description
C For channnel flows (NUM_PER_DIR=2):
C IC_TYPE specifies the functional form for the initial velocity
C KICK is a scale factor on the noise added when creating a new flow.
C F_TYPE=0 gives constant mass flux flow (maintaining UBULK0).
C F_TYPE=1 gives constant pressure gradient flow (PX0 constant).
C F_TYPE=2 is for an oscillatory pressure gradient of the form:
C PX0+AMP_OMEGA0*cos(OMEGA0*TIME)
C U_BC_YMIN is the BC TYPE on the U velocity component at the lower wall
C (0 for Dirichlet, 1 for Neumann)
C U_BC_YMIN_C1 is the value of the velocity (if Dirichlet) or it's gradient (if Neumann)

C When including scalar advection, include 4 lines like the following for each scalar

C BCs: TH_BC_YMIN(1), TH_BC_YMIN_C1(1), TH_BC_YMIN_C2(1), TH_BC_YMIN_C3(1)
1 0.0 0.0 0.0
C BCs: TH_BC_YMAX(1), TH_BC_YMAX_C1(1), TH_BC_YMAX_C2(1), TH_BC_YMAX_C3(1)
1 0.0 0.0 0.0




35 changes: 35 additions & 0 deletions diablo_2.0/TF2010/input_per.dat
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
C A data file for diablo. This is a generic, easy method of data
C input, as long as you don't change the number of comment lines.
C Note that the grid size is defined in the file grid_def.
C VERSION
1.0
C TIME_AD_METH
1
C LES: LES_MODEL_TYPE
2
C ICs: IC_TYPE, KICK
0 .0010
C FLAGS: TRUCK, GUST,
.FALSE. .FALSE.
C BACKGROUND_GRAD(N): Include this and the next three lines for each scalar
.FALSE.
C BACTERIAL MOTILITY CHI(N):
0.0
C BACKGROUND_GRAD(N): Include one of the following lines for each scalar
.FALSE.
C BACTERIAL MOTILITY CHI(N):
0.001
C BACKGROUND_GRAD(N): Include one of the following lines for each scalar
.FALSE.
C BACTERIAL MOTILITY CHI(N):
0.01





C Description
C For triply-periodic flows (NUM_PER_DIR=3):
C IC_TYPE specifies the functional form for the initial velocity
C KICK is a scale factor on the noise added when creating a new flow.
C BACKGROUND_GRAD(N) specifies if the scalar should be considered as a perturbation to a linear background gradient. This is designed to allow simulations of stratified flows in the triply periodic flow geometry.
13 changes: 9 additions & 4 deletions diablo_2.0/for/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -38,9 +38,9 @@ USEROPTS = -O3 -cpp
endif

ifeq ($(LES),TRUE)
LES_o = les.o
LES_o = les.o les_th.o
else
LES_o = no_les.o
LES_o = no_les.o
endif

ALL2ALL=1
Expand Down Expand Up @@ -78,11 +78,11 @@ NETCDF_o = no_netcdf.o
endif

diablo: $(MAIN) diablo_io.o periodic.o channel.o courant.o $(LES_o) \
duct.o cavity.o fft.o rand.o set_ics.o save_stats.o user_rhs.o $(MPI) \
duct.o cavity.o fft.o rand.o set_ics.o save_stats.o filter.o user_rhs.o $(MPI) \
$(HEADER) grid_def $(HDF5_o)
$(COMPILER) $(COMPOPTS) $(MAIN) -o diablo \
diablo_io.o periodic.o channel.o courant.o $(LES_o) \
duct.o cavity.o fft.o rand.o set_ics.o save_stats.o user_rhs.o \
duct.o cavity.o fft.o rand.o set_ics.o save_stats.o filter.o user_rhs.o \
$(MPI) $(LINKOPTS) $(HDF5_o)

diablo_io.o: diablo_io.f header grid_def
Expand All @@ -100,6 +100,9 @@ set_ics.o: set_ics.f channel.o fft.o $(MPI) header grid_def
save_stats.o: save_stats.f channel.o fft.o $(MPI) header grid_def
$(COMPILER) $(COMPOPTS) -c save_stats.f

filter.o: filter.f channel.o fft.o $(MPI) header grid_def
$(COMPILER) $(COMPOPTS) -c filter.f

user_rhs.o: user_rhs.f channel.o fft.o $(MPI) header grid_def
$(COMPILER) $(COMPOPTS) -c user_rhs.f

Expand All @@ -109,6 +112,8 @@ courant.o: courant.f channel.o fft.o $(MPI) header grid_def
ifeq ($(LES),TRUE)
les.o: les.f fft.o header header_les grid_def
$(COMPILER) $(COMPOPTS) -c les.f
les_th.o: les_th.f fft.o header header_les_th grid_def
$(COMPILER) $(COMPOPTS) -c les_th.f
else
no_les.o: dummy_code/no_les.f
$(COMPILER) $(COMPOPTS) -c dummy_code/no_les.f
Expand Down
Loading