Commit 375f55c9 authored by Santiago Ospina's avatar Santiago Ospina
parent b64580a8
......@@ -206,7 +206,7 @@ public:
// Inside solute value
RF u = x_i(lfsu_i,0);
#if 0
#if 1
// Upwinding
u = (water_flux_n>=0) ? x_i(lfsu_i,0) : x_o(lfsu_o,0);
#endif
......@@ -314,11 +314,16 @@ public:
// Inside unknown value
RF u = x_i(lfsu_i,0);
// Solute flux in normal direction w.r.t the intersection
auto normal_flux = (g*water_flux_n)-(diff_coeff_i*sat_i*(g-u)/distance);
// Only allow dirichlet values for influx cases
if (water_flux_n<=0){
// Solute flux in normal direction w.r.t the intersection
auto normal_flux = (g*water_flux_n)-(diff_coeff_i*sat_i*(g-u)/distance);
// Contribution to residual from Dirichlet boundary
r_i.accumulate(lfsv_i, 0, normal_flux*face_volume);
}
// Contribution to residual from Dirichlet boundary
r_i.accumulate(lfsv_i, 0, normal_flux*face_volume);
}
else if (BoundaryCondition::isNeumann(bc))
{
......
......@@ -5,16 +5,17 @@ __name = test-simulation-dummy-transport
_test_command = run
_asset_path = "${CMAKE_CURRENT_LIST_DIR}/../../../test/"
grid.dimensions = 2, 3 | expand dim
grid.gridType = rectangular
grid.extensions = 1 1, 1 1 1 | expand dim
grid.cells = 40 40, 15 15 15 | expand dim
grid.initialLevel = 0
grid.cells = 40 40
grid.mappingFile = none
grid.globalIndex = 0
adaptivity.useAdaptivity = false
boundary.file = "{_asset_path}/bcs/infiltration_2d.dat"
boundary.file = "{_asset_path}/bcs/infiltration_2d.dat", "{_asset_path}/bcs/infiltration_3d.dat" | expand dim
parameters.file = "{_asset_path}/param/param.yml"
......@@ -24,12 +25,13 @@ output.fileName = test-simulation-dummy-transport | unique
output.outputPath = test-simulation-dummy-transport | unique
output.verbose = 0
boundary.file = "{_asset_path}/bcs/solute_2d.dat"
boundary.file = "{_asset_path}/bcs/solute_2d.dat", "{_asset_path}/bcs/solute_3d.dat" | expand dim
parameters.molecularDiffusion = 2E-9, 0 | expand prec
parameters.molecularDiffusion = 2E-9, 0 | expand diff
time.end = 1E8
time.end = 3E7
time.maxTimestep = 1E7
time.startTimestep = 1E4
numerics.timestepMethod = explicit_euler, implicit_euler | expand solver
\ No newline at end of file
numerics.timestepMethod = explicit_euler, implicit_euler | expand solver
numerics.courant = 0.1, 0.7 | expand diff
\ No newline at end of file
......@@ -9,7 +9,7 @@ except NameError:
pass
# paths set by cmake
DORIEDIR = "/home/saospina/Codes/DUNE_INSTALL/Debug/dorie"
DORIEDIR = "/home/saospina/Codes/DUNE_INSTALL/Release/dorie"
MPIEXEC = "/usr/bin/mpiexec"
MPIEXEC_NUMPROC_FLAG = "-n"
MPIEXEC_PREFLAG = ""
......
spatial_resolution_north 2 0.25 0.75
spatial_resolution_south 0
spatial_resolution_south -1
spatial_resolution_west -1
spatial_resolution_east -1
number_BC_change_times 2
0 dirichlet 0 dirichlet 1 dirichlet 0 dirichlet 0
1E7 dirichlet 0 dirichlet 0 dirichlet 0 dirichlet 0
\ No newline at end of file
0 neumann 0 dirichlet 1 neumann 0
1E7 neumann 0 neumann 0 neumann 0
\ No newline at end of file
spatial_resolution_north_we 2 0.25 0.75
spatial_resolution_north_fb 2 0.25 0.75
spatial_resolution_south_we -1
spatial_resolution_south_fb -1
spatial_resolution_west_sn -1
spatial_resolution_west_fb -1
spatial_resolution_east_sn -1
spatial_resolution_east_fb -1
spatial_resolution_front_sn -1
spatial_resolution_front_we -1
spatial_resolution_back_sn -1
spatial_resolution_back_we -1
number_BC_change_times 2
0 neumann 0 neumann 0 neumann 0 neumann 0 dirichlet 1 neumann 0 neumann 0 neumann 0 neumann 0
1E7 neumann 0 neumann 0 neumann 0 neumann 0 neumann 0 neumann 0 neumann 0 neumann 0 neumann 0
\ No newline at end of file
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