Commit b04303b0 authored by Jonathan Lambrechts's avatar Jonathan Lambrechts
Browse files

remove tau

parent f76a8a07
Pipeline #4793 passed with stage
in 23 seconds
......@@ -329,7 +329,6 @@ static void compute_stab_parameters(FluidProblem *problem, double dt) {
problem->element_size = realloc(problem->element_size,sizeof(double)*mesh->n_elements);
problem->taup = realloc(problem->taup,sizeof(double)*mesh->n_elements);
problem->tauc = realloc(problem->tauc,sizeof(double)*mesh->n_elements);
problem->taua = realloc(problem->taua,sizeof(double)*mesh->n_elements);
double maxtaup = 0;
double mintaup = DBL_MAX;
......@@ -379,7 +378,6 @@ static void compute_stab_parameters(FluidProblem *problem, double dt) {
double nu = mu/rho;
problem->taup[iel] = 1/sqrt(pow2(2/dt)+pow2(2*normu/h)+pow2(4*nu/pow2(h)));
problem->tauc[iel] = h*normu*fmin(h*normu/(6*nu),0.5);
problem->taua[iel] = 1/sqrt(pow2(2/dt)+pow2(2*normu/h));
}
}
......@@ -387,7 +385,6 @@ static void fluid_problem_f(FluidProblem *problem, double *f0, double *f1, doubl
double p = sol[P];
double taup = problem->taup[iel];
double tauc = problem->tauc[iel];
double taua = problem->taua[iel];
double u[D], uold[D], du[D][D], dp[D];
for (int iD = 0; iD < D; ++iD) {
u[iD] = sol[U+iD];
......@@ -974,7 +971,6 @@ FluidProblem *fluid_problem_new(double g, int n_fluids, double *mu, double *rho,
problem->mesh = NULL;
problem->taup = NULL;
problem->tauc = NULL;
problem->taua = NULL;
problem->element_size = NULL;
problem->porosity = NULL;
problem->oldporosity = NULL;
......@@ -1014,7 +1010,6 @@ void fluid_problem_free(FluidProblem *problem)
free(problem->particle_velocity);
free(problem->taup);
free(problem->tauc);
free(problem->taua);
free(problem->element_size);
for (int i = 0; i < problem->n_strong_boundaries; ++i)
free(problem->strong_boundaries[i].tag);
......
......@@ -86,7 +86,6 @@ struct FluidProblem {
//stabilisation coefficients
double *taup;
double *tauc;
double *taua;
int *particle_element_id;
};
......
......@@ -70,7 +70,7 @@ rhop = 1059
dt = .001 # time step
shutil.copy("mesh.msh", outputdir +"/mesh.msh")
genInitialPosition(outputdir, N, r, lx, ly, rhop)
#genInitialPosition(outputdir, N, r, lx, ly, rhop)
if use_lmgc:
friction=0.3
lmgc90Interface.scontactTolmgc90(outputdir, 2, 0, friction)
......@@ -86,7 +86,6 @@ ii = 0
t = 0
def outerBndV(x) :
v = 0.06631457341797832*4
print(v)
return v#0.265258#*min((6*t**5-15*t**4+10*t**3),1)
fluid = fluid.FluidProblem(2,g,[nu0*rho0,nu1*rho1],[rho0,rho1])
......@@ -95,6 +94,7 @@ fluid.set_wall_boundary("Bottom",pressure=None)
fluid.set_wall_boundary("Lateral",pressure=None)
fluid.set_open_boundary("Top",pressure=0,porosity=1,concentration=1)
fluid.set_open_boundary("Injection",velocity=[0,outerBndV],porosity=1,concentration=1)
#fluid.set_strong_boundary("Injection",1,outerBndV)
fluid.set_particles(p.mass(), p.volume(), p.position(), p.velocity())
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment