Commit f49a1f24 authored by RF's avatar RF
Browse files

modified: lbmat.cpp

parent 75aeeff0

lbmat.cpp

+25 −25
Original line number Original line Diff line number Diff line
@@ -37,18 +37,18 @@ template< typename MM=D1Q3_M1 > 
void d1q3(int pde_type, int order=4, int max_factors_common_order=4, bool use_symbolic=false)

void d1q3(int pde_type, int order=4, int max_factors_common_order=4, bool use_symbolic=false)

{

{

	execute<D1Q3_SRT<MM>>(pde_type,  order, max_factors_common_order, use_symbolic);

	execute<D1Q3_SRT<MM>>(pde_type,  order, max_factors_common_order, use_symbolic);

//	execute<D1Q3_MRT1<MM>>(pde_type,  order, max_factors_common_order, use_symbolic);

	execute<D1Q3_MRT1<MM>>(pde_type,  order, max_factors_common_order, use_symbolic);

//	execute<D1Q3_CLBM1<MM>>(pde_type,  order, max_factors_common_order, use_symbolic);

	execute<D1Q3_CLBM1<MM>>(pde_type,  order, max_factors_common_order, use_symbolic);

}

}





template< typename MM=D2Q5_M1 >

template< typename MM=D2Q5_M1 >

void d2q5(int pde_type, int order=4, int max_factors_common_order=4, bool use_symbolic=false)

void d2q5(int pde_type, int order=4, int max_factors_common_order=4, bool use_symbolic=false)

{

{

	execute<D2Q5_SRT<MM>>(pde_type,  order, max_factors_common_order, use_symbolic);

	execute<D2Q5_SRT<MM>>(pde_type,  order, max_factors_common_order, use_symbolic);

//	execute<D2Q5_MRT1<MM>>(pde_type,  order, max_factors_common_order, use_symbolic);

	execute<D2Q5_MRT1<MM>>(pde_type,  order, max_factors_common_order, use_symbolic);

//	execute<D2Q5_MRT2<MM>>(pde_type,  order, max_factors_common_order, use_symbolic);

	execute<D2Q5_MRT2<MM>>(pde_type,  order, max_factors_common_order, use_symbolic);

//	execute<D2Q5_CLBM1<MM>>(pde_type,  order, max_factors_common_order, use_symbolic);

	execute<D2Q5_CLBM1<MM>>(pde_type,  order, max_factors_common_order, use_symbolic);

//	execute<D2Q5_CLBM2<MM>>(pde_type,  order, max_factors_common_order, use_symbolic);

	execute<D2Q5_CLBM2<MM>>(pde_type,  order, max_factors_common_order, use_symbolic);

}

}
@@ -56,12 +56,12 @@ template< typename MM=D2Q9_M1 > 
void d2q9(int pde_type, int order=4, int max_factors_common_order=4, bool use_symbolic=false)

void d2q9(int pde_type, int order=4, int max_factors_common_order=4, bool use_symbolic=false)

{

{

	execute<D2Q9_SRT<MM>>(pde_type,  order, max_factors_common_order, use_symbolic);

	execute<D2Q9_SRT<MM>>(pde_type,  order, max_factors_common_order, use_symbolic);

//	execute<D2Q9_MRT1<MM>>(pde_type,  order, max_factors_common_order, use_symbolic);

	execute<D2Q9_MRT1<MM>>(pde_type,  order, max_factors_common_order, use_symbolic);

//	execute<D2Q9_MRT2<MM>>(pde_type,  order, max_factors_common_order, use_symbolic);

	execute<D2Q9_MRT2<MM>>(pde_type,  order, max_factors_common_order, use_symbolic);

//	execute<D2Q9_CLBM1<MM>>(pde_type,  order, max_factors_common_order, use_symbolic);

	execute<D2Q9_CLBM1<MM>>(pde_type,  order, max_factors_common_order, use_symbolic);

//	execute<D2Q9_CLBM2<MM>>(pde_type,  order, max_factors_common_order, use_symbolic);

	execute<D2Q9_CLBM2<MM>>(pde_type,  order, max_factors_common_order, use_symbolic);

//	execute<D2Q9_CuLBM1<MM>>(pde_type,  order, max_factors_common_order, use_symbolic);

	execute<D2Q9_CuLBM1<MM>>(pde_type,  order, max_factors_common_order, use_symbolic);

//	execute<D2Q9_CuLBM2<MM>>(pde_type,  order, max_factors_common_order, use_symbolic);

	execute<D2Q9_CuLBM2<MM>>(pde_type,  order, max_factors_common_order, use_symbolic);

}

}
@@ -69,10 +69,10 @@ template< typename MM=D3Q7_M1 > 
void d3q7(int pde_type, int order=4, int max_factors_common_order=4, bool use_symbolic=false)

void d3q7(int pde_type, int order=4, int max_factors_common_order=4, bool use_symbolic=false)

{

{

	execute<D3Q7_SRT<MM>>(pde_type,  order, max_factors_common_order, use_symbolic);

	execute<D3Q7_SRT<MM>>(pde_type,  order, max_factors_common_order, use_symbolic);

//	execute<D3Q7_MRT1<MM>>(pde_type,  order, max_factors_common_order, use_symbolic);

	execute<D3Q7_MRT1<MM>>(pde_type,  order, max_factors_common_order, use_symbolic);

//	execute<D3Q7_MRT2<MM>>(pde_type,  order, max_factors_common_order, use_symbolic);

	execute<D3Q7_MRT2<MM>>(pde_type,  order, max_factors_common_order, use_symbolic);

//	execute<D3Q7_CLBM1<MM>>(pde_type,  order, max_factors_common_order, use_symbolic);

	execute<D3Q7_CLBM1<MM>>(pde_type,  order, max_factors_common_order, use_symbolic);

//	execute<D3Q7_CLBM2<MM>>(pde_type,  order, max_factors_common_order, use_symbolic);

	execute<D3Q7_CLBM2<MM>>(pde_type,  order, max_factors_common_order, use_symbolic);

}

}
@@ -80,19 +80,19 @@ template< typename MM=D3Q27_M1 > 
void d3q27(int pde_type, int order=4, int max_factors_common_order=4, bool use_symbolic=false)

void d3q27(int pde_type, int order=4, int max_factors_common_order=4, bool use_symbolic=false)

{

{

	execute<D3Q27_SRT<MM>>(pde_type,  order, max_factors_common_order, use_symbolic);

	execute<D3Q27_SRT<MM>>(pde_type,  order, max_factors_common_order, use_symbolic);

//	execute<D3Q27_MRT1<MM>>(pde_type,  order, max_factors_common_order, use_symbolic);

	execute<D3Q27_MRT1<MM>>(pde_type,  order, max_factors_common_order, use_symbolic);

//	execute<D3Q27_MRT2<MM>>(pde_type,  order, max_factors_common_order, use_symbolic);

	execute<D3Q27_MRT2<MM>>(pde_type,  order, max_factors_common_order, use_symbolic);

//	execute<D3Q27_CLBM1<MM>>(pde_type,  order, max_factors_common_order, use_symbolic);

	execute<D3Q27_CLBM1<MM>>(pde_type,  order, max_factors_common_order, use_symbolic);

//	execute<D3Q27_CLBM2<MM>>(pde_type,  order, max_factors_common_order, use_symbolic);

	execute<D3Q27_CLBM2<MM>>(pde_type,  order, max_factors_common_order, use_symbolic);

//	execute<D3Q27_CuLBM1<MM>>(pde_type,  order, max_factors_common_order, use_symbolic);

	execute<D3Q27_CuLBM1<MM>>(pde_type,  order, max_factors_common_order, use_symbolic);

//	execute<D3Q27_CuLBM2<MM>>(pde_type,  order, max_factors_common_order, use_symbolic);

	execute<D3Q27_CuLBM2<MM>>(pde_type,  order, max_factors_common_order, use_symbolic);

}

}









int main(int argc, char* argv[])

int main(int argc, char* argv[])

{

{

	int O=4,MFCO=O;

	int O=4,MFCO=O;

	bool use_symbolic=false;

	bool use_symbolic=true;





	d1q3(ADE,O,MFCO,use_symbolic);

	d1q3(ADE,O,MFCO,use_symbolic);
@@ -102,7 +102,7 @@ int main(int argc, char* argv[]) 




	d2q9(NSE,O,MFCO,use_symbolic);

	d2q9(NSE,O,MFCO,use_symbolic);





//	d3q7(ADE,O,MFCO,use_symbolic);

	d3q7(ADE,O,MFCO,use_symbolic);





//	d3q27(NSE,O,MFCO,use_symbolic);

	d3q27(NSE,O,MFCO,use_symbolic);

}
 
}