[Common] Identify different parameterizations

parent e17afc5a
......@@ -117,7 +117,9 @@ function(create_default_config INPUT OUTPUT SOURCE_DIR CSS)
endfunction()
# copy BC & parameter files
file(COPY 2d_infiltr.bcdat 3d_infiltr.bcdat param.yml DESTINATION .)
file(COPY 2d_infiltr.bcdat 3d_infiltr.bcdat
richards_param.yml transport_param.yml
DESTINATION .)
# Random field generator
scrape_parameters(
......
......@@ -204,6 +204,7 @@ adding an empty line, make text **bold** or ``monospaced``.
<definition> YAML file containing the parameter definitions.
</definition>
<values> path </values>
<suggestion> richards_param.yml </suggestion>
</parameter>
</category>
......
volumes:
sand:
index: 0
type: MvG
water_flow:
type: MvG
parameters:
alpha: -2.3
n: 4.17
......@@ -9,10 +10,11 @@ volumes:
theta_r: 0.03
theta_s: 0.31
tau: -1.1
silt:
index: 1
type: MvG
water_flow:
type: MvG
parameters:
alpha: -0.7
n: 1.3
......
......@@ -195,6 +195,7 @@ adding an empty line, make text **bold** or ``monospaced``.
<definition> YAML file containing the parameter definitions.
</definition>
<values> path </values>
<suggestion> transport_param.yml </suggestion>
</parameter>
</category>
......
volumes:
sand:
index: 0
solute:
type: superposition
eff_diff:
type: milligton_quirk_1
eff_hydromechanic_disp:
type: isotropic
long_disp:
type: const
trans_disp:
type: const
parameters:
char_length: 1.5E-11
mol_diff: 2.E-9
phi: 0.34
lambda_t: 0.0025
lambda_l: 0.025
silt:
index: 1
solute:
type: superposition
eff_diff:
type: milligton_quirk_1
eff_hydromechanic_disp:
type: isotropic
long_disp:
type: const
trans_disp:
type: const
parameters:
char_length: 1.5E-11
mol_diff: 2.E-9
phi: 0.34
lambda_t: 0.0025
lambda_l: 0.025
\ No newline at end of file
......@@ -72,7 +72,7 @@ def run_transport(args):
sys.exit(1)
def create(args):
for f in ("config.ini", "parfield.ini", "2d_infiltr.bcdat", "3d_infiltr.bcdat", "param.yml"):
for f in ("config.ini", "parfield.ini", "2d_infiltr.bcdat", "3d_infiltr.bcdat", "richards_param.yml", "transport_param.yml"):
newfile = os.path.join(os.getcwd(),f)
if os.path.exists(newfile) and not args["force"]:
override = (input("File {} exists. Override? [Y/n] ".format(f)) or "Y") in ["Y","y"]
......
spatial_resolution_north 2 0.0 0.999
spatial_resolution_north 2 0.25 0.75
spatial_resolution_south 0
spatial_resolution_west -1
spatial_resolution_east -1
......
......@@ -44,7 +44,7 @@ output.vertexData = true
boundary.file = "{_asset_path}/bcs/infiltration_2d.dat", "{_asset_path}/bcs/infiltration_3d.dat" | expand dim
parameters.file = "{_asset_path}/param/param.yml"
parameters.file = "{_asset_path}/param/richards_param.yml"
time.end = 2E2
time.maxTimestep = 2E2
......
......@@ -13,12 +13,12 @@ simulation.mode = richards+transport
[grid]
gridType = rectangular
initialLevel = 0
cells = 1 160, 1 40, 1 20 | expand prec
cells = 40 40
[richards]
output.fileName = {__name}
output.outputPath = {__name}
output.fileName = {__name}-water
output.outputPath = {__name}-water
boundary.file = "{_asset_path}/bcs/infiltration_2d.dat"
......@@ -30,8 +30,8 @@ time.startTimestep = 1E3
[transport]
output.fileName = {__name}
output.outputPath = {__name}
output.fileName = {__name}-solute
output.outputPath = {__name}-solute
boundary.file = "{_asset_path}/bcs/solute_2d_{_input}.dat"
......
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