downgrade CMake version to 3.10.0; fix minor bugs and build
This commit is contained in:
parent
536fc6e8c0
commit
803f907edd
@ -1,4 +1,4 @@
|
|||||||
CMAKE_MINIMUM_REQUIRED(VERSION 3.18.3)
|
CMAKE_MINIMUM_REQUIRED(VERSION 3.10.0)
|
||||||
CMAKE_POLICY( SET CMP0057 NEW )
|
CMAKE_POLICY( SET CMP0057 NEW )
|
||||||
if( ${CMAKE_VERSION} VERSION_GREATER_EQUAL "3.20.0")
|
if( ${CMAKE_VERSION} VERSION_GREATER_EQUAL "3.20.0")
|
||||||
CMAKE_POLICY( SET CMP0115 OLD )
|
CMAKE_POLICY( SET CMP0115 OLD )
|
||||||
|
@ -400,8 +400,12 @@ public:
|
|||||||
void Poisson_D3Q7_BC_Z(int *Map, double *Psi, double Vout);
|
void Poisson_D3Q7_BC_Z(int *Map, double *Psi, double Vout);
|
||||||
void D3Q7_Ion_Concentration_BC_z(int *neighborList, double *fq, double Cin, int time);
|
void D3Q7_Ion_Concentration_BC_z(int *neighborList, double *fq, double Cin, int time);
|
||||||
void D3Q7_Ion_Concentration_BC_Z(int *neighborList, double *fq, double Cout, int time);
|
void D3Q7_Ion_Concentration_BC_Z(int *neighborList, double *fq, double Cout, int time);
|
||||||
void D3Q7_Ion_Flux_BC_z(int *neighborList, double *fq, double Cin, double tau, double *VelocityZ, int time);
|
void D3Q7_Ion_Flux_Diff_BC_z(int *neighborList, double *fq, double Cin, double tau, double *VelocityZ, int time);
|
||||||
void D3Q7_Ion_Flux_BC_Z(int *neighborList, double *fq, double Cout, double tau, double *VelocityZ, int time);
|
void D3Q7_Ion_Flux_Diff_BC_Z(int *neighborList, double *fq, double Cout, double tau, double *VelocityZ, int time);
|
||||||
|
void D3Q7_Ion_Flux_DiffAdvc_BC_z(int *neighborList, double *fq, double Cin, double tau, double *VelocityZ, int time);
|
||||||
|
void D3Q7_Ion_Flux_DiffAdvc_BC_Z(int *neighborList, double *fq, double Cout, double tau, double *VelocityZ, int time);
|
||||||
|
void D3Q7_Ion_Flux_DiffAdvcElec_BC_z(int *neighborList,double *fq,double Cin,double tau,double *VelocityZ,double *ElectricField_Z,double Di,double zi,double Vt, int time);
|
||||||
|
void D3Q7_Ion_Flux_DiffAdvcElec_BC_Z(int *neighborList,double *fq,double Cout,double tau,double *VelocityZ,double *ElectricField_Z,double Di,double zi,double Vt, int time);
|
||||||
void GreyscaleSC_BC_z(int *Map, double *DenA, double *DenB, double vA, double vB);
|
void GreyscaleSC_BC_z(int *Map, double *DenA, double *DenB, double vA, double vB);
|
||||||
void GreyscaleSC_BC_Z(int *Map, double *DenA, double *DenB, double vA, double vB);
|
void GreyscaleSC_BC_Z(int *Map, double *DenA, double *DenB, double vA, double vB);
|
||||||
void GreyscaleSC_Pressure_BC_z(int *neighborList, double *fqA, double *fqB, double dinA, double dinB, int time);
|
void GreyscaleSC_Pressure_BC_z(int *neighborList, double *fqA, double *fqB, double dinA, double dinB, int time);
|
||||||
|
@ -359,7 +359,7 @@ __global__ void dvc_ScaLBL_D3Q7_AAeven_Ion_Flux_Diff_BC_Z(int *list, double *dis
|
|||||||
fsum_partial = f0+f1+f2+f3+f4+f5;
|
fsum_partial = f0+f1+f2+f3+f4+f5;
|
||||||
uz = VelocityZ[n];
|
uz = VelocityZ[n];
|
||||||
//...................................................
|
//...................................................
|
||||||
f6 =(FluxIn+(1.0-0.5/tau)*(f5-uz*fsum_partial))/(1.0-0.5/tau)(1.0+uz);
|
f6 =(FluxIn+(1.0-0.5/tau)*(f5-uz*fsum_partial))/(1.0-0.5/tau)/(1.0+uz);
|
||||||
dist[5*Np+n] = f6;
|
dist[5*Np+n] = f6;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -434,7 +434,7 @@ __global__ void dvc_ScaLBL_D3Q7_AAodd_Ion_Flux_Diff_BC_Z(int *d_neighborList, in
|
|||||||
fsum_partial = f0+f1+f2+f3+f4+f5;
|
fsum_partial = f0+f1+f2+f3+f4+f5;
|
||||||
uz = VelocityZ[n];
|
uz = VelocityZ[n];
|
||||||
//...................................................
|
//...................................................
|
||||||
f6 =(FluxIn+(1.0-0.5/tau)*(f5-uz*fsum_partial))/(1.0-0.5/tau)(1.0+uz);
|
f6 =(FluxIn+(1.0-0.5/tau)*(f5-uz*fsum_partial))/(1.0-0.5/tau)/(1.0+uz);
|
||||||
|
|
||||||
// unknown distributions
|
// unknown distributions
|
||||||
nr6 = d_neighborList[n+5*Np];
|
nr6 = d_neighborList[n+5*Np];
|
||||||
|
@ -772,7 +772,7 @@ void ScaLBL_IonModel::Initialize(){
|
|||||||
case 22:
|
case 22:
|
||||||
if (rank==0) printf("LB Ion Solver: inlet boundary for Ion %i is (inward) flux = %.5g [mol/m^2/sec]; Diffusive + advective flux. \n",i+1,Cin[i]/(h*h*1.0e-12)/time_conv[i]);
|
if (rank==0) printf("LB Ion Solver: inlet boundary for Ion %i is (inward) flux = %.5g [mol/m^2/sec]; Diffusive + advective flux. \n",i+1,Cin[i]/(h*h*1.0e-12)/time_conv[i]);
|
||||||
break;
|
break;
|
||||||
case 22:
|
case 23:
|
||||||
if (rank==0) printf("LB Ion Solver: inlet boundary for Ion %i is (inward) flux = %.5g [mol/m^2/sec]; Diffusive + advective + electric flux. \n",i+1,Cin[i]/(h*h*1.0e-12)/time_conv[i]);
|
if (rank==0) printf("LB Ion Solver: inlet boundary for Ion %i is (inward) flux = %.5g [mol/m^2/sec]; Diffusive + advective + electric flux. \n",i+1,Cin[i]/(h*h*1.0e-12)/time_conv[i]);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user