Commit 5c3d3d34 authored by Matthieu Constant's avatar Matthieu Constant
Browse files

conflict

parents b853fd25 3bfa54c4
Pipeline #3889 passed with stage
in 1 minute and 5 seconds
......@@ -481,7 +481,7 @@ static void compute_stab_parameters(FluidProblem *problem, double dt) {
problem->taup[iel] = 1/sqrt(pow2(6/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(6/dt)+pow2(2*normu/h));
problem->extraa[iel] = fmax(0.,fmax(-amin,amax-1))*1e-1;
problem->extraa[iel] = fmax(0.,fmax(-amin,amax-1))*0.03;
maxtaup = fmax(maxtaup, problem->taup[iel]);
mintaup = fmin(mintaup, problem->taup[iel]);
}
......
......@@ -70,7 +70,7 @@ ly = .14
rhop = 2500
#numerical parameters
lcmin = .1 # mesh size
dt = .001 # time step
dt = .00025 # time step
shutil.copy("mesh.msh", outputdir +"/mesh.msh")
genInitialPosition(outputdir, N, r, lx, ly, rhop)
......
......@@ -56,7 +56,7 @@ ly = .14
rhop = 2500
#numerical parameters
lcmin = .1 # mesh size
dt = .001 # time step
dt = .0005 # time step
iReload = 1270
......
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