Skip to content

Commit 519b905

Browse files
fangjianfangjian
authored andcommitted
filter improved with all 10th compact filter across all nodes, in a new module filter
1 parent 5fd239b commit 519b905

File tree

9 files changed

+796
-1435
lines changed

9 files changed

+796
-1435
lines changed

Makefile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
#FC=mpif90
66
FC=h5pfc
77

8-
SRCDIR = /mnt/d/ASTR/astr/src /mnt/d/ASTR/astr/user_define_module
8+
SRCDIR = ./astr/src ./astr/user_define_module
99
OBJDIR = obj
1010
BINDIR = bin
1111
CTRDIR = cma
@@ -31,9 +31,9 @@ VPATH = $(SRCDIR):$(OBJDIR)
3131
srs= strings.F90 fdnn.F90 singleton.F90 commtype.F90 stlaio.F90 constdef.F90 tecio.F90 \
3232
vtkio.F90 interp.F90 commvar.F90 utility.F90 thermchem.F90 commarray.F90 fludyna.F90 \
3333
parallel.F90 hdf5io.F90 cmdefne.F90 commfunc.F90 commcal.F90 models.F90 statistic.F90 \
34-
userdefine.F90 bc.F90 readwrite.F90 geom.F90 ibmethod.F90 gridgeneration.F90 \
35-
riemann.F90 comsolver.F90 solver.F90 udf_pp.F90 pp.F90 initialisation.F90 \
36-
mainloop.F90 test.F90 astr.F90
34+
userdefine.F90 filter.F90 bc.F90 readwrite.F90 geom.F90 ibmethod.F90 \
35+
gridgeneration.F90 riemann.F90 comsolver.F90 solver.F90 udf_pp.F90 pp.F90 \
36+
initialisation.F90 mainloop.F90 test.F90 astr.F90
3737

3838
OBJS=$(srs:.F90=.o)
3939

src/CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ add_executable(astr
1414
commvar.F90
1515
constdef.F90
1616
fdnn.F90
17+
filter.F90
1718
fludyna.F90
1819
geom.F90
1920
gridgeneration.F90

src/bc.F90

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3664,7 +3664,8 @@ subroutine farfield_nscbc(ndir)
36643664
!
36653665
use commvar, only : xmin,xmax,ymin,ymax,mach
36663666
use fludyna, only : thermal,fvar2q,q2fvar,sos
3667-
use commfunc, only : deriv,ddfc,spafilter6exp
3667+
use commfunc, only : deriv,ddfc
3668+
use filter, only : spafilter6exp
36683669
!
36693670
! arguments
36703671
integer,intent(in) :: ndir
@@ -4687,7 +4688,8 @@ subroutine outflow_nscbc(ndir)
46874688
!
46884689
use commvar, only : xmin,xmax,mach,nondimen
46894690
use fludyna, only : thermal,fvar2q,q2fvar,sos
4690-
use commfunc, only : deriv,ddfc,spafilter6exp
4691+
use commfunc, only : deriv,ddfc
4692+
use filter, only : spafilter6exp
46914693
use parallel, only : psum,mpi_imax
46924694
#ifdef COMB
46934695
use thermchem, only : aceval

0 commit comments

Comments
 (0)