Commit 948bc6b6 authored by Radek Fučík's avatar Radek Fučík
Browse files

LBMAT2

- code refactored
- supp mat latex sources added

 Changes to be committed:
	modified:   Makefile
	modified:   README.md
	renamed:    defs.h -> base.h
	renamed:    defs.hpp -> base.hpp
	modified:   core.h
	new file:   d1q3_ade/build.sh
	new file:   d1q3_ade/clean.sh
	new file:   d1q3_ade/supp_d1q3_ade.tex
	new file:   d1q3_nse/build.sh
	new file:   d1q3_nse/clean.sh
	new file:   d1q3_nse/supp_d1q3_nse.tex
	new file:   d2q5_ade/build.sh
	new file:   d2q5_ade/clean.sh
	new file:   d2q5_ade/supp_d2q5_ade.tex
	new file:   d2q9_nse/build.sh
	new file:   d2q9_nse/clean.sh
	new file:   d2q9_nse/supp_d2q9_nse.tex
	new file:   d3q27_nse/build.sh
	new file:   d3q27_nse/clean.sh
	new file:   d3q27_nse/supp_d3q27_nse.tex
	new file:   d3q7_ade/build.sh
	new file:   d3q7_ade/clean.sh
	new file:   d3q7_ade/supp_d3q7_ade.tex
	new file:   execute.h
	deleted:    export_latex
	modified:   export_latex.cpp
	deleted:    export_latex_compare
	modified:   export_latex_compare.cpp
	new file:   latex/d1q3.pdf
	new file:   latex/d1q3_C.tex
	new file:   latex/d1q3_clbm1_eq.tex
	new file:   latex/d1q3_clbm1_matK.tex
	new file:   latex/d1q3_clbm1_matM.tex
	new file:   latex/d1q3_defs.tex
	new file:   latex/d1q3_eq.tex
	new file:   latex/d1q3_matM.tex
	new file:   latex/d1q3_mrt1_matM.tex
	new file:   latex/d1q3_mrt1og_matA.tex
	new file:   latex/d1q3_mrt1og_matM.tex
	new file:   latex/d1q3_rawMom.tex
	new file:   latex/d1q3_srt_matM.tex
	new file:   latex/d2q5.pdf
	new file:   latex/d2q5_C.tex
	new file:   latex/d2q5_clbm1_eq.tex
	new file:   latex/d2q5_clbm1_matK.tex
	new file:   latex/d2q5_clbm2_eq.tex
	new file:   latex/d2q5_clbm2_matK.tex
	new file:   latex/d2q5_defs.tex
	new file:   latex/d2q5_eq.tex
	new file:   latex/d2q5_matM.tex
	new file:   latex/d2q5_mrt2_eq.tex
	new file:   latex/d2q5_rawMom.tex
	new file:   latex/d2q5_srt_matM.tex
	new file:   latex/d2q9.pdf
	new file:   latex/d2q9_C.tex
	new file:   latex/d2q9_clbm1_eq.tex
	new file:   latex/d2q9_clbm1_matK.tex
	new file:   latex/d2q9_clbm2_eq.tex
	new file:   latex/d2q9_clbm2_matK.tex
	new file:   latex/d2q9_cum2_eq.tex
	new file:   latex/d2q9_cum_eq.tex
	new file:   latex/d2q9_defs.tex
	new file:   latex/d2q9_eq.tex
	new file:   latex/d2q9_matM.tex
	new file:   latex/d2q9_mrt1_matM.tex
	new file:   latex/d2q9_mrt2_eq.tex
	new file:   latex/d2q9_mrt2_matM.tex
	new file:   latex/d2q9_rawMom.tex
	new file:   latex/d2q9_srt_matA.tex
	new file:   latex/d3q27.pdf
	new file:   latex/d3q27_C.tex
	new file:   latex/d3q27_clbm1_eq.tex
	new file:   latex/d3q27_clbm1_matK.tex
	new file:   latex/d3q27_clbm2_eq.tex
	new file:   latex/d3q27_clbm2_matK.tex
	new file:   latex/d3q27_cum2_eq.tex
	new file:   latex/d3q27_cum_eq.tex
	new file:   latex/d3q27_cum_kappa.tex
	new file:   latex/d3q27_cum_matN2.tex
	new file:   latex/d3q27_cum_matS1.tex
	new file:   latex/d3q27_cum_matS2.tex
	new file:   latex/d3q27_defs.tex
	new file:   latex/d3q27_eq.tex
	new file:   latex/d3q27_matM.tex
	new file:   latex/d3q27_mrt2_eq.tex
	new file:   latex/d3q27_mrt2_matM.tex
	new file:   latex/d3q27_rawMom.tex
	new file:   latex/d3q7.pdf
	new file:   latex/d3q7_C.tex
	new file:   latex/d3q7_clbm1_eq.tex
	new file:   latex/d3q7_clbm1_matK.tex
	new file:   latex/d3q7_clbm2_eq.tex
	new file:   latex/d3q7_clbm2_matK.tex
	new file:   latex/d3q7_defs.tex
	new file:   latex/d3q7_eq.tex
	new file:   latex/d3q7_matM.tex
	new file:   latex/d3q7_mrt1_matM.tex
	new file:   latex/d3q7_mrt2_eq.tex
	new file:   latex/d3q7_mrt2_matM.tex
	new file:   latex/d3q7_rawMom.tex
	new file:   latex/d3q7_srt_matA.tex
	new file:   latex/header.tex
	new file:   latex/ref.bib
	new file:   latex/supp_d1q3_clbm1_defs.tex
	new file:   latex/supp_d1q3_defs.tex
	new file:   latex/supp_d1q3_mrt1_defs.tex
	new file:   latex/supp_d1q3_srt_defs.tex
	new file:   latex/supp_d2q5_clbm1_defs.tex
	new file:   latex/supp_d2q5_clbm2_defs.tex
	new file:   latex/supp_d2q5_defs.tex
	new file:   latex/supp_d2q5_mrt1_defs.tex
	new file:   latex/supp_d2q5_mrt2_defs.tex
	new file:   latex/supp_d2q5_srt_defs.tex
	new file:   latex/supp_d2q9_clbm1_defs.tex
	new file:   latex/supp_d2q9_clbm2_defs.tex
	new file:   latex/supp_d2q9_culbm1_defs.tex
	new file:   latex/supp_d2q9_culbm2_defs.tex
	new file:   latex/supp_d2q9_defs.tex
	new file:   latex/supp_d2q9_mrt1_defs.tex
	new file:   latex/supp_d2q9_mrt2_defs.tex
	new file:   latex/supp_d2q9_srt_defs.tex
	new file:   latex/supp_d3q27_clbm1_defs.tex
	new file:   latex/supp_d3q27_clbm2_defs.tex
	new file:   latex/supp_d3q27_culbm1_defs.tex
	new file:   latex/supp_d3q27_culbm2_defs.tex
	new file:   latex/supp_d3q27_defs.tex
	new file:   latex/supp_d3q27_mrt1_defs.tex
	new file:   latex/supp_d3q27_mrt2_defs.tex
	new file:   latex/supp_d3q27_srt_defs.tex
	new file:   latex/supp_d3q7_clbm1_defs.tex
	new file:   latex/supp_d3q7_clbm2_defs.tex
	new file:   latex/supp_d3q7_defs.tex
	new file:   latex/supp_d3q7_mrt1_defs.tex
	new file:   latex/supp_d3q7_mrt2_defs.tex
	new file:   latex/supp_d3q7_srt_defs.tex
	modified:   lbm.h
	deleted:    lbmat
	deleted:    lbmat.cpp
	new file:   lbmat_d1q3_ade.cpp
	new file:   lbmat_d1q3_nse.cpp
	new file:   lbmat_d2q5_ade.cpp
	new file:   lbmat_d2q9_nse.cpp
	new file:   lbmat_d3q27_nse.cpp
	new file:   lbmat_d3q7_ade.cpp
	renamed:    script_backsubst_searcher.py -> scripts/script_backsubst_searcher.py
	renamed:    script_backsubst_searcher_all.sh -> scripts/script_backsubst_searcher_all.sh
	deleted:    simplify
	modified:   tpde.h
parent f49a1f24
Loading
Loading
Loading
Loading
+7 −18
Original line number Diff line number Diff line
defaults: lbmat simplify export_latex export_latex_compare
defaults: all

CXXFLAGS=-O2 -I. -std=c++11
LIBS=-lm -lginac 

DEPS = *.h *.hpp
ALLCPP = $(wildcard *.cpp)
TARGETS = $(ALLCPP:%.cpp=%)

lbmat: $(DEPS) lbmat.cpp
	$(CXX) $(CXXFLAGS) lbmat.cpp -o lbmat  $(LIBS) 
all: $(TARGETS)

simplify: $(DEPS) simplify.cpp
	$(CXX) $(CXXFLAGS) simplify.cpp -o simplify  $(LIBS)

export_latex: $(DEPS) export_latex.cpp
	$(CXX) $(CXXFLAGS) export_latex.cpp -o export_latex  $(LIBS)

export_latex_compare: $(DEPS) export_latex_compare.cpp
	$(CXX) $(CXXFLAGS) export_latex_compare.cpp -o export_latex_compare  $(LIBS)
$(TARGETS): % : %.cpp $(DEPS)
	$(CXX) $(CXXFLAGS) -o $@ $< $(LIBS)

clean:
	@rm -rf export_latex
	@rm -rf export_latex_compare
	@rm -rf lbmat
	@rm -rf simplify
	@rm -rf *.o
	@rm -rf *.d
	@rm -f *.o *.d $(TARGETS)
+1 −1
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@
* Tomáš Oberhuber (oberhuber.tomas@fjfi.cvut.cz) FNSPE CTU in Prague, Czech Republic

 Read and cite: <br/>
* Radek Fučík, Pavel Eichler, Jakub Klinkovský, Robert Straka and Tomáš Oberhuber: <i>Lattice Boltzmann Method Analysis Tool (LBMAT)</i> in review in Elsevier Computers & Mathematics with Applications
* Radek Fučík, Pavel Eichler, Jakub Klinkovský, Robert Straka and Tomáš Oberhuber: <i>Lattice Boltzmann Method Analysis Tool (LBMAT)</i> in preparation

* Radek Fučík and Robert Straka: <i>Equivalent finite difference and partial differential equations for the lattice Boltzmann method</i>, Elsevier Computers & Mathematics with Applications, vol. 90, 2021, 96-103 
 https://doi.org/10.1016/j.camwa.2021.03.014
+2 −2
Original line number Diff line number Diff line
@@ -120,6 +120,6 @@ struct FUN
        ex vel[3];
};

#include "defs.hpp"
#include "base.hpp"

+0 −0

File moved.

+2 −2
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@

#pragma once

#include "defs.h"
#include "base.h"
#include "lbm.h"
#include "tpde.h"

@@ -19,7 +19,7 @@ struct CORE : BASE
	int verbosity=0;
	// link to lbm
	int Q=0, D=0;
	bool use_symbolic_coefs=false; // use symbolic coefficients for abs_rhs to save memory
	bool use_symbolic_coefs=!false; // use symbolic coefficients for abs_rhs to save memory

	FUN fun;

Loading