From 35089238d489fa4a1b21b1b42dddc2fa83c31ac3 Mon Sep 17 00:00:00 2001 From: Joshua Larsen Date: Thu, 14 Nov 2019 17:14:18 -0700 Subject: [PATCH 1/3] fix(mfsfr2.py): isfropt and icalc read/write logic * added unit tests covering all combinations of isfropt and icalc to t010_test.py --- autotest/t010_test.py | 37 ++++++++++++-- examples/data/sfr_test/sfrtest.bas | 4 ++ examples/data/sfr_test/sfrtest.dis | 9 ++++ examples/data/sfr_test/sfrtest.lst | 75 ++++++++++++++++++++++++++++ examples/data/sfr_test/sfrtest.nwt | 1 + examples/data/sfr_test/sfrtest.upw | 10 ++++ examples/data/sfr_test/sfrtest00.nam | 6 +++ examples/data/sfr_test/sfrtest00.sfr | 23 +++++++++ examples/data/sfr_test/sfrtest01.nam | 6 +++ examples/data/sfr_test/sfrtest01.sfr | 23 +++++++++ examples/data/sfr_test/sfrtest02.nam | 6 +++ examples/data/sfr_test/sfrtest02.sfr | 29 +++++++++++ examples/data/sfr_test/sfrtest03.nam | 6 +++ examples/data/sfr_test/sfrtest03.sfr | 23 +++++++++ examples/data/sfr_test/sfrtest04.nam | 6 +++ examples/data/sfr_test/sfrtest04.sfr | 32 ++++++++++++ examples/data/sfr_test/sfrtest10.nam | 6 +++ examples/data/sfr_test/sfrtest10.sfr | 24 +++++++++ examples/data/sfr_test/sfrtest11.nam | 6 +++ examples/data/sfr_test/sfrtest11.sfr | 24 +++++++++ examples/data/sfr_test/sfrtest12.nam | 6 +++ examples/data/sfr_test/sfrtest12.sfr | 24 +++++++++ examples/data/sfr_test/sfrtest13.nam | 6 +++ examples/data/sfr_test/sfrtest13.sfr | 18 +++++++ examples/data/sfr_test/sfrtest14.nam | 6 +++ examples/data/sfr_test/sfrtest14.sfr | 27 ++++++++++ examples/data/sfr_test/sfrtest20.nam | 6 +++ examples/data/sfr_test/sfrtest20.sfr | 24 +++++++++ examples/data/sfr_test/sfrtest21.nam | 6 +++ examples/data/sfr_test/sfrtest21.sfr | 20 ++++++++ examples/data/sfr_test/sfrtest22.nam | 6 +++ examples/data/sfr_test/sfrtest22.sfr | 20 ++++++++ examples/data/sfr_test/sfrtest23.nam | 6 +++ examples/data/sfr_test/sfrtest23.sfr | 18 +++++++ examples/data/sfr_test/sfrtest24.nam | 6 +++ examples/data/sfr_test/sfrtest24.sfr | 27 ++++++++++ examples/data/sfr_test/sfrtest30.nam | 6 +++ examples/data/sfr_test/sfrtest30.sfr | 24 +++++++++ examples/data/sfr_test/sfrtest31.nam | 6 +++ examples/data/sfr_test/sfrtest31.sfr | 20 ++++++++ examples/data/sfr_test/sfrtest32.nam | 6 +++ examples/data/sfr_test/sfrtest32.sfr | 20 ++++++++ examples/data/sfr_test/sfrtest33.nam | 6 +++ examples/data/sfr_test/sfrtest33.sfr | 18 +++++++ examples/data/sfr_test/sfrtest34.nam | 6 +++ examples/data/sfr_test/sfrtest34.sfr | 27 ++++++++++ examples/data/sfr_test/sfrtest40.nam | 6 +++ examples/data/sfr_test/sfrtest40.sfr | 24 +++++++++ examples/data/sfr_test/sfrtest41.nam | 6 +++ examples/data/sfr_test/sfrtest41.sfr | 24 +++++++++ examples/data/sfr_test/sfrtest42.nam | 6 +++ examples/data/sfr_test/sfrtest42.sfr | 26 ++++++++++ examples/data/sfr_test/sfrtest43.nam | 6 +++ examples/data/sfr_test/sfrtest43.sfr | 24 +++++++++ examples/data/sfr_test/sfrtest44.nam | 6 +++ examples/data/sfr_test/sfrtest44.sfr | 33 ++++++++++++ examples/data/sfr_test/sfrtest50.nam | 6 +++ examples/data/sfr_test/sfrtest50.sfr | 24 +++++++++ examples/data/sfr_test/sfrtest51.nam | 6 +++ examples/data/sfr_test/sfrtest51.sfr | 24 +++++++++ examples/data/sfr_test/sfrtest52.nam | 6 +++ examples/data/sfr_test/sfrtest52.sfr | 26 ++++++++++ examples/data/sfr_test/sfrtest53.nam | 6 +++ examples/data/sfr_test/sfrtest53.sfr | 24 +++++++++ examples/data/sfr_test/sfrtest54.nam | 6 +++ examples/data/sfr_test/sfrtest54.sfr | 33 ++++++++++++ flopy/modflow/mfsfr2.py | 54 ++++++++++++-------- 67 files changed, 1071 insertions(+), 26 deletions(-) create mode 100644 examples/data/sfr_test/sfrtest.bas create mode 100644 examples/data/sfr_test/sfrtest.dis create mode 100644 examples/data/sfr_test/sfrtest.lst create mode 100644 examples/data/sfr_test/sfrtest.nwt create mode 100644 examples/data/sfr_test/sfrtest.upw create mode 100644 examples/data/sfr_test/sfrtest00.nam create mode 100644 examples/data/sfr_test/sfrtest00.sfr create mode 100644 examples/data/sfr_test/sfrtest01.nam create mode 100644 examples/data/sfr_test/sfrtest01.sfr create mode 100644 examples/data/sfr_test/sfrtest02.nam create mode 100644 examples/data/sfr_test/sfrtest02.sfr create mode 100644 examples/data/sfr_test/sfrtest03.nam create mode 100644 examples/data/sfr_test/sfrtest03.sfr create mode 100644 examples/data/sfr_test/sfrtest04.nam create mode 100644 examples/data/sfr_test/sfrtest04.sfr create mode 100644 examples/data/sfr_test/sfrtest10.nam create mode 100644 examples/data/sfr_test/sfrtest10.sfr create mode 100644 examples/data/sfr_test/sfrtest11.nam create mode 100644 examples/data/sfr_test/sfrtest11.sfr create mode 100644 examples/data/sfr_test/sfrtest12.nam create mode 100644 examples/data/sfr_test/sfrtest12.sfr create mode 100644 examples/data/sfr_test/sfrtest13.nam create mode 100644 examples/data/sfr_test/sfrtest13.sfr create mode 100644 examples/data/sfr_test/sfrtest14.nam create mode 100644 examples/data/sfr_test/sfrtest14.sfr create mode 100644 examples/data/sfr_test/sfrtest20.nam create mode 100644 examples/data/sfr_test/sfrtest20.sfr create mode 100644 examples/data/sfr_test/sfrtest21.nam create mode 100644 examples/data/sfr_test/sfrtest21.sfr create mode 100644 examples/data/sfr_test/sfrtest22.nam create mode 100644 examples/data/sfr_test/sfrtest22.sfr create mode 100644 examples/data/sfr_test/sfrtest23.nam create mode 100644 examples/data/sfr_test/sfrtest23.sfr create mode 100644 examples/data/sfr_test/sfrtest24.nam create mode 100644 examples/data/sfr_test/sfrtest24.sfr create mode 100644 examples/data/sfr_test/sfrtest30.nam create mode 100644 examples/data/sfr_test/sfrtest30.sfr create mode 100644 examples/data/sfr_test/sfrtest31.nam create mode 100644 examples/data/sfr_test/sfrtest31.sfr create mode 100644 examples/data/sfr_test/sfrtest32.nam create mode 100644 examples/data/sfr_test/sfrtest32.sfr create mode 100644 examples/data/sfr_test/sfrtest33.nam create mode 100644 examples/data/sfr_test/sfrtest33.sfr create mode 100644 examples/data/sfr_test/sfrtest34.nam create mode 100644 examples/data/sfr_test/sfrtest34.sfr create mode 100644 examples/data/sfr_test/sfrtest40.nam create mode 100644 examples/data/sfr_test/sfrtest40.sfr create mode 100644 examples/data/sfr_test/sfrtest41.nam create mode 100644 examples/data/sfr_test/sfrtest41.sfr create mode 100644 examples/data/sfr_test/sfrtest42.nam create mode 100644 examples/data/sfr_test/sfrtest42.sfr create mode 100644 examples/data/sfr_test/sfrtest43.nam create mode 100644 examples/data/sfr_test/sfrtest43.sfr create mode 100644 examples/data/sfr_test/sfrtest44.nam create mode 100644 examples/data/sfr_test/sfrtest44.sfr create mode 100644 examples/data/sfr_test/sfrtest50.nam create mode 100644 examples/data/sfr_test/sfrtest50.sfr create mode 100644 examples/data/sfr_test/sfrtest51.nam create mode 100644 examples/data/sfr_test/sfrtest51.sfr create mode 100644 examples/data/sfr_test/sfrtest52.nam create mode 100644 examples/data/sfr_test/sfrtest52.sfr create mode 100644 examples/data/sfr_test/sfrtest53.nam create mode 100644 examples/data/sfr_test/sfrtest53.sfr create mode 100644 examples/data/sfr_test/sfrtest54.nam create mode 100644 examples/data/sfr_test/sfrtest54.sfr diff --git a/autotest/t010_test.py b/autotest/t010_test.py index 1587ec80eb..6271a73892 100644 --- a/autotest/t010_test.py +++ b/autotest/t010_test.py @@ -40,7 +40,7 @@ def load_check_sfr(i, mfnam, model_ws, checker_output_path): m = flopy.modflow.Modflow.load(mfnam, model_ws=model_ws) m.model_ws = checker_output_path checker_outfile = os.path.join(tpth, 'SFRcheck_{}.txt'.format(m.name)) - + chk = m.sfr.check(checker_outfile, level=1) if i == 1: @@ -59,7 +59,7 @@ def test_sfrcheck(): m.model_ws= cpth fpth = 'SFRchecker_results.txt' m.sfr.check(fpth, level=0) - + # test checks without modifications chk = check(m.sfr) chk.numbering() @@ -73,11 +73,11 @@ def test_sfrcheck(): assert test in chk.passed chk.slope() assert 'minimum slope' in chk.passed - + # create gaps in segment numbering m.sfr.segment_data[0]['nseg'][-1] += 1 m.sfr.reach_data['ireach'][3] += 1 - + # create circular routing instance m.sfr.segment_data[0]['outseg'][0] = 1 m.sfr._graph = None # weak, but the above shouldn't happen @@ -111,15 +111,42 @@ def test_sfrcheck(): chk.elevations() assert 'maximum streambed top' in chk.warnings assert True - + def test_sfrloadcheck(): for i, case in sfr_items.items(): yield load_check_sfr, i, case['mfnam'], path, cpth +def load_sfr_isfropt_icalc(isfropt, icalc): + pth = os.path.join("..", "examples", "data", "sfr_test") + nam = "sfrtest{}{}.nam".format(isfropt, icalc) + ml = flopy.modflow.Modflow.load(nam, check=False, model_ws=pth, + exe_name="mfnwt.exe") + sfr = ml.get_package("SFR") + if sfr is None: + raise AssertionError() + + ml.change_model_ws(tpth) + ml.write_input() + success = ml.run_model()[0] + if not success: + raise AssertionError("sfrtest{}{}.nam".format(isfropt, icalc) + + "is broken, please fix SFR 6a, 6bc logic!") + + +def test_isfropt_icalc(): + # test all valid combinations of isfropt and icalc + for isfropt in range(6): + for icalc in range(5): + yield load_sfr_isfropt_icalc, isfropt, icalc + if __name__ == '__main__': test_sfrcheck() for i, case in sfr_items.items(): load_check_sfr(i, case['mfnam'], path, cpth) + + for isfropt in range(6): + for icalc in range(5): + load_sfr_isfropt_icalc(isfropt, icalc) \ No newline at end of file diff --git a/examples/data/sfr_test/sfrtest.bas b/examples/data/sfr_test/sfrtest.bas new file mode 100644 index 0000000000..126f4d3092 --- /dev/null +++ b/examples/data/sfr_test/sfrtest.bas @@ -0,0 +1,4 @@ +FREE +CONSTANT 1 +-999 +CONSTANT 1000. diff --git a/examples/data/sfr_test/sfrtest.dis b/examples/data/sfr_test/sfrtest.dis new file mode 100644 index 0000000000..f4a0bd5d55 --- /dev/null +++ b/examples/data/sfr_test/sfrtest.dis @@ -0,0 +1,9 @@ +1 10 10 3 4 2 +0 +CONSTANT 100 +CONSTANT 100 +CONSTANT 1000. +CONSTANT 0. +365 365 1. TR +365 365 1. TR +365 365 1. TR \ No newline at end of file diff --git a/examples/data/sfr_test/sfrtest.lst b/examples/data/sfr_test/sfrtest.lst new file mode 100644 index 0000000000..e1346b8a51 --- /dev/null +++ b/examples/data/sfr_test/sfrtest.lst @@ -0,0 +1,75 @@ + MODFLOW-NWT-SWR1 + U.S. GEOLOGICAL SURVEY MODULAR FINITE-DIFFERENCE GROUNDWATER-FLOW MODEL + VERSION 1.1.4 4/01/2018 + BASED ON MODFLOW-2005 VERSION 1.12.00 02/03/2017 + + LIST FILE: sfrtest.lst + UNIT 2 + + OPENING sfrtest.bas + FILE TYPE:BAS6 UNIT 8 STATUS:OLD + FORMAT:FORMATTED ACCESS:SEQUENTIAL + + OPENING sfrtest.dis + FILE TYPE:DIS UNIT 9 STATUS:OLD + FORMAT:FORMATTED ACCESS:SEQUENTIAL + + OPENING sfrtest.upw + FILE TYPE:UPW UNIT 10 STATUS:OLD + FORMAT:FORMATTED ACCESS:SEQUENTIAL + + OPENING sfrtest13.sfr + FILE TYPE:SFR UNIT 11 STATUS:OLD + FORMAT:FORMATTED ACCESS:SEQUENTIAL + + BAS -- BASIC PACKAGE, VERSION 1.1.4, 4/01/2018 INPUT READ FROM UNIT 8 + + MODFLOW was compiled using mixed precision + Precision of REAL variables: 6 + Precision of DOUBLE PRECISION variables: 15 + + DISCRETIZATION INPUT DATA READ FROM UNIT 9 + 1 LAYERS 10 ROWS 10 COLUMNS + 3 STRESS PERIOD(S) IN SIMULATION + MODEL TIME UNIT IS DAYS + MODEL LENGTH UNIT IS METERS + Confining bed flag for each layer: + 0 + + DELR = 100.000 + + DELC = 100.000 + + TOP ELEVATION OF LAYER 1 = 1000.00 + + MODEL LAYER BOTTOM EL. = 0.00000 FOR LAYER 1 + + + STRESS PERIOD LENGTH TIME STEPS MULTIPLIER FOR DELT SS FLAG + ---------------------------------------------------------------------------- + 1 365.0000 365 1.000 SS + 2 365.0000 365 1.000 TR + 3 365.0000 365 1.000 TR + + COMBINED STEADY-STATE AND TRANSIENT SIMULATION + + + + + THE FREE FORMAT OPTION HAS BEEN SELECTED + + BOUNDARY ARRAY = 1 FOR LAYER 1 + + AQUIFER HEAD WILL BE SET TO -999.00 AT ALL NO-FLOW NODES (IBOUND=0). + + INITIAL HEAD = 1000.00 FOR LAYER 1 + + DEFAULT OUTPUT CONTROL + THE FOLLOWING OUTPUT COMES AT THE END OF EACH STRESS PERIOD: + TOTAL VOLUMETRIC BUDGET + HEAD + + UPW1 -- UPSTREAM WEIGHTING FLOW PACKAGE, VERSION 1.1.4, 4/01/2018 + INPUT READ FROM UNIT 10 + + No named parameters diff --git a/examples/data/sfr_test/sfrtest.nwt b/examples/data/sfr_test/sfrtest.nwt new file mode 100644 index 0000000000..f865534ca1 --- /dev/null +++ b/examples/data/sfr_test/sfrtest.nwt @@ -0,0 +1 @@ + 1 10 2000 1E-007 2 1 1 COMPLEX CONTINUE \ No newline at end of file diff --git a/examples/data/sfr_test/sfrtest.upw b/examples/data/sfr_test/sfrtest.upw new file mode 100644 index 0000000000..351e70b79d --- /dev/null +++ b/examples/data/sfr_test/sfrtest.upw @@ -0,0 +1,10 @@ +-1 -999.0 0 1 +1 +0 +1 +1 +0 +CONSTANT 2.0 +CONSTANT 0.2 +CONSTANT 1E-06 +CONSTANT 0.1 diff --git a/examples/data/sfr_test/sfrtest00.nam b/examples/data/sfr_test/sfrtest00.nam new file mode 100644 index 0000000000..bd9986cfdf --- /dev/null +++ b/examples/data/sfr_test/sfrtest00.nam @@ -0,0 +1,6 @@ +LIST 2 sfrtest.lst +BAS6 8 sfrtest.bas +DIS 9 sfrtest.dis +UPW 7 sfrtest.upw +NWT 10 sfrtest.nwt +SFR 11 sfrtest00.sfr \ No newline at end of file diff --git a/examples/data/sfr_test/sfrtest00.sfr b/examples/data/sfr_test/sfrtest00.sfr new file mode 100644 index 0000000000..21bc7a1708 --- /dev/null +++ b/examples/data/sfr_test/sfrtest00.sfr @@ -0,0 +1,23 @@ +10 1 0 0 86400.0 0.0001 -1 0 0 15 1 30 +1 5 1 1 1 150 1000 0.1 2 45 0.3 0.25 5 10 +1 5 2 1 2 150 1000 0.1 2 45 0.3 0.25 5 10 +1 5 3 1 3 150 1000 0.1 2 45 0.3 0.25 5 10 +1 5 4 1 4 150 1000 0.1 2 45 0.3 0.25 5 10 +1 5 5 1 5 150 1000 0.1 2 45 0.3 0.25 5 10 +1 5 6 1 6 150 1000 0.1 2 45 0.3 0.25 5 10 +1 5 7 1 7 150 1000 0.1 2 45 0.3 0.25 5 10 +1 5 8 1 8 150 1000 0.1 2 45 0.3 0.25 5 10 +1 5 9 1 9 150 1000 0.1 2 45 0.3 0.25 5 10 +1 5 10 1 10 150 1000 0.1 2 45 0.3 0.25 5 10 +1 1 1 +1 0 0 0 100 50 0 0 +45 5 1000 20 1 +45 5 999 20 1 +1 1 1 +1 0 0 0 100 50 0 0 +45 5 1000 20 1 +45 5 999 20 1 +1 1 1 +1 0 0 0 100 50 0 0 +45 5 1000 20 1 +45 5 999 20 1 \ No newline at end of file diff --git a/examples/data/sfr_test/sfrtest01.nam b/examples/data/sfr_test/sfrtest01.nam new file mode 100644 index 0000000000..0cbc5afe7f --- /dev/null +++ b/examples/data/sfr_test/sfrtest01.nam @@ -0,0 +1,6 @@ +LIST 2 sfrtest.lst +BAS6 8 sfrtest.bas +DIS 9 sfrtest.dis +UPW 10 sfrtest.upw +SFR 11 sfrtest01.sfr +NWT 12 sfrtest.nwt \ No newline at end of file diff --git a/examples/data/sfr_test/sfrtest01.sfr b/examples/data/sfr_test/sfrtest01.sfr new file mode 100644 index 0000000000..f2ca6c47d3 --- /dev/null +++ b/examples/data/sfr_test/sfrtest01.sfr @@ -0,0 +1,23 @@ +10 1 0 0 86400.0 0.0001 -1 0 0 15 1 30 +1 5 1 1 1 150 1000 0.1 2 45 0.3 0.25 5 10 +1 5 2 1 2 150 1000 0.1 2 45 0.3 0.25 5 10 +1 5 3 1 3 150 1000 0.1 2 45 0.3 0.25 5 10 +1 5 4 1 4 150 1000 0.1 2 45 0.3 0.25 5 10 +1 5 5 1 5 150 1000 0.1 2 45 0.3 0.25 5 10 +1 5 6 1 6 150 1000 0.1 2 45 0.3 0.25 5 10 +1 5 7 1 7 150 1000 0.1 2 45 0.3 0.25 5 10 +1 5 8 1 8 150 1000 0.1 2 45 0.3 0.25 5 10 +1 5 9 1 9 150 1000 0.1 2 45 0.3 0.25 5 10 +1 5 10 1 10 150 1000 0.1 2 45 0.3 0.25 5 10 +1 1 1 +1 1 0 0 100 50 0 0 0.25 +45 5 1000 20 +45 5 999 20 +1 1 1 +1 1 0 0 100 50 0 0 0.25 +45 5 1000 20 +45 5 999 20 +1 1 1 +1 1 0 0 100 50 0 0 0.25 +45 5 1000 20 +45 5 999 20 \ No newline at end of file diff --git a/examples/data/sfr_test/sfrtest02.nam b/examples/data/sfr_test/sfrtest02.nam new file mode 100644 index 0000000000..28b91ee54d --- /dev/null +++ b/examples/data/sfr_test/sfrtest02.nam @@ -0,0 +1,6 @@ +LIST 2 sfrtest.lst +BAS6 8 sfrtest.bas +DIS 9 sfrtest.dis +UPW 10 sfrtest.upw +SFR 11 sfrtest02.sfr +NWT 12 sfrtest.nwt \ No newline at end of file diff --git a/examples/data/sfr_test/sfrtest02.sfr b/examples/data/sfr_test/sfrtest02.sfr new file mode 100644 index 0000000000..6babf41829 --- /dev/null +++ b/examples/data/sfr_test/sfrtest02.sfr @@ -0,0 +1,29 @@ +10 1 0 0 86400.0 0.0001 -1 0 0 15 1 30 +1 5 1 1 1 150 1000 0.1 2 45 0.3 0.25 5 10 +1 5 2 1 2 150 1000 0.1 2 45 0.3 0.25 5 10 +1 5 3 1 3 150 1000 0.1 2 45 0.3 0.25 5 10 +1 5 4 1 4 150 1000 0.1 2 45 0.3 0.25 5 10 +1 5 5 1 5 150 1000 0.1 2 45 0.3 0.25 5 10 +1 5 6 1 6 150 1000 0.1 2 45 0.3 0.25 5 10 +1 5 7 1 7 150 1000 0.1 2 45 0.3 0.25 5 10 +1 5 8 1 8 150 1000 0.1 2 45 0.3 0.25 5 10 +1 5 9 1 9 150 1000 0.1 2 45 0.3 0.25 5 10 +1 5 10 1 10 150 1000 0.1 2 45 0.3 0.25 5 10 +1 1 1 +1 2 0 0 100 50 0 0 0.25 0.50 +45 5 1000 +45 5 999 +0.0 0.2 0.3 0.4 0.6 0.7 0.8 1.0 +10 9 7 3 3 7 9 10 +1 1 1 +1 2 0 0 100 50 0 0 0.25 0.50 +45 5 1000 +45 5 999 +0.0 0.2 0.3 0.4 0.6 0.7 0.8 1.0 +10 9 7 3 3 7 9 10 +1 1 1 +1 2 0 0 100 50 0 0 0.25 0.50 +45 5 1000 +45 5 999 +0.0 0.2 0.3 0.4 0.6 0.7 0.8 1.0 +10 9 7 3 3 7 9 10 \ No newline at end of file diff --git a/examples/data/sfr_test/sfrtest03.nam b/examples/data/sfr_test/sfrtest03.nam new file mode 100644 index 0000000000..33b99d32ac --- /dev/null +++ b/examples/data/sfr_test/sfrtest03.nam @@ -0,0 +1,6 @@ +LIST 2 sfrtest.lst +BAS6 8 sfrtest.bas +DIS 9 sfrtest.dis +UPW 10 sfrtest.upw +SFR 11 sfrtest03.sfr +NWT 12 sfrtest.nwt \ No newline at end of file diff --git a/examples/data/sfr_test/sfrtest03.sfr b/examples/data/sfr_test/sfrtest03.sfr new file mode 100644 index 0000000000..6e65aeeaa7 --- /dev/null +++ b/examples/data/sfr_test/sfrtest03.sfr @@ -0,0 +1,23 @@ +10 1 0 0 86400.0 0.0001 -1 0 0 15 1 30 +1 5 1 1 1 150 1000 0.1 2 45 0.3 0.25 5 10 +1 5 2 1 2 150 1000 0.1 2 45 0.3 0.25 5 10 +1 5 3 1 3 150 1000 0.1 2 45 0.3 0.25 5 10 +1 5 4 1 4 150 1000 0.1 2 45 0.3 0.25 5 10 +1 5 5 1 5 150 1000 0.1 2 45 0.3 0.25 5 10 +1 5 6 1 6 150 1000 0.1 2 45 0.3 0.25 5 10 +1 5 7 1 7 150 1000 0.1 2 45 0.3 0.25 5 10 +1 5 8 1 8 150 1000 0.1 2 45 0.3 0.25 5 10 +1 5 9 1 9 150 1000 0.1 2 45 0.3 0.25 5 10 +1 5 10 1 10 150 1000 0.1 2 45 0.3 0.25 5 10 +1 1 1 +1 3 0 0 100 50 0 0 1 0.1 1 0.1 +45 5 1000 +45 5 999 +1 1 1 +1 3 0 0 100 50 0 0 1 0.1 1 0.1 +45 5 1000 +45 5 999 +1 1 1 +1 3 0 0 100 50 0 0 1 0.1 1 0.1 +45 5 1000 +45 5 999 \ No newline at end of file diff --git a/examples/data/sfr_test/sfrtest04.nam b/examples/data/sfr_test/sfrtest04.nam new file mode 100644 index 0000000000..ad3f9f5110 --- /dev/null +++ b/examples/data/sfr_test/sfrtest04.nam @@ -0,0 +1,6 @@ +LIST 2 sfrtest.lst +BAS6 8 sfrtest.bas +DIS 9 sfrtest.dis +UPW 10 sfrtest.upw +SFR 11 sfrtest04.sfr +NWT 12 sfrtest.nwt \ No newline at end of file diff --git a/examples/data/sfr_test/sfrtest04.sfr b/examples/data/sfr_test/sfrtest04.sfr new file mode 100644 index 0000000000..7287d9274c --- /dev/null +++ b/examples/data/sfr_test/sfrtest04.sfr @@ -0,0 +1,32 @@ +10 1 0 0 86400.0 0.0001 -1 0 0 15 1 30 +1 5 1 1 1 150 1000 0.1 2 45 0.3 0.25 5 10 +1 5 2 1 2 150 1000 0.1 2 45 0.3 0.25 5 10 +1 5 3 1 3 150 1000 0.1 2 45 0.3 0.25 5 10 +1 5 4 1 4 150 1000 0.1 2 45 0.3 0.25 5 10 +1 5 5 1 5 150 1000 0.1 2 45 0.3 0.25 5 10 +1 5 6 1 6 150 1000 0.1 2 45 0.3 0.25 5 10 +1 5 7 1 7 150 1000 0.1 2 45 0.3 0.25 5 10 +1 5 8 1 8 150 1000 0.1 2 45 0.3 0.25 5 10 +1 5 9 1 9 150 1000 0.1 2 45 0.3 0.25 5 10 +1 5 10 1 10 150 1000 0.1 2 45 0.3 0.25 5 10 +1 1 1 +1 4 0 0 2 100 50 0 0 +45 5 1000 +45 5 999 +10 100 +1 2 +4 8 +1 1 1 +1 4 0 0 2 100 50 0 0 +45 5 1000 +45 5 999 +10 100 +1 2 +4 8 +1 1 1 +1 4 0 0 2 100 50 0 0 +45 5 1000 +45 5 999 +10 100 +1 2 +4 8 \ No newline at end of file diff --git a/examples/data/sfr_test/sfrtest10.nam b/examples/data/sfr_test/sfrtest10.nam new file mode 100644 index 0000000000..61e5769c46 --- /dev/null +++ b/examples/data/sfr_test/sfrtest10.nam @@ -0,0 +1,6 @@ +LIST 2 sfrtest.lst +BAS6 8 sfrtest.bas +DIS 9 sfrtest.dis +UPW 10 sfrtest.upw +SFR 11 sfrtest10.sfr +NWT 12 sfrtest.nwt \ No newline at end of file diff --git a/examples/data/sfr_test/sfrtest10.sfr b/examples/data/sfr_test/sfrtest10.sfr new file mode 100644 index 0000000000..ac09d03ab5 --- /dev/null +++ b/examples/data/sfr_test/sfrtest10.sfr @@ -0,0 +1,24 @@ +REACHINPUT +10 1 0 0 86400.0 0.0001 -1 0 1 15 1 30 +1 5 1 1 1 150 1000 0.1 2 45 0.3 0.25 5 10 +1 5 2 1 2 150 1000 0.1 2 45 0.3 0.25 5 10 +1 5 3 1 3 150 1000 0.1 2 45 0.3 0.25 5 10 +1 5 4 1 4 150 1000 0.1 2 45 0.3 0.25 5 10 +1 5 5 1 5 150 1000 0.1 2 45 0.3 0.25 5 10 +1 5 6 1 6 150 1000 0.1 2 45 0.3 0.25 5 10 +1 5 7 1 7 150 1000 0.1 2 45 0.3 0.25 5 10 +1 5 8 1 8 150 1000 0.1 2 45 0.3 0.25 5 10 +1 5 9 1 9 150 1000 0.1 2 45 0.3 0.25 5 10 +1 5 10 1 10 150 1000 0.1 2 45 0.3 0.25 5 10 +1 1 1 +1 0 0 0 100 50 0 0 +20 1 +20 1 +1 1 1 +1 0 0 0 100 50 0 0 +20 1 +20 1 +1 1 1 +1 0 0 0 100 50 0 0 +20 1 +20 1 \ No newline at end of file diff --git a/examples/data/sfr_test/sfrtest11.nam b/examples/data/sfr_test/sfrtest11.nam new file mode 100644 index 0000000000..9a5c52729d --- /dev/null +++ b/examples/data/sfr_test/sfrtest11.nam @@ -0,0 +1,6 @@ +LIST 2 sfrtest.lst +BAS6 8 sfrtest.bas +DIS 9 sfrtest.dis +UPW 10 sfrtest.upw +SFR 11 sfrtest11.sfr +NWT 12 sfrtest.nwt \ No newline at end of file diff --git a/examples/data/sfr_test/sfrtest11.sfr b/examples/data/sfr_test/sfrtest11.sfr new file mode 100644 index 0000000000..f48fdbcf3c --- /dev/null +++ b/examples/data/sfr_test/sfrtest11.sfr @@ -0,0 +1,24 @@ +REACHINPUT +10 1 0 0 86400.0 0.0001 -1 0 1 15 1 30 +1 5 1 1 1 150 1000 0.1 2 45 0.3 0.25 5 10 +1 5 2 1 2 150 1000 0.1 2 45 0.3 0.25 5 10 +1 5 3 1 3 150 1000 0.1 2 45 0.3 0.25 5 10 +1 5 4 1 4 150 1000 0.1 2 45 0.3 0.25 5 10 +1 5 5 1 5 150 1000 0.1 2 45 0.3 0.25 5 10 +1 5 6 1 6 150 1000 0.1 2 45 0.3 0.25 5 10 +1 5 7 1 7 150 1000 0.1 2 45 0.3 0.25 5 10 +1 5 8 1 8 150 1000 0.1 2 45 0.3 0.25 5 10 +1 5 9 1 9 150 1000 0.1 2 45 0.3 0.25 5 10 +1 5 10 1 10 150 1000 0.1 2 45 0.3 0.25 5 10 +1 1 1 +1 1 0 0 100 50 0 0 0.25 +20 +20 +1 1 1 +1 1 0 0 100 50 0 0 0.25 +20 +20 +1 1 1 +1 1 0 0 100 50 0 0 0.25 +20 +20 diff --git a/examples/data/sfr_test/sfrtest12.nam b/examples/data/sfr_test/sfrtest12.nam new file mode 100644 index 0000000000..9d4901dfbe --- /dev/null +++ b/examples/data/sfr_test/sfrtest12.nam @@ -0,0 +1,6 @@ +LIST 2 sfrtest.lst +BAS6 8 sfrtest.bas +DIS 9 sfrtest.dis +UPW 10 sfrtest.upw +SFR 11 sfrtest12.sfr +NWT 12 sfrtest.nwt \ No newline at end of file diff --git a/examples/data/sfr_test/sfrtest12.sfr b/examples/data/sfr_test/sfrtest12.sfr new file mode 100644 index 0000000000..f370751f3d --- /dev/null +++ b/examples/data/sfr_test/sfrtest12.sfr @@ -0,0 +1,24 @@ +REACHINPUT +10 1 0 0 86400.0 0.0001 -1 0 1 15 1 30 +1 5 1 1 1 150 1000 0.1 2 45 0.3 0.25 5 10 +1 5 2 1 2 150 1000 0.1 2 45 0.3 0.25 5 10 +1 5 3 1 3 150 1000 0.1 2 45 0.3 0.25 5 10 +1 5 4 1 4 150 1000 0.1 2 45 0.3 0.25 5 10 +1 5 5 1 5 150 1000 0.1 2 45 0.3 0.25 5 10 +1 5 6 1 6 150 1000 0.1 2 45 0.3 0.25 5 10 +1 5 7 1 7 150 1000 0.1 2 45 0.3 0.25 5 10 +1 5 8 1 8 150 1000 0.1 2 45 0.3 0.25 5 10 +1 5 9 1 9 150 1000 0.1 2 45 0.3 0.25 5 10 +1 5 10 1 10 150 1000 0.1 2 45 0.3 0.25 5 10 +1 1 1 +1 2 0 0 100 50 0 0 0.25 0.50 +0.0 0.2 0.3 0.4 0.6 0.7 0.8 1.0 +10 9 7 3 3 7 9 10 +1 1 1 +1 2 0 0 100 50 0 0 0.25 0.50 +0.0 0.2 0.3 0.4 0.6 0.7 0.8 1.0 +10 9 7 3 3 7 9 10 +1 1 1 +1 2 0 0 100 50 0 0 0.25 0.50 +0.0 0.2 0.3 0.4 0.6 0.7 0.8 1.0 +10 9 7 3 3 7 9 10 \ No newline at end of file diff --git a/examples/data/sfr_test/sfrtest13.nam b/examples/data/sfr_test/sfrtest13.nam new file mode 100644 index 0000000000..e06fd8efd8 --- /dev/null +++ b/examples/data/sfr_test/sfrtest13.nam @@ -0,0 +1,6 @@ +LIST 2 sfrtest.lst +BAS6 8 sfrtest.bas +DIS 9 sfrtest.dis +UPW 10 sfrtest.upw +SFR 11 sfrtest13.sfr +NWT 12 sfrtest.nwt \ No newline at end of file diff --git a/examples/data/sfr_test/sfrtest13.sfr b/examples/data/sfr_test/sfrtest13.sfr new file mode 100644 index 0000000000..7ec36b9f7d --- /dev/null +++ b/examples/data/sfr_test/sfrtest13.sfr @@ -0,0 +1,18 @@ +REACHINPUT +10 1 0 0 86400.0 0.0001 -1 0 1 15 1 30 +1 5 1 1 1 150 1000 0.1 2 45 0.3 0.25 5 10 +1 5 2 1 2 150 1000 0.1 2 45 0.3 0.25 5 10 +1 5 3 1 3 150 1000 0.1 2 45 0.3 0.25 5 10 +1 5 4 1 4 150 1000 0.1 2 45 0.3 0.25 5 10 +1 5 5 1 5 150 1000 0.1 2 45 0.3 0.25 5 10 +1 5 6 1 6 150 1000 0.1 2 45 0.3 0.25 5 10 +1 5 7 1 7 150 1000 0.1 2 45 0.3 0.25 5 10 +1 5 8 1 8 150 1000 0.1 2 45 0.3 0.25 5 10 +1 5 9 1 9 150 1000 0.1 2 45 0.3 0.25 5 10 +1 5 10 1 10 150 1000 0.1 2 45 0.3 0.25 5 10 +1 1 1 +1 3 0 0 100 50 0 0 1 0.1 1 0.1 +1 1 1 +1 3 0 0 100 50 0 0 1 0.1 1 0.1 +1 1 1 +1 3 0 0 100 50 0 0 1 0.1 1 0.1 \ No newline at end of file diff --git a/examples/data/sfr_test/sfrtest14.nam b/examples/data/sfr_test/sfrtest14.nam new file mode 100644 index 0000000000..f95dbec921 --- /dev/null +++ b/examples/data/sfr_test/sfrtest14.nam @@ -0,0 +1,6 @@ +LIST 2 sfrtest.lst +BAS6 8 sfrtest.bas +DIS 9 sfrtest.dis +UPW 10 sfrtest.upw +SFR 11 sfrtest14.sfr +NWT 12 sfrtest.nwt \ No newline at end of file diff --git a/examples/data/sfr_test/sfrtest14.sfr b/examples/data/sfr_test/sfrtest14.sfr new file mode 100644 index 0000000000..566cc9ecb8 --- /dev/null +++ b/examples/data/sfr_test/sfrtest14.sfr @@ -0,0 +1,27 @@ +REACHINPUT +10 1 0 0 86400.0 0.0001 -1 0 1 15 1 30 +1 5 1 1 1 150 1000 0.1 2 45 0.3 0.25 5 10 +1 5 2 1 2 150 1000 0.1 2 45 0.3 0.25 5 10 +1 5 3 1 3 150 1000 0.1 2 45 0.3 0.25 5 10 +1 5 4 1 4 150 1000 0.1 2 45 0.3 0.25 5 10 +1 5 5 1 5 150 1000 0.1 2 45 0.3 0.25 5 10 +1 5 6 1 6 150 1000 0.1 2 45 0.3 0.25 5 10 +1 5 7 1 7 150 1000 0.1 2 45 0.3 0.25 5 10 +1 5 8 1 8 150 1000 0.1 2 45 0.3 0.25 5 10 +1 5 9 1 9 150 1000 0.1 2 45 0.3 0.25 5 10 +1 5 10 1 10 150 1000 0.1 2 45 0.3 0.25 5 10 +1 1 1 +1 4 0 0 2 100 50 0 0 +10 100 +1 2 +4 8 +1 1 1 +1 4 0 0 2 100 50 0 0 +10 100 +1 2 +4 8 +1 1 1 +1 4 0 0 2 100 50 0 0 +10 100 +1 2 +4 8 \ No newline at end of file diff --git a/examples/data/sfr_test/sfrtest20.nam b/examples/data/sfr_test/sfrtest20.nam new file mode 100644 index 0000000000..b33e11b731 --- /dev/null +++ b/examples/data/sfr_test/sfrtest20.nam @@ -0,0 +1,6 @@ +LIST 2 sfrtest.lst +BAS6 8 sfrtest.bas +DIS 9 sfrtest.dis +UPW 10 sfrtest.upw +SFR 11 sfrtest20.sfr +NWT 12 sfrtest.nwt \ No newline at end of file diff --git a/examples/data/sfr_test/sfrtest20.sfr b/examples/data/sfr_test/sfrtest20.sfr new file mode 100644 index 0000000000..7f0496ebde --- /dev/null +++ b/examples/data/sfr_test/sfrtest20.sfr @@ -0,0 +1,24 @@ +REACHINPUT +10 1 0 0 86400.0 0.0001 -1 0 2 15 1 30 +1 5 1 1 1 150 1000 0.1 2 45 0.3 0.25 5 10 +1 5 2 1 2 150 1000 0.1 2 45 0.3 0.25 5 10 +1 5 3 1 3 150 1000 0.1 2 45 0.3 0.25 5 10 +1 5 4 1 4 150 1000 0.1 2 45 0.3 0.25 5 10 +1 5 5 1 5 150 1000 0.1 2 45 0.3 0.25 5 10 +1 5 6 1 6 150 1000 0.1 2 45 0.3 0.25 5 10 +1 5 7 1 7 150 1000 0.1 2 45 0.3 0.25 5 10 +1 5 8 1 8 150 1000 0.1 2 45 0.3 0.25 5 10 +1 5 9 1 9 150 1000 0.1 2 45 0.3 0.25 5 10 +1 5 10 1 10 150 1000 0.1 2 45 0.3 0.25 5 10 +1 1 1 +1 0 0 0 100 50 0 0 +20 1 +20 1 +1 1 1 +1 0 0 0 100 50 0 0 +20 1 +20 1 +1 1 1 +1 0 0 0 100 50 0 0 +20 1 +20 1 \ No newline at end of file diff --git a/examples/data/sfr_test/sfrtest21.nam b/examples/data/sfr_test/sfrtest21.nam new file mode 100644 index 0000000000..b306829f12 --- /dev/null +++ b/examples/data/sfr_test/sfrtest21.nam @@ -0,0 +1,6 @@ +LIST 2 sfrtest.lst +BAS6 8 sfrtest.bas +DIS 9 sfrtest.dis +UPW 10 sfrtest.upw +SFR 11 sfrtest21.sfr +NWT 12 sfrtest.nwt \ No newline at end of file diff --git a/examples/data/sfr_test/sfrtest21.sfr b/examples/data/sfr_test/sfrtest21.sfr new file mode 100644 index 0000000000..76fd2c9587 --- /dev/null +++ b/examples/data/sfr_test/sfrtest21.sfr @@ -0,0 +1,20 @@ +REACHINPUT +10 1 0 0 86400.0 0.0001 -1 0 2 15 1 30 +1 5 1 1 1 150 1000 0.1 2 45 0.3 0.25 5 10 +1 5 2 1 2 150 1000 0.1 2 45 0.3 0.25 5 10 +1 5 3 1 3 150 1000 0.1 2 45 0.3 0.25 5 10 +1 5 4 1 4 150 1000 0.1 2 45 0.3 0.25 5 10 +1 5 5 1 5 150 1000 0.1 2 45 0.3 0.25 5 10 +1 5 6 1 6 150 1000 0.1 2 45 0.3 0.25 5 10 +1 5 7 1 7 150 1000 0.1 2 45 0.3 0.25 5 10 +1 5 8 1 8 150 1000 0.1 2 45 0.3 0.25 5 10 +1 5 9 1 9 150 1000 0.1 2 45 0.3 0.25 5 10 +1 5 10 1 10 150 1000 0.1 2 45 0.3 0.25 5 10 +1 1 1 +1 1 0 0 100 50 0 0 0.25 +20 +20 +1 1 1 +1 1 0 0 100 50 0 0 0.25 +1 1 1 +1 1 0 0 100 50 0 0 0.25 \ No newline at end of file diff --git a/examples/data/sfr_test/sfrtest22.nam b/examples/data/sfr_test/sfrtest22.nam new file mode 100644 index 0000000000..af87ffcba0 --- /dev/null +++ b/examples/data/sfr_test/sfrtest22.nam @@ -0,0 +1,6 @@ +LIST 2 sfrtest.lst +BAS6 8 sfrtest.bas +DIS 9 sfrtest.dis +UPW 10 sfrtest.upw +SFR 11 sfrtest22.sfr +NWT 12 sfrtest.nwt \ No newline at end of file diff --git a/examples/data/sfr_test/sfrtest22.sfr b/examples/data/sfr_test/sfrtest22.sfr new file mode 100644 index 0000000000..64a82f4d89 --- /dev/null +++ b/examples/data/sfr_test/sfrtest22.sfr @@ -0,0 +1,20 @@ +REACHINPUT +10 1 0 0 86400.0 0.0001 -1 0 2 15 1 30 +1 5 1 1 1 150 1000 0.1 2 45 0.3 0.25 5 10 +1 5 2 1 2 150 1000 0.1 2 45 0.3 0.25 5 10 +1 5 3 1 3 150 1000 0.1 2 45 0.3 0.25 5 10 +1 5 4 1 4 150 1000 0.1 2 45 0.3 0.25 5 10 +1 5 5 1 5 150 1000 0.1 2 45 0.3 0.25 5 10 +1 5 6 1 6 150 1000 0.1 2 45 0.3 0.25 5 10 +1 5 7 1 7 150 1000 0.1 2 45 0.3 0.25 5 10 +1 5 8 1 8 150 1000 0.1 2 45 0.3 0.25 5 10 +1 5 9 1 9 150 1000 0.1 2 45 0.3 0.25 5 10 +1 5 10 1 10 150 1000 0.1 2 45 0.3 0.25 5 10 +1 1 1 +1 2 0 0 100 50 0 0 0.25 0.50 +0.0 0.2 0.3 0.4 0.6 0.7 0.8 1.0 +10 9 7 3 3 7 9 10 +1 1 1 +1 2 0 0 100 50 0 0 0.25 0.50 +1 1 1 +1 2 0 0 100 50 0 0 0.25 0.50 \ No newline at end of file diff --git a/examples/data/sfr_test/sfrtest23.nam b/examples/data/sfr_test/sfrtest23.nam new file mode 100644 index 0000000000..3d84f82e00 --- /dev/null +++ b/examples/data/sfr_test/sfrtest23.nam @@ -0,0 +1,6 @@ +LIST 2 sfrtest.lst +BAS6 8 sfrtest.bas +DIS 9 sfrtest.dis +UPW 10 sfrtest.upw +SFR 11 sfrtest23.sfr +NWT 12 sfrtest.nwt \ No newline at end of file diff --git a/examples/data/sfr_test/sfrtest23.sfr b/examples/data/sfr_test/sfrtest23.sfr new file mode 100644 index 0000000000..9f87ac9be8 --- /dev/null +++ b/examples/data/sfr_test/sfrtest23.sfr @@ -0,0 +1,18 @@ +REACHINPUT +10 1 0 0 86400.0 0.0001 -1 0 2 15 1 30 +1 5 1 1 1 150 1000 0.1 2 45 0.3 0.25 5 10 +1 5 2 1 2 150 1000 0.1 2 45 0.3 0.25 5 10 +1 5 3 1 3 150 1000 0.1 2 45 0.3 0.25 5 10 +1 5 4 1 4 150 1000 0.1 2 45 0.3 0.25 5 10 +1 5 5 1 5 150 1000 0.1 2 45 0.3 0.25 5 10 +1 5 6 1 6 150 1000 0.1 2 45 0.3 0.25 5 10 +1 5 7 1 7 150 1000 0.1 2 45 0.3 0.25 5 10 +1 5 8 1 8 150 1000 0.1 2 45 0.3 0.25 5 10 +1 5 9 1 9 150 1000 0.1 2 45 0.3 0.25 5 10 +1 5 10 1 10 150 1000 0.1 2 45 0.3 0.25 5 10 +1 1 1 0 +1 3 0 0 100.0 50.0 0 0 1.0 0.1 1.0 0.1 +1 1 1 0 +1 3 0 0 100.0 50.0 0 0 1.0 0.1 1.0 0.1 +1 1 1 0 +1 3 0 0 100.0 50.0 0 0 1.0 0.1 1.0 0.1 \ No newline at end of file diff --git a/examples/data/sfr_test/sfrtest24.nam b/examples/data/sfr_test/sfrtest24.nam new file mode 100644 index 0000000000..1ec3ffaa06 --- /dev/null +++ b/examples/data/sfr_test/sfrtest24.nam @@ -0,0 +1,6 @@ +LIST 2 sfrtest.lst +BAS6 8 sfrtest.bas +DIS 9 sfrtest.dis +UPW 10 sfrtest.upw +SFR 11 sfrtest24.sfr +NWT 12 sfrtest.nwt \ No newline at end of file diff --git a/examples/data/sfr_test/sfrtest24.sfr b/examples/data/sfr_test/sfrtest24.sfr new file mode 100644 index 0000000000..27f4c968db --- /dev/null +++ b/examples/data/sfr_test/sfrtest24.sfr @@ -0,0 +1,27 @@ +REACHINPUT +10 1 0 0 86400.0 0.0001 -1 0 2 15 1 30 +1 5 1 1 1 150 1000 0.1 2 45 0.3 0.25 5 10 +1 5 2 1 2 150 1000 0.1 2 45 0.3 0.25 5 10 +1 5 3 1 3 150 1000 0.1 2 45 0.3 0.25 5 10 +1 5 4 1 4 150 1000 0.1 2 45 0.3 0.25 5 10 +1 5 5 1 5 150 1000 0.1 2 45 0.3 0.25 5 10 +1 5 6 1 6 150 1000 0.1 2 45 0.3 0.25 5 10 +1 5 7 1 7 150 1000 0.1 2 45 0.3 0.25 5 10 +1 5 8 1 8 150 1000 0.1 2 45 0.3 0.25 5 10 +1 5 9 1 9 150 1000 0.1 2 45 0.3 0.25 5 10 +1 5 10 1 10 150 1000 0.1 2 45 0.3 0.25 5 10 +1 1 1 +1 4 0 0 2 100 50 0 0 +10 100 +1 2 +4 8 +1 1 1 +1 4 0 0 2 100 50 0 0 +10 100 +1 2 +4 8 +1 1 1 +1 4 0 0 2 100 50 0 0 +10 100 +1 2 +4 8 \ No newline at end of file diff --git a/examples/data/sfr_test/sfrtest30.nam b/examples/data/sfr_test/sfrtest30.nam new file mode 100644 index 0000000000..651aa99322 --- /dev/null +++ b/examples/data/sfr_test/sfrtest30.nam @@ -0,0 +1,6 @@ +LIST 2 sfrtest.lst +BAS6 8 sfrtest.bas +DIS 9 sfrtest.dis +UPW 10 sfrtest.upw +SFR 11 sfrtest30.sfr +NWT 12 sfrtest.nwt \ No newline at end of file diff --git a/examples/data/sfr_test/sfrtest30.sfr b/examples/data/sfr_test/sfrtest30.sfr new file mode 100644 index 0000000000..6ffd3b8b0b --- /dev/null +++ b/examples/data/sfr_test/sfrtest30.sfr @@ -0,0 +1,24 @@ +REACHINPUT +10 1 0 0 86400.0 0.0001 -1 0 3 15 1 30 +1 5 1 1 1 150 1000 0.1 2 45 0.3 0.25 5 10 +1 5 2 1 2 150 1000 0.1 2 45 0.3 0.25 5 10 +1 5 3 1 3 150 1000 0.1 2 45 0.3 0.25 5 10 +1 5 4 1 4 150 1000 0.1 2 45 0.3 0.25 5 10 +1 5 5 1 5 150 1000 0.1 2 45 0.3 0.25 5 10 +1 5 6 1 6 150 1000 0.1 2 45 0.3 0.25 5 10 +1 5 7 1 7 150 1000 0.1 2 45 0.3 0.25 5 10 +1 5 8 1 8 150 1000 0.1 2 45 0.3 0.25 5 10 +1 5 9 1 9 150 1000 0.1 2 45 0.3 0.25 5 10 +1 5 10 1 10 150 1000 0.1 2 45 0.3 0.25 5 10 +1 1 1 +1 0 0 0 100 50 0 0 +20 1 +20 1 +1 1 1 +1 0 0 0 100 50 0 0 +20 1 +20 1 +1 1 1 +1 0 0 0 100 50 0 0 +20 1 +20 1 \ No newline at end of file diff --git a/examples/data/sfr_test/sfrtest31.nam b/examples/data/sfr_test/sfrtest31.nam new file mode 100644 index 0000000000..047e11f8e2 --- /dev/null +++ b/examples/data/sfr_test/sfrtest31.nam @@ -0,0 +1,6 @@ +LIST 2 sfrtest.lst +BAS6 8 sfrtest.bas +DIS 9 sfrtest.dis +UPW 10 sfrtest.upw +SFR 11 sfrtest31.sfr +NWT 12 sfrtest.nwt \ No newline at end of file diff --git a/examples/data/sfr_test/sfrtest31.sfr b/examples/data/sfr_test/sfrtest31.sfr new file mode 100644 index 0000000000..47ef44eac8 --- /dev/null +++ b/examples/data/sfr_test/sfrtest31.sfr @@ -0,0 +1,20 @@ +REACHINPUT +10 1 0 0 86400.0 0.0001 -1 0 3 15 1 30 +1 5 1 1 1 150 1000 0.1 2 45 0.3 0.25 5 10 +1 5 2 1 2 150 1000 0.1 2 45 0.3 0.25 5 10 +1 5 3 1 3 150 1000 0.1 2 45 0.3 0.25 5 10 +1 5 4 1 4 150 1000 0.1 2 45 0.3 0.25 5 10 +1 5 5 1 5 150 1000 0.1 2 45 0.3 0.25 5 10 +1 5 6 1 6 150 1000 0.1 2 45 0.3 0.25 5 10 +1 5 7 1 7 150 1000 0.1 2 45 0.3 0.25 5 10 +1 5 8 1 8 150 1000 0.1 2 45 0.3 0.25 5 10 +1 5 9 1 9 150 1000 0.1 2 45 0.3 0.25 5 10 +1 5 10 1 10 150 1000 0.1 2 45 0.3 0.25 5 10 +1 1 1 +1 1 0 0 100 50 0 0 0.25 +20 +20 +1 1 1 +1 1 0 0 100 50 0 0 0.25 +1 1 1 +1 1 0 0 100 50 0 0 0.25 \ No newline at end of file diff --git a/examples/data/sfr_test/sfrtest32.nam b/examples/data/sfr_test/sfrtest32.nam new file mode 100644 index 0000000000..9cd613e93e --- /dev/null +++ b/examples/data/sfr_test/sfrtest32.nam @@ -0,0 +1,6 @@ +LIST 2 sfrtest.lst +BAS6 8 sfrtest.bas +DIS 9 sfrtest.dis +UPW 10 sfrtest.upw +SFR 11 sfrtest32.sfr +NWT 12 sfrtest.nwt \ No newline at end of file diff --git a/examples/data/sfr_test/sfrtest32.sfr b/examples/data/sfr_test/sfrtest32.sfr new file mode 100644 index 0000000000..b3afbb5600 --- /dev/null +++ b/examples/data/sfr_test/sfrtest32.sfr @@ -0,0 +1,20 @@ +REACHINPUT +10 1 0 0 86400.0 0.0001 -1 0 3 15 1 30 +1 5 1 1 1 150 1000 0.1 2 45 0.3 0.25 5 10 +1 5 2 1 2 150 1000 0.1 2 45 0.3 0.25 5 10 +1 5 3 1 3 150 1000 0.1 2 45 0.3 0.25 5 10 +1 5 4 1 4 150 1000 0.1 2 45 0.3 0.25 5 10 +1 5 5 1 5 150 1000 0.1 2 45 0.3 0.25 5 10 +1 5 6 1 6 150 1000 0.1 2 45 0.3 0.25 5 10 +1 5 7 1 7 150 1000 0.1 2 45 0.3 0.25 5 10 +1 5 8 1 8 150 1000 0.1 2 45 0.3 0.25 5 10 +1 5 9 1 9 150 1000 0.1 2 45 0.3 0.25 5 10 +1 5 10 1 10 150 1000 0.1 2 45 0.3 0.25 5 10 +1 1 1 +1 2 0 0 100 50 0 0 0.25 0.50 +0.0 0.2 0.3 0.4 0.6 0.7 0.8 1.0 +10 9 7 3 3 7 9 10 +1 1 1 +1 2 0 0 100 50 0 0 0.25 0.50 +1 1 1 +1 2 0 0 100 50 0 0 0.25 0.50 \ No newline at end of file diff --git a/examples/data/sfr_test/sfrtest33.nam b/examples/data/sfr_test/sfrtest33.nam new file mode 100644 index 0000000000..7033afb79b --- /dev/null +++ b/examples/data/sfr_test/sfrtest33.nam @@ -0,0 +1,6 @@ +LIST 2 sfrtest.lst +BAS6 8 sfrtest.bas +DIS 9 sfrtest.dis +UPW 10 sfrtest.upw +SFR 11 sfrtest33.sfr +NWT 12 sfrtest.nwt \ No newline at end of file diff --git a/examples/data/sfr_test/sfrtest33.sfr b/examples/data/sfr_test/sfrtest33.sfr new file mode 100644 index 0000000000..ce2358edf0 --- /dev/null +++ b/examples/data/sfr_test/sfrtest33.sfr @@ -0,0 +1,18 @@ +REACHINPUT +10 1 0 0 86400.0 0.0001 -1 0 3 15 1 30 +1 5 1 1 1 150 1000 0.1 2 45 0.3 0.25 5 10 +1 5 2 1 2 150 1000 0.1 2 45 0.3 0.25 5 10 +1 5 3 1 3 150 1000 0.1 2 45 0.3 0.25 5 10 +1 5 4 1 4 150 1000 0.1 2 45 0.3 0.25 5 10 +1 5 5 1 5 150 1000 0.1 2 45 0.3 0.25 5 10 +1 5 6 1 6 150 1000 0.1 2 45 0.3 0.25 5 10 +1 5 7 1 7 150 1000 0.1 2 45 0.3 0.25 5 10 +1 5 8 1 8 150 1000 0.1 2 45 0.3 0.25 5 10 +1 5 9 1 9 150 1000 0.1 2 45 0.3 0.25 5 10 +1 5 10 1 10 150 1000 0.1 2 45 0.3 0.25 5 10 +1 1 1 0 +1 3 0 0 100.0 50.0 0 0 1.0 0.1 1.0 0.1 +1 1 1 0 +1 3 0 0 100.0 50.0 0 0 1.0 0.1 1.0 0.1 +1 1 1 0 +1 3 0 0 100.0 50.0 0 0 1.0 0.1 1.0 0.1 \ No newline at end of file diff --git a/examples/data/sfr_test/sfrtest34.nam b/examples/data/sfr_test/sfrtest34.nam new file mode 100644 index 0000000000..b1ef04bbde --- /dev/null +++ b/examples/data/sfr_test/sfrtest34.nam @@ -0,0 +1,6 @@ +LIST 2 sfrtest.lst +BAS6 8 sfrtest.bas +DIS 9 sfrtest.dis +UPW 10 sfrtest.upw +SFR 11 sfrtest34.sfr +NWT 12 sfrtest.nwt \ No newline at end of file diff --git a/examples/data/sfr_test/sfrtest34.sfr b/examples/data/sfr_test/sfrtest34.sfr new file mode 100644 index 0000000000..b9c6733cf7 --- /dev/null +++ b/examples/data/sfr_test/sfrtest34.sfr @@ -0,0 +1,27 @@ +REACHINPUT +10 1 0 0 86400.0 0.0001 -1 0 3 15 1 30 +1 5 1 1 1 150 1000 0.1 2 45 0.3 0.25 5 10 +1 5 2 1 2 150 1000 0.1 2 45 0.3 0.25 5 10 +1 5 3 1 3 150 1000 0.1 2 45 0.3 0.25 5 10 +1 5 4 1 4 150 1000 0.1 2 45 0.3 0.25 5 10 +1 5 5 1 5 150 1000 0.1 2 45 0.3 0.25 5 10 +1 5 6 1 6 150 1000 0.1 2 45 0.3 0.25 5 10 +1 5 7 1 7 150 1000 0.1 2 45 0.3 0.25 5 10 +1 5 8 1 8 150 1000 0.1 2 45 0.3 0.25 5 10 +1 5 9 1 9 150 1000 0.1 2 45 0.3 0.25 5 10 +1 5 10 1 10 150 1000 0.1 2 45 0.3 0.25 5 10 +1 1 1 +1 4 0 0 2 100 50 0 0 +10 100 +1 2 +4 8 +1 1 1 +1 4 0 0 2 100 50 0 0 +10 100 +1 2 +4 8 +1 1 1 +1 4 0 0 2 100 50 0 0 +10 100 +1 2 +4 8 \ No newline at end of file diff --git a/examples/data/sfr_test/sfrtest40.nam b/examples/data/sfr_test/sfrtest40.nam new file mode 100644 index 0000000000..86c0d0b4ba --- /dev/null +++ b/examples/data/sfr_test/sfrtest40.nam @@ -0,0 +1,6 @@ +LIST 2 sfrtest.lst +BAS6 8 sfrtest.bas +DIS 9 sfrtest.dis +UPW 10 sfrtest.upw +SFR 11 sfrtest40.sfr +NWT 12 sfrtest.nwt \ No newline at end of file diff --git a/examples/data/sfr_test/sfrtest40.sfr b/examples/data/sfr_test/sfrtest40.sfr new file mode 100644 index 0000000000..16a17a51a6 --- /dev/null +++ b/examples/data/sfr_test/sfrtest40.sfr @@ -0,0 +1,24 @@ +REACHINPUT +10 1 0 0 86400.0 0.0001 -1 0 4 15 1 30 +1 5 1 1 1 150 1000 0.1 2 45 0.3 0.25 5 10 +1 5 2 1 2 150 1000 0.1 2 45 0.3 0.25 5 10 +1 5 3 1 3 150 1000 0.1 2 45 0.3 0.25 5 10 +1 5 4 1 4 150 1000 0.1 2 45 0.3 0.25 5 10 +1 5 5 1 5 150 1000 0.1 2 45 0.3 0.25 5 10 +1 5 6 1 6 150 1000 0.1 2 45 0.3 0.25 5 10 +1 5 7 1 7 150 1000 0.1 2 45 0.3 0.25 5 10 +1 5 8 1 8 150 1000 0.1 2 45 0.3 0.25 5 10 +1 5 9 1 9 150 1000 0.1 2 45 0.3 0.25 5 10 +1 5 10 1 10 150 1000 0.1 2 45 0.3 0.25 5 10 +1 1 1 +1 0 0 0 100 50 0 0 +45 5 1000 20 1 +45 5 999 20 1 +1 1 1 +1 0 0 0 100 50 0 0 +45 5 1000 20 1 +45 5 999 20 1 +1 1 1 +1 0 0 0 100 50 0 0 +45 5 1000 20 1 +45 5 999 20 1 \ No newline at end of file diff --git a/examples/data/sfr_test/sfrtest41.nam b/examples/data/sfr_test/sfrtest41.nam new file mode 100644 index 0000000000..cb80075089 --- /dev/null +++ b/examples/data/sfr_test/sfrtest41.nam @@ -0,0 +1,6 @@ +LIST 2 sfrtest.lst +BAS6 8 sfrtest.bas +DIS 9 sfrtest.dis +UPW 10 sfrtest.upw +SFR 11 sfrtest41.sfr +NWT 12 sfrtest.nwt \ No newline at end of file diff --git a/examples/data/sfr_test/sfrtest41.sfr b/examples/data/sfr_test/sfrtest41.sfr new file mode 100644 index 0000000000..bcbc5e4989 --- /dev/null +++ b/examples/data/sfr_test/sfrtest41.sfr @@ -0,0 +1,24 @@ +REACHINPUT +10 1 0 0 86400.0 0.0001 -1 0 4 15 1 30 +1 5 1 1 1 150 1000 0.1 2 45 0.3 0.25 5 10 +1 5 2 1 2 150 1000 0.1 2 45 0.3 0.25 5 10 +1 5 3 1 3 150 1000 0.1 2 45 0.3 0.25 5 10 +1 5 4 1 4 150 1000 0.1 2 45 0.3 0.25 5 10 +1 5 5 1 5 150 1000 0.1 2 45 0.3 0.25 5 10 +1 5 6 1 6 150 1000 0.1 2 45 0.3 0.25 5 10 +1 5 7 1 7 150 1000 0.1 2 45 0.3 0.25 5 10 +1 5 8 1 8 150 1000 0.1 2 45 0.3 0.25 5 10 +1 5 9 1 9 150 1000 0.1 2 45 0.3 0.25 5 10 +1 5 10 1 10 150 1000 0.1 2 45 0.3 0.25 5 10 +1 1 1 +1 1 0 0 100 50 0 0 0.25 +45 5 1000 20 0.3 0.25 5 +45 5 999 20 0.3 0.25 5 +1 1 1 +1 1 0 0 100 50 0 0 0.25 +45 +45 +1 1 1 +1 1 0 0 100 50 0 0 0.25 +45 +45 \ No newline at end of file diff --git a/examples/data/sfr_test/sfrtest42.nam b/examples/data/sfr_test/sfrtest42.nam new file mode 100644 index 0000000000..37696277f5 --- /dev/null +++ b/examples/data/sfr_test/sfrtest42.nam @@ -0,0 +1,6 @@ +LIST 2 sfrtest.lst +BAS6 8 sfrtest.bas +DIS 9 sfrtest.dis +UPW 10 sfrtest.upw +SFR 11 sfrtest42.sfr +NWT 12 sfrtest.nwt \ No newline at end of file diff --git a/examples/data/sfr_test/sfrtest42.sfr b/examples/data/sfr_test/sfrtest42.sfr new file mode 100644 index 0000000000..0bf77f7d03 --- /dev/null +++ b/examples/data/sfr_test/sfrtest42.sfr @@ -0,0 +1,26 @@ +REACHINPUT +10 1 0 0 86400.0 0.0001 -1 0 4 15 1 30 +1 5 1 1 1 150 1000 0.1 2 45 0.3 0.25 5 10 +1 5 2 1 2 150 1000 0.1 2 45 0.3 0.25 5 10 +1 5 3 1 3 150 1000 0.1 2 45 0.3 0.25 5 10 +1 5 4 1 4 150 1000 0.1 2 45 0.3 0.25 5 10 +1 5 5 1 5 150 1000 0.1 2 45 0.3 0.25 5 10 +1 5 6 1 6 150 1000 0.1 2 45 0.3 0.25 5 10 +1 5 7 1 7 150 1000 0.1 2 45 0.3 0.25 5 10 +1 5 8 1 8 150 1000 0.1 2 45 0.3 0.25 5 10 +1 5 9 1 9 150 1000 0.1 2 45 0.3 0.25 5 10 +1 5 10 1 10 150 1000 0.1 2 45 0.3 0.25 5 10 +1 1 1 +1 2 0 0 100 50 0 0 0.25 0.50 +45 5 1000 0.3 0.25 5 +45 5 999 0.3 0.25 5 +0.0 0.2 0.3 0.4 0.6 0.7 0.8 1.0 +10 9 7 3 3 7 9 10 +1 1 1 +1 2 0 0 100 50 0 0 0.25 0.50 +45 +45 +1 1 1 +1 2 0 0 100 50 0 0 0.25 0.50 +45 +45 \ No newline at end of file diff --git a/examples/data/sfr_test/sfrtest43.nam b/examples/data/sfr_test/sfrtest43.nam new file mode 100644 index 0000000000..5204b2c374 --- /dev/null +++ b/examples/data/sfr_test/sfrtest43.nam @@ -0,0 +1,6 @@ +LIST 2 sfrtest.lst +BAS6 8 sfrtest.bas +DIS 9 sfrtest.dis +UPW 10 sfrtest.upw +SFR 11 sfrtest43.sfr +NWT 12 sfrtest.nwt \ No newline at end of file diff --git a/examples/data/sfr_test/sfrtest43.sfr b/examples/data/sfr_test/sfrtest43.sfr new file mode 100644 index 0000000000..e5b213966a --- /dev/null +++ b/examples/data/sfr_test/sfrtest43.sfr @@ -0,0 +1,24 @@ +REACHINPUT +10 1 0 0 86400.0 0.0001 -1 0 4 15 1 30 +1 5 1 1 1 150 1000 0.1 2 45 0.3 0.25 5 10 +1 5 2 1 2 150 1000 0.1 2 45 0.3 0.25 5 10 +1 5 3 1 3 150 1000 0.1 2 45 0.3 0.25 5 10 +1 5 4 1 4 150 1000 0.1 2 45 0.3 0.25 5 10 +1 5 5 1 5 150 1000 0.1 2 45 0.3 0.25 5 10 +1 5 6 1 6 150 1000 0.1 2 45 0.3 0.25 5 10 +1 5 7 1 7 150 1000 0.1 2 45 0.3 0.25 5 10 +1 5 8 1 8 150 1000 0.1 2 45 0.3 0.25 5 10 +1 5 9 1 9 150 1000 0.1 2 45 0.3 0.25 5 10 +1 5 10 1 10 150 1000 0.1 2 45 0.3 0.25 5 10 +1 1 1 +1 3 0 0 100 50 0 0 1 0.1 1 0.1 +45 5 1000 +45 5 999 +1 1 1 +1 3 0 0 100 50 0 0 1 0.1 1 0.1 +45 5 1000 +45 5 999 +1 1 1 +1 3 0 0 100 50 0 0 1 0.1 1 0.1 +45 5 1000 +45 5 999 \ No newline at end of file diff --git a/examples/data/sfr_test/sfrtest44.nam b/examples/data/sfr_test/sfrtest44.nam new file mode 100644 index 0000000000..cb860f7a5e --- /dev/null +++ b/examples/data/sfr_test/sfrtest44.nam @@ -0,0 +1,6 @@ +LIST 2 sfrtest.lst +BAS6 8 sfrtest.bas +DIS 9 sfrtest.dis +UPW 10 sfrtest.upw +SFR 11 sfrtest44.sfr +NWT 12 sfrtest.nwt \ No newline at end of file diff --git a/examples/data/sfr_test/sfrtest44.sfr b/examples/data/sfr_test/sfrtest44.sfr new file mode 100644 index 0000000000..a7c7b87385 --- /dev/null +++ b/examples/data/sfr_test/sfrtest44.sfr @@ -0,0 +1,33 @@ +REACHINPUT +10 1 0 0 86400.0 0.0001 -1 0 4 15 1 30 +1 5 1 1 1 150 1000 0.1 2 45 0.3 0.25 5 10 +1 5 2 1 2 150 1000 0.1 2 45 0.3 0.25 5 10 +1 5 3 1 3 150 1000 0.1 2 45 0.3 0.25 5 10 +1 5 4 1 4 150 1000 0.1 2 45 0.3 0.25 5 10 +1 5 5 1 5 150 1000 0.1 2 45 0.3 0.25 5 10 +1 5 6 1 6 150 1000 0.1 2 45 0.3 0.25 5 10 +1 5 7 1 7 150 1000 0.1 2 45 0.3 0.25 5 10 +1 5 8 1 8 150 1000 0.1 2 45 0.3 0.25 5 10 +1 5 9 1 9 150 1000 0.1 2 45 0.3 0.25 5 10 +1 5 10 1 10 150 1000 0.1 2 45 0.3 0.25 5 10 +1 1 1 +1 4 0 0 2 100 50 0 0 +45 5 1000 +45 5 999 +10 100 +1 2 +4 8 +1 1 1 +1 4 0 0 2 100 50 0 0 +45 5 1000 +45 5 999 +10 100 +1 2 +4 8 +1 1 1 +1 4 0 0 2 100 50 0 0 +45 5 1000 +45 5 999 +10 100 +1 2 +4 8 \ No newline at end of file diff --git a/examples/data/sfr_test/sfrtest50.nam b/examples/data/sfr_test/sfrtest50.nam new file mode 100644 index 0000000000..3140199fdb --- /dev/null +++ b/examples/data/sfr_test/sfrtest50.nam @@ -0,0 +1,6 @@ +LIST 2 sfrtest.lst +BAS6 8 sfrtest.bas +DIS 9 sfrtest.dis +UPW 10 sfrtest.upw +SFR 11 sfrtest50.sfr +NWT 12 sfrtest.nwt \ No newline at end of file diff --git a/examples/data/sfr_test/sfrtest50.sfr b/examples/data/sfr_test/sfrtest50.sfr new file mode 100644 index 0000000000..81ce7c63d7 --- /dev/null +++ b/examples/data/sfr_test/sfrtest50.sfr @@ -0,0 +1,24 @@ +REACHINPUT +10 1 0 0 86400.0 0.0001 -1 0 5 15 1 30 +1 5 1 1 1 150 1000 0.1 2 45 0.3 0.25 5 10 +1 5 2 1 2 150 1000 0.1 2 45 0.3 0.25 5 10 +1 5 3 1 3 150 1000 0.1 2 45 0.3 0.25 5 10 +1 5 4 1 4 150 1000 0.1 2 45 0.3 0.25 5 10 +1 5 5 1 5 150 1000 0.1 2 45 0.3 0.25 5 10 +1 5 6 1 6 150 1000 0.1 2 45 0.3 0.25 5 10 +1 5 7 1 7 150 1000 0.1 2 45 0.3 0.25 5 10 +1 5 8 1 8 150 1000 0.1 2 45 0.3 0.25 5 10 +1 5 9 1 9 150 1000 0.1 2 45 0.3 0.25 5 10 +1 5 10 1 10 150 1000 0.1 2 45 0.3 0.25 5 10 +1 1 1 +1 0 0 0 100 50 0 0 +45 5 1000 20 1 +45 5 999 20 1 +1 1 1 +1 0 0 0 100 50 0 0 +45 5 1000 20 1 +45 5 999 20 1 +1 1 1 +1 0 0 0 100 50 0 0 +45 5 1000 20 1 +45 5 999 20 1 \ No newline at end of file diff --git a/examples/data/sfr_test/sfrtest51.nam b/examples/data/sfr_test/sfrtest51.nam new file mode 100644 index 0000000000..e0766d836b --- /dev/null +++ b/examples/data/sfr_test/sfrtest51.nam @@ -0,0 +1,6 @@ +LIST 2 sfrtest.lst +BAS6 8 sfrtest.bas +DIS 9 sfrtest.dis +UPW 10 sfrtest.upw +SFR 11 sfrtest51.sfr +NWT 12 sfrtest.nwt \ No newline at end of file diff --git a/examples/data/sfr_test/sfrtest51.sfr b/examples/data/sfr_test/sfrtest51.sfr new file mode 100644 index 0000000000..285f08359a --- /dev/null +++ b/examples/data/sfr_test/sfrtest51.sfr @@ -0,0 +1,24 @@ +REACHINPUT +10 1 0 0 86400.0 0.0001 -1 0 5 15 1 30 +1 5 1 1 1 150 1000 0.1 2 45 0.3 0.25 5 10 +1 5 2 1 2 150 1000 0.1 2 45 0.3 0.25 5 10 +1 5 3 1 3 150 1000 0.1 2 45 0.3 0.25 5 10 +1 5 4 1 4 150 1000 0.1 2 45 0.3 0.25 5 10 +1 5 5 1 5 150 1000 0.1 2 45 0.3 0.25 5 10 +1 5 6 1 6 150 1000 0.1 2 45 0.3 0.25 5 10 +1 5 7 1 7 150 1000 0.1 2 45 0.3 0.25 5 10 +1 5 8 1 8 150 1000 0.1 2 45 0.3 0.25 5 10 +1 5 9 1 9 150 1000 0.1 2 45 0.3 0.25 5 10 +1 5 10 1 10 150 1000 0.1 2 45 0.3 0.25 5 10 +1 1 1 +1 1 0 0 100 50 0 0 0.25 +45 5 1000 20 0.3 0.25 5 10 +45 5 999 20 0.3 0.25 5 10 +1 1 1 +1 1 0 0 100 50 0 0 0.25 +45 +45 +1 1 1 +1 1 0 0 100 50 0 0 0.25 +45 +45 \ No newline at end of file diff --git a/examples/data/sfr_test/sfrtest52.nam b/examples/data/sfr_test/sfrtest52.nam new file mode 100644 index 0000000000..93bd5878dc --- /dev/null +++ b/examples/data/sfr_test/sfrtest52.nam @@ -0,0 +1,6 @@ +LIST 2 sfrtest.lst +BAS6 8 sfrtest.bas +DIS 9 sfrtest.dis +UPW 10 sfrtest.upw +SFR 11 sfrtest52.sfr +NWT 12 sfrtest.nwt \ No newline at end of file diff --git a/examples/data/sfr_test/sfrtest52.sfr b/examples/data/sfr_test/sfrtest52.sfr new file mode 100644 index 0000000000..9dbc2ed246 --- /dev/null +++ b/examples/data/sfr_test/sfrtest52.sfr @@ -0,0 +1,26 @@ +REACHINPUT +10 1 0 0 86400.0 0.0001 -1 0 5 15 1 30 +1 5 1 1 1 150 1000 0.1 2 45 0.3 0.25 5 10 +1 5 2 1 2 150 1000 0.1 2 45 0.3 0.25 5 10 +1 5 3 1 3 150 1000 0.1 2 45 0.3 0.25 5 10 +1 5 4 1 4 150 1000 0.1 2 45 0.3 0.25 5 10 +1 5 5 1 5 150 1000 0.1 2 45 0.3 0.25 5 10 +1 5 6 1 6 150 1000 0.1 2 45 0.3 0.25 5 10 +1 5 7 1 7 150 1000 0.1 2 45 0.3 0.25 5 10 +1 5 8 1 8 150 1000 0.1 2 45 0.3 0.25 5 10 +1 5 9 1 9 150 1000 0.1 2 45 0.3 0.25 5 10 +1 5 10 1 10 150 1000 0.1 2 45 0.3 0.25 5 10 +1 1 1 +1 2 0 0 100 50 0 0 0.25 0.50 +45 5 1000 0.3 0.25 5 10 +45 5 999 0.3 0.25 5 10 +0.0 0.2 0.3 0.4 0.6 0.7 0.8 1.0 +10 9 7 3 3 7 9 10 +1 1 1 +1 2 0 0 100 50 0 0 0.25 0.50 +45 +45 +1 1 1 +1 2 0 0 100 50 0 0 0.25 0.50 +45 +45 \ No newline at end of file diff --git a/examples/data/sfr_test/sfrtest53.nam b/examples/data/sfr_test/sfrtest53.nam new file mode 100644 index 0000000000..e0d43572db --- /dev/null +++ b/examples/data/sfr_test/sfrtest53.nam @@ -0,0 +1,6 @@ +LIST 2 sfrtest.lst +BAS6 8 sfrtest.bas +DIS 9 sfrtest.dis +UPW 10 sfrtest.upw +SFR 11 sfrtest53.sfr +NWT 12 sfrtest.nwt \ No newline at end of file diff --git a/examples/data/sfr_test/sfrtest53.sfr b/examples/data/sfr_test/sfrtest53.sfr new file mode 100644 index 0000000000..a3d872c44f --- /dev/null +++ b/examples/data/sfr_test/sfrtest53.sfr @@ -0,0 +1,24 @@ +REACHINPUT +10 1 0 0 86400.0 0.0001 -1 0 5 15 1 30 +1 5 1 1 1 150 1000 0.1 2 45 0.3 0.25 5 10 +1 5 2 1 2 150 1000 0.1 2 45 0.3 0.25 5 10 +1 5 3 1 3 150 1000 0.1 2 45 0.3 0.25 5 10 +1 5 4 1 4 150 1000 0.1 2 45 0.3 0.25 5 10 +1 5 5 1 5 150 1000 0.1 2 45 0.3 0.25 5 10 +1 5 6 1 6 150 1000 0.1 2 45 0.3 0.25 5 10 +1 5 7 1 7 150 1000 0.1 2 45 0.3 0.25 5 10 +1 5 8 1 8 150 1000 0.1 2 45 0.3 0.25 5 10 +1 5 9 1 9 150 1000 0.1 2 45 0.3 0.25 5 10 +1 5 10 1 10 150 1000 0.1 2 45 0.3 0.25 5 10 +1 1 1 +1 3 0 0 100 50 0 0 1 0.1 1 0.1 +45 5 1000 +45 5 999 +1 1 1 +1 3 0 0 100 50 0 0 1 0.1 1 0.1 +45 5 1000 +45 5 999 +1 1 1 +1 3 0 0 100 50 0 0 1 0.1 1 0.1 +45 5 1000 +45 5 999 \ No newline at end of file diff --git a/examples/data/sfr_test/sfrtest54.nam b/examples/data/sfr_test/sfrtest54.nam new file mode 100644 index 0000000000..d18a34d391 --- /dev/null +++ b/examples/data/sfr_test/sfrtest54.nam @@ -0,0 +1,6 @@ +LIST 2 sfrtest.lst +BAS6 8 sfrtest.bas +DIS 9 sfrtest.dis +UPW 10 sfrtest.upw +SFR 11 sfrtest54.sfr +NWT 12 sfrtest.nwt \ No newline at end of file diff --git a/examples/data/sfr_test/sfrtest54.sfr b/examples/data/sfr_test/sfrtest54.sfr new file mode 100644 index 0000000000..8a214e4b61 --- /dev/null +++ b/examples/data/sfr_test/sfrtest54.sfr @@ -0,0 +1,33 @@ +REACHINPUT +10 1 0 0 86400.0 0.0001 -1 0 5 15 1 30 +1 5 1 1 1 150 1000 0.1 2 45 0.3 0.25 5 10 +1 5 2 1 2 150 1000 0.1 2 45 0.3 0.25 5 10 +1 5 3 1 3 150 1000 0.1 2 45 0.3 0.25 5 10 +1 5 4 1 4 150 1000 0.1 2 45 0.3 0.25 5 10 +1 5 5 1 5 150 1000 0.1 2 45 0.3 0.25 5 10 +1 5 6 1 6 150 1000 0.1 2 45 0.3 0.25 5 10 +1 5 7 1 7 150 1000 0.1 2 45 0.3 0.25 5 10 +1 5 8 1 8 150 1000 0.1 2 45 0.3 0.25 5 10 +1 5 9 1 9 150 1000 0.1 2 45 0.3 0.25 5 10 +1 5 10 1 10 150 1000 0.1 2 45 0.3 0.25 5 10 +1 1 1 +1 4 0 0 2 100 50 0 0 +45 5 1000 +45 5 999 +10 100 +1 2 +4 8 +1 1 1 +1 4 0 0 2 100 50 0 0 +45 5 1000 +45 5 999 +10 100 +1 2 +4 8 +1 1 1 +1 4 0 0 2 100 50 0 0 +45 5 1000 +45 5 999 +10 100 +1 2 +4 8 \ No newline at end of file diff --git a/flopy/modflow/mfsfr2.py b/flopy/modflow/mfsfr2.py index 3daeb09b91..85d4528548 100644 --- a/flopy/modflow/mfsfr2.py +++ b/flopy/modflow/mfsfr2.py @@ -880,7 +880,7 @@ def load(f, model, nper=None, gwt=False, nsol=1, ext_unit_dict=None): # ATL: not sure exactly how isfropt logic functions for this # dataset 6d description suggests that this line isn't read for isfropt > 1 # but description of icalc suggest that icalc=2 (8-point channel) can be used with any isfropt - if i == 0 or nstrm > 0 and not reachinput: # or isfropt <= 1: + if i == 0 or nstrm > 0 and not reachinput or isfropt <= 1: dataset_6d = [] for _ in range(2): dataset_6d.append( @@ -1726,15 +1726,20 @@ def _write_6bc(self, i, j, f_sfr, cols=()): f_sfr.write(fmts[3].format(width) + ' ') if icalc <= 0: f_sfr.write(fmts[4].format(depth) + ' ') - elif self.isfropt in [2, 3] and icalc <= 1: - if i > 0: - pass - else: + elif self.isfropt in [2, 3]: + if icalc <= 0: f_sfr.write(fmts[3].format(width) + ' ') - if icalc <= 0: - f_sfr.write(fmts[4].format(depth) + ' ') + f_sfr.write(fmts[4].format(depth) + ' ') + elif icalc == 1: + if i > 0: + pass + else: + f_sfr.write(fmts[3].format(width) + ' ') + else: + pass + else: - pass + return f_sfr.write('\n') def write_file(self, filename=None): @@ -1795,7 +1800,8 @@ def write_file(self, filename=None): nseg = self.segment_data[i].nseg[j] if icalc == 2: # or isfropt <= 1: - if i == 0 or self.nstrm > 0 and not self.reachinput: + if i == 0 or self.nstrm > 0 and \ + not self.reachinput or self.isfropt <=1: for k in range(2): for d in self.channel_geometry_data[i][nseg][ k]: @@ -3039,12 +3045,12 @@ def _parse_6bc(line, icalc, nstrm, isfropt, reachinput, per=0): else: thickm = line.pop(0) elevupdn = line.pop(0) - width = line.pop( - 0) # depth is not read if icalc == 1; see table in online guide - thts = _pop_item(line) - thti = _pop_item(line) - eps = _pop_item(line) - if isfropt == 5: + # depth is not read if icalc == 1; see table in online guide + width = line.pop(0) + thts = _pop_item(line) + thti = _pop_item(line) + eps = _pop_item(line) + if isfropt == 5 and per == 0: uhc = line.pop(0) elif isfropt in [0, 4, 5] and icalc >= 2: hcond = line.pop(0) @@ -3067,13 +3073,19 @@ def _parse_6bc(line, icalc, nstrm, isfropt, reachinput, per=0): width = line.pop(0) if icalc <= 0: depth = line.pop(0) - elif isfropt in [2, 3] and icalc <= 1: - if per > 0: - pass - else: + elif isfropt in [2, 3]: + if icalc <= 0: width = line.pop(0) - if icalc <= 0: - depth = line.pop(0) + depth = line.pop(0) + + elif icalc == 1: + if per > 0: + pass + else: + width = line.pop(0) + + else: + pass else: pass return hcond, thickm, elevupdn, width, depth, thts, thti, eps, uhc From f5bf62f55fff78f2a1462cb248214310412bde47 Mon Sep 17 00:00:00 2001 From: Joshua Larsen Date: Thu, 14 Nov 2019 17:17:03 -0700 Subject: [PATCH 2/3] Remove output file --- examples/data/sfr_test/sfrtest.lst | 75 ------------------------------ 1 file changed, 75 deletions(-) delete mode 100644 examples/data/sfr_test/sfrtest.lst diff --git a/examples/data/sfr_test/sfrtest.lst b/examples/data/sfr_test/sfrtest.lst deleted file mode 100644 index e1346b8a51..0000000000 --- a/examples/data/sfr_test/sfrtest.lst +++ /dev/null @@ -1,75 +0,0 @@ - MODFLOW-NWT-SWR1 - U.S. GEOLOGICAL SURVEY MODULAR FINITE-DIFFERENCE GROUNDWATER-FLOW MODEL - VERSION 1.1.4 4/01/2018 - BASED ON MODFLOW-2005 VERSION 1.12.00 02/03/2017 - - LIST FILE: sfrtest.lst - UNIT 2 - - OPENING sfrtest.bas - FILE TYPE:BAS6 UNIT 8 STATUS:OLD - FORMAT:FORMATTED ACCESS:SEQUENTIAL - - OPENING sfrtest.dis - FILE TYPE:DIS UNIT 9 STATUS:OLD - FORMAT:FORMATTED ACCESS:SEQUENTIAL - - OPENING sfrtest.upw - FILE TYPE:UPW UNIT 10 STATUS:OLD - FORMAT:FORMATTED ACCESS:SEQUENTIAL - - OPENING sfrtest13.sfr - FILE TYPE:SFR UNIT 11 STATUS:OLD - FORMAT:FORMATTED ACCESS:SEQUENTIAL - - BAS -- BASIC PACKAGE, VERSION 1.1.4, 4/01/2018 INPUT READ FROM UNIT 8 - - MODFLOW was compiled using mixed precision - Precision of REAL variables: 6 - Precision of DOUBLE PRECISION variables: 15 - - DISCRETIZATION INPUT DATA READ FROM UNIT 9 - 1 LAYERS 10 ROWS 10 COLUMNS - 3 STRESS PERIOD(S) IN SIMULATION - MODEL TIME UNIT IS DAYS - MODEL LENGTH UNIT IS METERS - Confining bed flag for each layer: - 0 - - DELR = 100.000 - - DELC = 100.000 - - TOP ELEVATION OF LAYER 1 = 1000.00 - - MODEL LAYER BOTTOM EL. = 0.00000 FOR LAYER 1 - - - STRESS PERIOD LENGTH TIME STEPS MULTIPLIER FOR DELT SS FLAG - ---------------------------------------------------------------------------- - 1 365.0000 365 1.000 SS - 2 365.0000 365 1.000 TR - 3 365.0000 365 1.000 TR - - COMBINED STEADY-STATE AND TRANSIENT SIMULATION - - - - - THE FREE FORMAT OPTION HAS BEEN SELECTED - - BOUNDARY ARRAY = 1 FOR LAYER 1 - - AQUIFER HEAD WILL BE SET TO -999.00 AT ALL NO-FLOW NODES (IBOUND=0). - - INITIAL HEAD = 1000.00 FOR LAYER 1 - - DEFAULT OUTPUT CONTROL - THE FOLLOWING OUTPUT COMES AT THE END OF EACH STRESS PERIOD: - TOTAL VOLUMETRIC BUDGET - HEAD - - UPW1 -- UPSTREAM WEIGHTING FLOW PACKAGE, VERSION 1.1.4, 4/01/2018 - INPUT READ FROM UNIT 10 - - No named parameters From acaabef8a45f4c9738e601cd0a55d21c29f6a205 Mon Sep 17 00:00:00 2001 From: Joshua Larsen Date: Thu, 14 Nov 2019 18:08:52 -0700 Subject: [PATCH 3/3] update for travis --- autotest/t010_test.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/autotest/t010_test.py b/autotest/t010_test.py index 6271a73892..20a0a2bd0f 100644 --- a/autotest/t010_test.py +++ b/autotest/t010_test.py @@ -122,7 +122,7 @@ def load_sfr_isfropt_icalc(isfropt, icalc): pth = os.path.join("..", "examples", "data", "sfr_test") nam = "sfrtest{}{}.nam".format(isfropt, icalc) ml = flopy.modflow.Modflow.load(nam, check=False, model_ws=pth, - exe_name="mfnwt.exe") + exe_name="mfnwt") sfr = ml.get_package("SFR") if sfr is None: raise AssertionError()