Commit be6e139d authored by user's avatar user
Browse files

Changes to be committed: 

	modified:   core.cpp
	modified:   main.cpp
	modified:   tex/buildall
	deleted:    tex/supp_d1q3c_efde.pdf
	modified:   tex/supp_d1q3c_efde.tex
	deleted:    tex/supp_d1q3c_epde.pdf
	modified:   tex/supp_d1q3c_epde.tex
	modified:   tex/supp_d1q3n_efde.tex
	modified:   tex/supp_d1q3n_epde.tex
	deleted:    tex/supp_d2q5c_efde.pdf
	modified:   tex/supp_d2q5c_efde.tex
	deleted:    tex/supp_d2q5c_epde.pdf
	modified:   tex/supp_d2q5c_epde.tex
	modified:   tex/supp_d2q5n_efde.tex
	modified:   tex/supp_d2q5n_epde.tex
	modified:   tex/supp_d3q7c_efde.tex
	modified:   tex/supp_d3q7c_epde.tex
	modified:   tex/supp_d3q7n_efde.tex
	modified:   tex/supp_d3q7n_epde.tex
parent e2c84bd4

core.cpp

+30 −18
Original line number Diff line number Diff line
@@ -238,8 +238,11 @@ void CORE::allocate() 
		else

			sym_meq[q] = symbol(desc);

		lbm.moment_symbol(desc2,q,Q);

		lbm.moment_symbol_number(desc3,q,Q);

		bool isnumber=lbm.moment_symbol_number(desc3,q,Q);

		if (isnumber)

			sprintf(desc,"%s_{%s}",desc2,desc3);

		else

			sprintf(desc,"%s",desc2);

		sym_m[q] = symbol(desc);

	}

	sym_cs = symbol("{c_s}");
@@ -325,8 +328,8 @@ void CORE::allocate() 
			sprintf(desc,"{\\tilde f^{eq}}_{%d,%d,%s}",q,l,s); sym_feqs[q][index(l,x,y,z)] = symbol(desc); 



			lbm.moment_symbol(desc2,q,Q);

			lbm.moment_symbol_number(desc3,q,Q);

			if (strlen(desc3)>0)

			bool isnumber=lbm.moment_symbol_number(desc3,q,Q);

			if (isnumber)

				sprintf(desc,"%s_{%s,%d,%s}",desc2,desc3,l,s); 

			else

				sprintf(desc,"%s_{%d,%s}",desc2,l,s);
@@ -357,8 +360,8 @@ void CORE::allocate() 
		{

			tay_ms[q] = new TAYLOR(DIM,Q,ORDER,_index,Nindex,sym_dl,sym_dt);

			lbm.moment_symbol(desc2,q,Q);

			lbm.moment_symbol_number(desc3,q,Q);

			if (strlen(desc3)>0)

			bool isnumber=lbm.moment_symbol_number(desc3,q,Q);

			if (isnumber)

				sprintf(comp,"%s_{%s}",desc2,desc3); 

			else

				sprintf(comp,"%s",desc2);
@@ -924,12 +927,12 @@ void CORE::export_EFDE_coefs(int fde) 
		case 3: sprintf(gamma_str," \\gamma^{t}_{x,y,z}"); break;

	}

	lbm.moment_symbol(momsym, fde, Q);

	lbm.moment_symbol_number(momsymno, fde, Q);

	bool isnumber=lbm.moment_symbol_number(momsymno, fde, Q);

	char strr[100];

	if (DIM==1) sprintf(strr,"x");

	if (DIM==2) sprintf(strr,"x,y");

	if (DIM==3) sprintf(strr,"x,y,z");

	if (lbm.moment_symbol_number(momsymno, fde, Q))

	if (isnumber)

		gout << "\t"<<momsym<<"^{t+\\dt}_{"<<momsymno<<","<<strr<<"} =";

	else

		gout << "\t"<<momsym<<"^{t+\\dt}_{"<<strr<<"} =";
@@ -967,7 +970,7 @@ void CORE::export_EFDE_coefs(int fde) 
				if (expand(coefs_efde[fde][q][index(l,i1,i2,i3)])!=0) Lh=l;



			lbm.moment_symbol(momsym, q, Q);

			lbm.moment_symbol_number(momsymno, q, Q);

			bool isnumber=lbm.moment_symbol_number(momsymno, q, Q);



			if (Lh>=0)

			{
@@ -994,10 +997,10 @@ void CORE::export_EFDE_coefs(int fde) 
					gout << "}\n";

					gout << momsym <<"^{t-\\ell\\dt}";

				}

				if (q==0)

					gout<<"_{x+i\\dl";

				else

				if (isnumber)

					gout<<"_{"<<momsymno<<",x+i\\dl";

				else

					gout<<"_{x+i\\dl";

				if (DIM>=2) gout <<",y+j\\dl";

				if (DIM>=3) gout <<",z+k\\dl";

				gout << "}\n";;
@@ -1023,9 +1026,12 @@ void CORE::export_EFDE_coefs(int fde) 
			desc2str(s_space_coeff, s_time_coeff, s_space_formula, s_time_formula, l, i1, i2, i3);



			lbm.moment_symbol(momsym, q, Q);

			lbm.moment_symbol_number(momsymno, q, Q);

			bool isnumber=lbm.moment_symbol_number(momsymno, q, Q);



			if (isnumber)

				sprintf(str,"\\alpha^{[%s_{%s}],%s}_{%s}",momsym,momsymno,s_time_formula,s_space_formula);

			else

				sprintf(str,"\\alpha^{[%s],%s}_{%s}",momsym,s_time_formula,s_space_formula);



			bool last=(l==last_L_nonzero);
@@ -1217,8 +1223,11 @@ void CORE::export_EPDE_coefs(int pde) 
			desc2str(str,k,j1,j2,j3);

			char gamma_str[100], momsym[100], momsymno[100];

			lbm.moment_symbol(momsym,q,Q);

			lbm.moment_symbol_number(momsymno,q,Q);

			bool isnumber=lbm.moment_symbol_number(momsymno,q,Q);

			if (isnumber)

				sprintf(gamma_str,"\\gamma^{[%s_{%s}]}_{[%s]}",momsym,momsymno,str);

			else

				sprintf(gamma_str,"\\gamma^{[%s]}_{[%s]}",momsym,str);

			gout << gamma_str;

			sprintf(str,"");

			if (k-j>0) { if (k-j==1) sprintf(str_dt,"\\dt"); else sprintf(str_dt,"\\dt^{%d}",k-j); } else sprintf(str_dt,"");
@@ -1275,8 +1284,11 @@ void CORE::export_EPDE_coefs(int pde) 
			char str[100], gamma_str[100], momsym[100], momsymno[100];

			desc2str(str,k,j1,j2,j3);

			lbm.moment_symbol(momsym,q,Q);

			lbm.moment_symbol_number(momsymno,q,Q);

			bool isnumber=lbm.moment_symbol_number(momsymno,q,Q);

			if (isnumber)

				sprintf(gamma_str,"\\gamma^{[%s_{%s}]}_{[%s]}",momsym,momsymno,str);

			else

				sprintf(gamma_str,"\\gamma^{[%s]}_{[%s]}",momsym,str);

			if (bigprint)

			{

				export_EPDE_coefs_bigprint(expr, gout, gamma_str);

main.cpp

+5 −5
Original line number Diff line number Diff line
@@ -59,7 +59,7 @@ void execute( 
	core.sym_cs=(ex)1/sqrt((ex)3);



	core.allocate();

	sprintf(core.target_dir,"output_D%dQ%d%s",DIM,Q,(constvel)?"c":"n");

	sprintf(core.target_dir,"output_d%dq%d%s",DIM,Q,(constvel)?"c":"n");

	if (verbosity) { printf("allocated\n"); fflush(stdout); }
@@ -123,13 +123,13 @@ void d3q7(bool constvel=true) 
int main(int argc, char* argv[]) 

{

	d1q3(true);

//	d1q3(false);

	d1q3(false);



	d2q5(true);

//	d2q5(false);

	d2q5(false);



//	d3q7(true);

//	d3q7(false);

	d3q7(true);

	d3q7(false);

	return 0;

}

tex/buildall

+8 −2
Original line number Diff line number Diff line 
#!/bin/bash

for a in supp*e.tex; do

        b1=${a#*supp_}

        b2=${b1%_*}

        b="../output_${b2}"

	if [ -d $b ]; then

		echo processing $a

		buf_size=100000000 lualatex $a

		buf_size=100000000 lualatex $a

	fi;

done



#clear aux files

tex/supp_d1q3c_efde.pdf

deleted100644 → 0
−189 KiB

File deleted.

View file

tex/supp_d1q3c_efde.tex

+9 −9
Original line number Diff line number Diff line
@@ -12,21 +12,21 @@ 


\section{SRT}

\input{d1q3/supp_d1q3m0_defs}

\subsection{EFDE for $\mmA$}\input{../output_D1Q3c/d1q3m0c_efde0}

\subsection{EFDE for $\mmB$}\input{../output_D1Q3c/d1q3m0c_efde1}

\subsection{EFDE for $\mmC$}\input{../output_D1Q3c/d1q3m0c_efde2}

\subsection{EFDE for $\mmA$}\input{../output_d1q3c/d1q3m0c_efde0}

\subsection{EFDE for $\mmB$}\input{../output_d1q3c/d1q3m0c_efde1}

\subsection{EFDE for $\mmC$}\input{../output_d1q3c/d1q3m0c_efde2}



\section{MRT}

\input{d1q3/supp_d1q3m1_defs}

\subsection{EFDE for $\mmA$}\input{../output_D1Q3c/d1q3m1c_efde0}

\subsection{EFDE for $\mmB$}\input{../output_D1Q3c/d1q3m1c_efde1}

\subsection{EFDE for $\mmC$}\input{../output_D1Q3c/d1q3m1c_efde2}

\subsection{EFDE for $\mmA$}\input{../output_d1q3c/d1q3m1c_efde0}

\subsection{EFDE for $\mmB$}\input{../output_d1q3c/d1q3m1c_efde1}

\subsection{EFDE for $\mmC$}\input{../output_d1q3c/d1q3m1c_efde2}



\section{CLBM}

\input{d1q3/supp_d1q3m5_defs}

\subsection{EFDE for $\mmA$}\input{../output_D1Q3c/d1q3m5c_efde0}

\subsection{EFDE for $\mmB$}\input{../output_D1Q3c/d1q3m5c_efde1}

\subsection{EFDE for $\mmC$}\input{../output_D1Q3c/d1q3m5c_efde2}

\subsection{EFDE for $\mmA$}\input{../output_d1q3c/d1q3m5c_efde0}

\subsection{EFDE for $\mmB$}\input{../output_d1q3c/d1q3m5c_efde1}

\subsection{EFDE for $\mmC$}\input{../output_d1q3c/d1q3m5c_efde2}