Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

refactor(NumericalSolution): refactor csv output #395

Merged
merged 2 commits into from
Apr 10, 2020
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
refactor(NumericalSolution): refactor csv output
Refactor csv output to save at the end of the each outer iteration. Add
options to save separate outer and inner iteration data.

closes #172
  • Loading branch information
jdhughes-usgs committed Apr 10, 2020
commit 15135f2f0790228ce2cc9f19d7e9cb363d4df55e
7 changes: 6 additions & 1 deletion autotest/test_gwf_mvr01.py
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,12 @@ def get_model(idx, dir):
save_flows=True, print_flows=True)

# create iterative model solution and register the gwf model with it
ims = flopy.mf6.ModflowIms(sim, print_option='SUMMARY',
csv0 = '{}.outer.ims.csv'.format(name)
csv1 = '{}.inner.ims.csv'.format(name)
ims = flopy.mf6.ModflowIms(sim,
csv_outer_output_filerecord=csv0,
csv_inner_output_filerecord=csv1,
print_option='SUMMARY',
outer_hclose=hclose,
outer_maximum=nouter,
under_relaxation='NONE',
Expand Down
45 changes: 39 additions & 6 deletions doc/mf6io/mf6ivar/dfn/sln-ims.dfn
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ longname print option
description is an optional keyword that defines default non-linear and linear solver parameters. SIMPLE - indicates that default solver input values will be defined that work well for nearly linear models. This would be used for models that do not include nonlinear stress packages and models that are either confined or consist of a single unconfined layer that is thick enough to contain the water table within a single layer. MODERATE - indicates that default solver input values will be defined that work well for moderately nonlinear models. This would be used for models that include nonlinear stress packages and models that consist of one or more unconfined layers. The MODERATE option should be used when the SIMPLE option does not result in successful convergence. COMPLEX - indicates that default solver input values will be defined that work well for highly nonlinear models. This would be used for models that include nonlinear stress packages and models that consist of one or more unconfined layers representing complex geology and surface-water/groundwater interaction. The COMPLEX option should be used when the MODERATE option does not result in successful convergence. Non-linear and linear solver parameters assigned using a specified complexity can be modified in the NONLINEAR and LINEAR blocks. If the COMPLEXITY option is not specified, NONLINEAR and LINEAR variables will be assigned the simple complexity values.

block options
name csv_output_filerecord
type record csv_output fileout csvfile
name csv_outer_output_filerecord
type record csv_outer_output fileout outer_csvfile
shape
reader urword
tagged true
Expand All @@ -27,15 +27,15 @@ longname
description

block options
name csv_output
name csv_outer_output
type keyword
shape
in_record true
reader urword
tagged true
optional false
longname budget keyword
description keyword to specify that the record corresponds to the comma separated values solver convergence output.
description keyword to specify that the record corresponds to the comma separated values outer iteration convergence output.

block options
name fileout
Expand All @@ -49,7 +49,40 @@ longname file keyword
description keyword to specify that an output filename is expected next.

block options
name csvfile
name outer_csvfile
type string
preserve_case true
shape
in_record true
reader urword
tagged false
optional false
longname file keyword
description name of the ascii comma separated values output file to write maximum head change convergence information at the end of each outer iteration for each time step.

block options
name csv_inner_output_filerecord
type record csv_inner_output fileout inner_csvfile
shape
reader urword
tagged true
optional true
longname
description

block options
name csv_inner_output
type keyword
shape
in_record true
reader urword
tagged true
optional false
longname budget keyword
description keyword to specify that the record corresponds to the comma separated values solver convergence output.

block options
name inner_csvfile
type string
preserve_case true
shape
Expand All @@ -58,7 +91,7 @@ reader urword
tagged false
optional false
longname file keyword
description name of the ascii comma separated values output file to write solver convergence information. If PRINT\_OPTION is NONE or SUMMARY, comma separated values output includes maximum head change convergence information at the end of each outer iteration for each time step. If PRINT\_OPTION is ALL, comma separated values output includes maximum head change and maximum residual convergence information for the solution and each model (if the solution includes more than one model) and linear acceleration information for each inner iteration.
description name of the ascii comma separated values output file to write solver convergence information. Comma separated values output includes maximum head change and maximum residual convergence information for the solution and each model (if the solution includes more than one model) and linear acceleration information for each inner iteration.

block options
name no_ptcrecord
Expand Down
Loading