From 03cd6e9f689c2eae834c9cd759295ed4975dcbd5 Mon Sep 17 00:00:00 2001 From: David Landa Marban Date: Mon, 22 Jan 2024 17:37:45 +0100 Subject: [PATCH] Support for time interpolation summary to report data --- README.md | 2 +- examples/finner_grids/spe11a.txt | 16 +- examples/finner_grids/spe11b.txt | 16 +- examples/finner_grids/spe11c.txt | 16 +- examples/hello_world/spe11a.txt | 16 +- examples/hello_world/spe11b.txt | 18 +- examples/hello_world/spe11c.txt | 18 +- requirements.txt | 1 + src/pyopmspe11/core/pyopmspe11.py | 144 +- .../reference_mesh/facies_coordinates.msh | 1544 ++++++++--------- src/pyopmspe11/templates/co2/spe11a.mako | 16 +- src/pyopmspe11/templates/co2/spe11b.mako | 20 +- src/pyopmspe11/templates/co2/spe11c.mako | 18 +- .../templates/common/deck_initial.mako | 2 +- .../templates/common/grid_corner.mako | 2 +- .../templates/common/grid_initial.mako | 2 +- .../templates/common/grid_tensor.mako | 2 +- .../common/saturation_functions.mako | 6 +- src/pyopmspe11/utils/inputvalues.py | 6 +- src/pyopmspe11/utils/mapproperties.py | 197 ++- src/pyopmspe11/utils/runs.py | 2 + src/pyopmspe11/utils/writefile.py | 28 +- src/pyopmspe11/visualization/data.py | 597 +++++-- src/pyopmspe11/visualization/plotting.py | 8 +- tests/configs/input.txt | 20 +- tests/configs/spe11a.txt | 2 +- tests/configs/spe11c.txt | 17 +- 27 files changed, 1569 insertions(+), 1167 deletions(-) diff --git a/README.md b/README.md index c53268c..7058699 100644 --- a/README.md +++ b/README.md @@ -35,7 +35,7 @@ pip install -r dev-requirements.txt See the [_CI.yml_](https://github.com/OPM/pyopmspe11/blob/main/.github/workflows/CI.yml) script for installation of OPM Flow (binary packages) and the pyopmspe11 package. If you are a Linux user (including the windows subsystem for Linux), then you could try to build Flow from the master branches with mpi support, by running the script `./build_opm-flow_mpi.bash`, which in turn should build flow in the folder ./build/opm-simulators/bin/flow. -For macOS users with the latest chips (M1/M2, guessing also M3?), the resdata Python package is not available via pip install. Then before installation, remove resdata from the `requierements.txt`, then proceed with the Python requirements installation, install the OPM Flow dependencies (using macports or brew), and once inside the vpyopmspe11 Python environment, run the `./build_opm-flow_macOS.bash`, and deactivate and activate the virtual environment (this script builds OPM Flow as well as the opm Python package, and it exports the required PYTHONPATH). +For macOS users with the latest chips (M1/M2, guessing also M3?), the resdata Python package might not available via pip install, depending on the Python version (e.g., it is not found using Python 3.9, but it is installed using Python 3.10). If you face this issue, then before installation, remove resdata from the `requirements.txt`, then proceed with the Python requirements installation, install the OPM Flow dependencies (using macports or brew), and once inside the vpyopmspe11 Python environment, run the `./build_opm-flow_macOS.bash`, and deactivate and activate the virtual environment (this script builds OPM Flow as well as the opm Python package, and it exports the required PYTHONPATH). ## Running pyopmspe11 You can run _pyopmspe11_ as a single command line: diff --git a/examples/finner_grids/spe11a.txt b/examples/finner_grids/spe11a.txt index 0756e2f..db1801e 100644 --- a/examples/finner_grids/spe11a.txt +++ b/examples/finner_grids/spe11a.txt @@ -1,5 +1,5 @@ """Set the full path to the flow executable and flags""" -mpirun -np 23 flow --linear-solver=cprw --enable-tuning=true --enable-opm-rst-file=true --output-extra-convergence-info=steps,iterations --enable-well-operability-check=false --min-time-step-before-shutting-problematic-wells-in-days=1e-99 +mpirun -np 23 flow --linear-solver=cprw --newton-min-iterations=1 --enable-tuning=true --enable-opm-rst-file=true --output-extra-convergence-info=steps,iterations --enable-well-operability-check=false --min-time-step-before-shutting-problematic-wells-in-days=1e-99 """Set the model parameters""" spe11a master #Name of the spe case (spe11a, spe11b, or spe11c) and OPM Flow version (master or release) @@ -24,13 +24,13 @@ penmax * math.erf(pen * ((s_w-swi) / (1.-swi)) ** (-(1.0 / 1.5)) * math.pi**0.5 """Properties sat functions""" """swi [-], sni [-], pen [Pa], penmax [Pa], npoints [-]""" -SWI1 0.32 SNI1 0.1 PEN1 1500 PENMAX1 9.5e4 NPOINTS1 200000 -SWI2 0.14 SNI2 0.1 PEN2 300 PENMAX2 9.5e4 NPOINTS2 200000 -SWI3 0.12 SNI3 0.1 PEN3 100 PENMAX3 9.5e4 NPOINTS3 200000 -SWI4 0.12 SNI4 0.1 PEN4 25 PENMAX4 9.5e4 NPOINTS4 200000 -SWI5 0.12 SNI5 0.1 PEN5 10 PENMAX5 9.5e4 NPOINTS5 200000 -SWI6 0.10 SNI6 0.1 PEN6 1 PENMAX6 9.5e4 NPOINTS6 200000 -SWI7 0 SNI7 0 PEN7 0 PENMAX7 9.5e4 NPOINTS7 2 +SWI1 0.32 SNI1 0.1 PEN1 1500 PENMAX1 9.5e4 NPOINTS1 1000 +SWI2 0.14 SNI2 0.1 PEN2 300 PENMAX2 9.5e4 NPOINTS2 1000 +SWI3 0.12 SNI3 0.1 PEN3 100 PENMAX3 9.5e4 NPOINTS3 1000 +SWI4 0.12 SNI4 0.1 PEN4 25 PENMAX4 9.5e4 NPOINTS4 1000 +SWI5 0.12 SNI5 0.1 PEN5 10 PENMAX5 9.5e4 NPOINTS5 1000 +SWI6 0.10 SNI6 0.1 PEN6 1 PENMAX6 9.5e4 NPOINTS6 1000 +SWI7 0 SNI7 0 PEN7 0 PENMAX7 9.5e4 NPOINTS7 2 """Properties rock""" """K [mD], phi [-]""" diff --git a/examples/finner_grids/spe11b.txt b/examples/finner_grids/spe11b.txt index bd7f311..d5b8244 100644 --- a/examples/finner_grids/spe11b.txt +++ b/examples/finner_grids/spe11b.txt @@ -1,5 +1,5 @@ """Set the full path to the flow executable and flags""" -mpirun -np 23 flow --linear-solver=cprw --enable-tuning=true --enable-opm-rst-file=true --output-extra-convergence-info=steps,iterations --enable-well-operability-check=false --min-time-step-before-shutting-problematic-wells-in-days=1e-99 +mpirun -np 23 flow --linear-solver=cprw --newton-min-iterations=1 --enable-tuning=true --enable-opm-rst-file=true --output-extra-convergence-info=steps,iterations --enable-well-operability-check=false --min-time-step-before-shutting-problematic-wells-in-days=1e-99 """Set the model parameters""" spe11b master #Name of the spe case (spe11a, spe11b, or spe11c) and OPM Flow version (master or release) @@ -24,13 +24,13 @@ penmax * math.erf(pen * ((s_w-swi) / (1.-swi)) ** (-(1.0 / 1.5)) * math.pi**0.5 """Properties sat functions""" """swi [-], sni [-], pen [Pa], penmax [Pa], npoints [-]""" -SWI1 0.32 SNI1 0.1 PEN1 193531.39 PENMAX1 3e7 NPOINTS1 200000 -SWI2 0.14 SNI2 0.1 PEN2 8654.99 PENMAX2 3e7 NPOINTS2 200000 -SWI3 0.12 SNI3 0.1 PEN3 6120.00 PENMAX3 3e7 NPOINTS3 200000 -SWI4 0.12 SNI4 0.1 PEN4 3870.63 PENMAX4 3e7 NPOINTS4 200000 -SWI5 0.12 SNI5 0.1 PEN5 3060.00 PENMAX5 3e7 NPOINTS5 200000 -SWI6 0.10 SNI6 0.1 PEN6 2560.18 PENMAX6 3e7 NPOINTS6 200000 -SWI7 0 SNI7 0 PEN7 0 PENMAX7 3e7 NPOINTS7 2 +SWI1 0.32 SNI1 0.1 PEN1 193531.39 PENMAX1 3e7 NPOINTS1 1000 +SWI2 0.14 SNI2 0.1 PEN2 8654.99 PENMAX2 3e7 NPOINTS2 1000 +SWI3 0.12 SNI3 0.1 PEN3 6120.00 PENMAX3 3e7 NPOINTS3 1000 +SWI4 0.12 SNI4 0.1 PEN4 3870.63 PENMAX4 3e7 NPOINTS4 1000 +SWI5 0.12 SNI5 0.1 PEN5 3060.00 PENMAX5 3e7 NPOINTS5 1000 +SWI6 0.10 SNI6 0.1 PEN6 2560.18 PENMAX6 3e7 NPOINTS6 1000 +SWI7 0 SNI7 0 PEN7 0 PENMAX7 3e7 NPOINTS7 2 """Properties rock""" """K [mD], phi [-], thconr [W m-1 K-1]""" diff --git a/examples/finner_grids/spe11c.txt b/examples/finner_grids/spe11c.txt index 0da4e61..b6c7e1b 100644 --- a/examples/finner_grids/spe11c.txt +++ b/examples/finner_grids/spe11c.txt @@ -1,5 +1,5 @@ """Set the full path to the flow executable and flags""" -mpirun -np 71 flow --linear-solver=cprw --enable-tuning=true --enable-opm-rst-file=true --output-extra-convergence-info=steps,iterations --enable-well-operability-check=false --min-time-step-before-shutting-problematic-wells-in-days=1e-99 +mpirun -np 71 flow --linear-solver=cprw --newton-min-iterations=1 --enable-tuning=true --enable-opm-rst-file=true --output-extra-convergence-info=steps,iterations --enable-well-operability-check=false --min-time-step-before-shutting-problematic-wells-in-days=1e-99 """Set the model parameters""" spe11c master #Name of the spe case (spe11a, spe11b, or spe11c) and OPM Flow version (master or release) @@ -24,13 +24,13 @@ penmax * math.erf(pen * ((s_w-swi) / (1.-swi)) ** (-(1.0 / 1.5)) * math.pi**0.5 """Properties sat functions""" """swi [-], sni [-], pen [Pa], penmax [Pa], npoints [-]""" -SWI1 0.32 SNI1 0.1 PEN1 193531.39 PENMAX1 3e7 NPOINTS1 200000 -SWI2 0.14 SNI2 0.1 PEN2 8654.99 PENMAX2 3e7 NPOINTS2 200000 -SWI3 0.12 SNI3 0.1 PEN3 6120.00 PENMAX3 3e7 NPOINTS3 200000 -SWI4 0.12 SNI4 0.1 PEN4 3870.63 PENMAX4 3e7 NPOINTS4 200000 -SWI5 0.12 SNI5 0.1 PEN5 3060.00 PENMAX5 3e7 NPOINTS5 200000 -SWI6 0.10 SNI6 0.1 PEN6 2560.18 PENMAX6 3e7 NPOINTS6 200000 -SWI7 0 SNI7 0 PEN7 0 PENMAX7 3e7 NPOINTS7 2 +SWI1 0.32 SNI1 0.1 PEN1 193531.39 PENMAX1 3e7 NPOINTS1 1000 +SWI2 0.14 SNI2 0.1 PEN2 8654.99 PENMAX2 3e7 NPOINTS2 1000 +SWI3 0.12 SNI3 0.1 PEN3 6120.00 PENMAX3 3e7 NPOINTS3 1000 +SWI4 0.12 SNI4 0.1 PEN4 3870.63 PENMAX4 3e7 NPOINTS4 1000 +SWI5 0.12 SNI5 0.1 PEN5 3060.00 PENMAX5 3e7 NPOINTS5 1000 +SWI6 0.10 SNI6 0.1 PEN6 2560.18 PENMAX6 3e7 NPOINTS6 1000 +SWI7 0 SNI7 0 PEN7 0 PENMAX7 3e7 NPOINTS7 2 """Properties rock""" """K [mD], phi [-], thconr [W m-1 K-1]""" diff --git a/examples/hello_world/spe11a.txt b/examples/hello_world/spe11a.txt index 23d297b..3ae6dce 100644 --- a/examples/hello_world/spe11a.txt +++ b/examples/hello_world/spe11a.txt @@ -1,5 +1,5 @@ """Set the full path to the flow executable and flags""" -flow --linear-solver=cprw --enable-tuning=true --enable-opm-rst-file=true --output-extra-convergence-info=steps,iterations --enable-well-operability-check=false --min-time-step-before-shutting-problematic-wells-in-days=1e-99 +flow --linear-solver=cprw --enable-tuning=true --newton-min-iterations=1 --enable-opm-rst-file=true --output-extra-convergence-info=steps,iterations --enable-well-operability-check=false --min-time-step-before-shutting-problematic-wells-in-days=1e-99 """Set the model parameters""" spe11a master #Name of the spe case (spe11a, spe11b, or spe11c) and OPM Flow version (master or release) @@ -24,13 +24,13 @@ penmax * math.erf(pen * ((s_w-swi) / (1.-swi)) ** (-(1.0 / 1.5)) * math.pi**0.5 """Properties sat functions""" """swi [-], sni [-], pen [Pa], penmax [Pa], npoints [-]""" -SWI1 0.32 SNI1 0.1 PEN1 1500 PENMAX1 9.5e4 NPOINTS1 200000 -SWI2 0.14 SNI2 0.1 PEN2 300 PENMAX2 9.5e4 NPOINTS2 200000 -SWI3 0.12 SNI3 0.1 PEN3 100 PENMAX3 9.5e4 NPOINTS3 200000 -SWI4 0.12 SNI4 0.1 PEN4 25 PENMAX4 9.5e4 NPOINTS4 200000 -SWI5 0.12 SNI5 0.1 PEN5 10 PENMAX5 9.5e4 NPOINTS5 200000 -SWI6 0.10 SNI6 0.1 PEN6 1 PENMAX6 9.5e4 NPOINTS6 200000 -SWI7 0 SNI7 0 PEN7 0 PENMAX7 9.5e4 NPOINTS7 2 +SWI1 0.32 SNI1 0.1 PEN1 1500 PENMAX1 9.5e4 NPOINTS1 100 +SWI2 0.14 SNI2 0.1 PEN2 300 PENMAX2 9.5e4 NPOINTS2 100 +SWI3 0.12 SNI3 0.1 PEN3 100 PENMAX3 9.5e4 NPOINTS3 100 +SWI4 0.12 SNI4 0.1 PEN4 25 PENMAX4 9.5e4 NPOINTS4 100 +SWI5 0.12 SNI5 0.1 PEN5 10 PENMAX5 9.5e4 NPOINTS5 100 +SWI6 0.10 SNI6 0.1 PEN6 1 PENMAX6 9.5e4 NPOINTS6 100 +SWI7 0 SNI7 0 PEN7 0 PENMAX7 9.5e4 NPOINTS7 2 """Properties rock""" """K [mD], phi [-]""" diff --git a/examples/hello_world/spe11b.txt b/examples/hello_world/spe11b.txt index 05385cb..e6359c7 100644 --- a/examples/hello_world/spe11b.txt +++ b/examples/hello_world/spe11b.txt @@ -1,5 +1,5 @@ """Set the full path to the flow executable and flags""" -flow --linear-solver=cprw --enable-tuning=true --enable-opm-rst-file=true --output-extra-convergence-info=steps,iterations --enable-well-operability-check=false --min-time-step-before-shutting-problematic-wells-in-days=1e-99 +flow --linear-solver=cprw --enable-tuning=true --newton-min-iterations=1 --enable-opm-rst-file=true --output-extra-convergence-info=steps,iterations --enable-well-operability-check=false --min-time-step-before-shutting-problematic-wells-in-days=1e-99 """Set the model parameters""" spe11b master #Name of the spe case (spe11a, spe11b, or spe11c) and OPM Flow version (master or release) @@ -24,13 +24,13 @@ penmax * math.erf(pen * ((s_w-swi) / (1.-swi)) ** (-(1.0 / 1.5)) * math.pi**0.5 """Properties sat functions""" """swi [-], sni [-], pen [Pa], penmax [Pa], npoints [-]""" -SWI1 0.32 SNI1 0.1 PEN1 193531.39 PENMAX1 3e7 NPOINTS1 200000 -SWI2 0.14 SNI2 0.1 PEN2 8654.99 PENMAX2 3e7 NPOINTS2 200000 -SWI3 0.12 SNI3 0.1 PEN3 6120.00 PENMAX3 3e7 NPOINTS3 200000 -SWI4 0.12 SNI4 0.1 PEN4 3870.63 PENMAX4 3e7 NPOINTS4 200000 -SWI5 0.12 SNI5 0.1 PEN5 3060.00 PENMAX5 3e7 NPOINTS5 200000 -SWI6 0.10 SNI6 0.1 PEN6 2560.18 PENMAX6 3e7 NPOINTS6 200000 -SWI7 0 SNI7 0 PEN7 0 PENMAX7 3e7 NPOINTS7 2 +SWI1 0.32 SNI1 0.1 PEN1 193531.39 PENMAX1 3e7 NPOINTS1 100 +SWI2 0.14 SNI2 0.1 PEN2 8654.99 PENMAX2 3e7 NPOINTS2 100 +SWI3 0.12 SNI3 0.1 PEN3 6120.00 PENMAX3 3e7 NPOINTS3 100 +SWI4 0.12 SNI4 0.1 PEN4 3870.63 PENMAX4 3e7 NPOINTS4 100 +SWI5 0.12 SNI5 0.1 PEN5 3060.00 PENMAX5 3e7 NPOINTS5 100 +SWI6 0.10 SNI6 0.1 PEN6 2560.18 PENMAX6 3e7 NPOINTS6 100 +SWI7 0 SNI7 0 PEN7 0 PENMAX7 3e7 NPOINTS7 2 """Properties rock""" """K [mD], phi [-], thconr [W m-1 K-1]""" @@ -49,6 +49,6 @@ PERM7 1e-5 PORO7 1e-6 THCONR7 2.00 """Define the injection values ([hours] for spe11a; [years] for spe11b/c)""" """injection time, time step size to write results, maximum solver time step, injected fluid (0 water, 1 co2) (well1), injection rate [kg/s] (well1), temperature [C] (well1), injected fluid (0 water, 1 co2) (well2), ...""" -995 995 1 0 0 10 0 0 10 +995 995 50 0 0 10 0 0 10 5 5 1 0 0 10 0 0 10 25 5 1 1 0.035 10 1 0.035 10 \ No newline at end of file diff --git a/examples/hello_world/spe11c.txt b/examples/hello_world/spe11c.txt index d61c5e0..1dfc02d 100644 --- a/examples/hello_world/spe11c.txt +++ b/examples/hello_world/spe11c.txt @@ -1,5 +1,5 @@ """Set the full path to the flow executable and flags""" -flow --linear-solver=cprw --enable-tuning=true --enable-opm-rst-file=true --output-extra-convergence-info=steps,iterations --enable-well-operability-check=false --min-time-step-before-shutting-problematic-wells-in-days=1e-99 +flow --linear-solver=cprw --enable-tuning=true --newton-min-iterations=1 --enable-opm-rst-file=true --output-extra-convergence-info=steps,iterations --enable-well-operability-check=false --min-time-step-before-shutting-problematic-wells-in-days=1e-99 """Set the model parameters""" spe11c master #Name of the spe case (spe11a, spe11b, or spe11c) and OPM Flow version (master or release) @@ -24,13 +24,13 @@ penmax * math.erf(pen * ((s_w-swi) / (1.-swi)) ** (-(1.0 / 1.5)) * math.pi**0.5 """Properties sat functions""" """swi [-], sni [-], pen [Pa], penmax [Pa], npoints [-]""" -SWI1 0.32 SNI1 0.1 PEN1 193531.39 PENMAX1 3e7 NPOINTS1 200000 -SWI2 0.14 SNI2 0.1 PEN2 8654.99 PENMAX2 3e7 NPOINTS2 200000 -SWI3 0.12 SNI3 0.1 PEN3 6120.00 PENMAX3 3e7 NPOINTS3 200000 -SWI4 0.12 SNI4 0.1 PEN4 3870.63 PENMAX4 3e7 NPOINTS4 200000 -SWI5 0.12 SNI5 0.1 PEN5 3060.00 PENMAX5 3e7 NPOINTS5 200000 -SWI6 0.10 SNI6 0.1 PEN6 2560.18 PENMAX6 3e7 NPOINTS6 200000 -SWI7 0 SNI7 0 PEN7 0 PENMAX7 3e7 NPOINTS7 2 +SWI1 0.32 SNI1 0.1 PEN1 193531.39 PENMAX1 3e7 NPOINTS1 100 +SWI2 0.14 SNI2 0.1 PEN2 8654.99 PENMAX2 3e7 NPOINTS2 100 +SWI3 0.12 SNI3 0.1 PEN3 6120.00 PENMAX3 3e7 NPOINTS3 100 +SWI4 0.12 SNI4 0.1 PEN4 3870.63 PENMAX4 3e7 NPOINTS4 100 +SWI5 0.12 SNI5 0.1 PEN5 3060.00 PENMAX5 3e7 NPOINTS5 100 +SWI6 0.10 SNI6 0.1 PEN6 2560.18 PENMAX6 3e7 NPOINTS6 100 +SWI7 0 SNI7 0 PEN7 0 PENMAX7 3e7 NPOINTS7 2 """Properties rock""" """K [mD], phi [-], thconr [W m-1 K-1]""" @@ -49,6 +49,6 @@ PERM7 1e-5 PORO7 1e-6 THCONR7 2.00 """Define the injection values ([hours] for spe11a; [years] for spe11b/c)""" """injection time, time step size to write results, maximum solver time step, injected fluid (0 water, 1 co2) (well1), injection rate [kg/s] (well1), temperature [C] (well1), injected fluid (0 water, 1 co2) (well2), ...""" -995 995 5 0 0 10 0 0 10 +995 995 50 0 0 10 0 0 10 5 5 5 0 0 10 0 0 10 25 5 5 1 50 10 1 50 10 \ No newline at end of file diff --git a/requirements.txt b/requirements.txt index 446de71..c473e2a 100644 --- a/requirements.txt +++ b/requirements.txt @@ -2,4 +2,5 @@ mako matplotlib pandas resdata +scipy shapely \ No newline at end of file diff --git a/src/pyopmspe11/core/pyopmspe11.py b/src/pyopmspe11/core/pyopmspe11.py index d03888f..04b43da 100644 --- a/src/pyopmspe11/core/pyopmspe11.py +++ b/src/pyopmspe11/core/pyopmspe11.py @@ -16,63 +16,7 @@ def pyopmspe11(): """Main function""" - parser = argparse.ArgumentParser( - description="Main script to run the spe11s with OPM Flow." - ) - parser.add_argument( - "-i", - "--input", - default="input.txt", - help="The base name of the input file ('input.txt' by default).", - ) - parser.add_argument( - "-m", - "--mode", - default="deck_flow", - help="Run the whole framework ('all'), only create decks ('deck'), " - "only run flow ('flow'), only write benchmark data ('data'), " - "only create plots ('plot'), deck and run ('deck_flow'), " - "deck, run, and plot (deck_flow_plot), or deck, run, and data " - "(deck_flow_data) ('deck_flow' by default).", - ) - parser.add_argument( - "-c", - "--compare", - default="", - help="Generate a common plot for the current folders ('' by default).", - ) - parser.add_argument( - "-o", - "--output", - default="output", - help="The base name of the output folder ('output' by default).", - ) - parser.add_argument( - "-t", - "--time", - default="5", - help="Time interval for the spatial maps (spe11a [h]; spe11b/c [y]) ('24' by default).", - ) - parser.add_argument( - "-r", - "--resolution", - default="100,10,50", - help="Number of x, y, and z elements to write the data ('100,10,50' by default).", - ) - parser.add_argument( - "-g", - "--generate", - default="performance_sparse", - help="Write only the 'dense', 'sparse', 'performance', 'dense_performance', " - "'performance_sparse', 'dense_sparse', or 'all'", - ) - parser.add_argument( - "-u", - "--use", - default="resdata", - help="Using the 'opm' or 'resdata' python package (resdata by default).", - ) - cmdargs = vars(parser.parse_known_args()[0]) + cmdargs = load_parser() file = cmdargs["input"].strip() # Name of the input file dic = {"fol": cmdargs["output"].strip()} # Name for the output folder dic["generate"] = cmdargs["generate"].strip() # What data to write @@ -80,14 +24,19 @@ def pyopmspe11(): dic["mode"] = cmdargs["mode"].strip() # Parts of the workflow to run dic["pat"] = os.path.dirname(__file__)[:-5] # Path to the pyopmspe11 folder dic["compare"] = cmdargs["compare"].strip() # Make common figures for comparison - dic["use"] = cmdargs["use"] # OPM or resdata python package + dic["use"] = cmdargs["use"].strip() # OPM or resdata python package + dic["load"] = cmdargs[ + "load" + ].strip() # Summary or restart data for the sparse data interpolation dic["resolution"] = cmdargs[ "resolution" ].strip() # Spatial resolution to write the data dic["time_data"] = float( cmdargs["time"].strip() - ) # Temporal resolution to write the data - + ) # Temporal resolution to write the dense data + dic["dt_data"] = float( + cmdargs["write"].strip() + ) # Temporal resolution to write the sparse and performance data # If the compare plots are generated, then we exit right afterwards if dic["compare"]: plot_results(dic) @@ -141,6 +90,81 @@ def pyopmspe11(): plotting(dic) +def load_parser(): + """Argument options""" + parser = argparse.ArgumentParser( + description="Main script to run the spe11s with OPM Flow." + ) + parser.add_argument( + "-i", + "--input", + default="input.txt", + help="The base name of the input file ('input.txt' by default).", + ) + parser.add_argument( + "-m", + "--mode", + default="deck_flow", + help="Run the whole framework ('all'), only create decks ('deck'), " + "only run flow ('flow'), only write benchmark data ('data'), " + "only create plots ('plot'), deck and run ('deck_flow'), " + "deck, run, and plot (deck_flow_plot), or deck, run, and data " + "(deck_flow_data) ('deck_flow' by default).", + ) + parser.add_argument( + "-c", + "--compare", + default="", + help="Generate a common plot for the current folders ('' by default).", + ) + parser.add_argument( + "-o", + "--output", + default="output", + help="The base name of the output folder ('output' by default).", + ) + parser.add_argument( + "-t", + "--time", + default="5", + help="Time interval for the spatial maps (spe11a [h]; spe11b/c [y]) ('24' by default).", + ) + parser.add_argument( + "-r", + "--resolution", + default="100,10,50", + help="Number of x, y, and z elements to write the data ('100,10,50' by default).", + ) + parser.add_argument( + "-g", + "--generate", + default="performance_sparse", + help="Write only the 'dense', 'sparse', 'performance', 'dense_performance', " + "'performance_sparse', 'dense_sparse', or 'all'", + ) + parser.add_argument( + "-u", + "--use", + default="resdata", + help="Using the 'opm' or 'resdata' python package (resdata by default).", + ) + parser.add_argument( + "-l", + "--load", + default="summary", + help="Use the summary or restart for the interpolation in the sparse data " + "('summary' by default).", + ) + parser.add_argument( + "-w", + "--write", + default="0.1", + help="Time interval for the sparse and performance data (spe11a [h]; spe11b/c [y]) " + "('0.1' by default).", + ) + return vars(parser.parse_known_args()[0]) + + def main(): """Main function""" pyopmspe11() diff --git a/src/pyopmspe11/reference_mesh/facies_coordinates.msh b/src/pyopmspe11/reference_mesh/facies_coordinates.msh index 748f301..f23a386 100644 --- a/src/pyopmspe11/reference_mesh/facies_coordinates.msh +++ b/src/pyopmspe11/reference_mesh/facies_coordinates.msh @@ -175638,12 +175638,12 @@ $Elements 14277 3 2 5 2 2867 67821 67820 2868 14278 3 2 5 2 2867 2866 67822 67821 14279 3 2 5 2 2866 2865 67823 67822 -14280 3 2 5 2 47870 47871 65939 65938 -14281 3 2 5 2 47871 47872 65940 65939 -14282 3 2 5 2 47880 47881 65949 65948 -14283 3 2 5 2 47882 65950 65949 47881 +14280 3 2 5 2 47871 65939 65938 47870 +14281 3 2 5 2 47872 65940 65939 47871 +14282 3 2 5 2 47881 65949 65948 47880 +14283 3 2 5 2 47881 47882 65950 65949 14284 3 2 5 2 47923 47924 65992 65991 -14285 3 2 5 2 47924 47925 65993 65992 +14285 3 2 5 2 47925 65993 65992 47924 14286 3 2 5 2 47934 66002 66001 47933 14287 3 2 5 2 47935 66003 66002 47934 14288 3 2 5 2 47978 66046 66045 47977 @@ -175652,7 +175652,7 @@ $Elements 14291 3 2 5 2 47988 47989 66057 66056 14292 3 2 5 2 48031 66099 66098 48030 14293 3 2 5 2 48032 66100 66099 48031 -14294 3 2 5 2 66045 66044 47976 47977 +14294 3 2 5 2 66044 47976 47977 66045 14295 3 2 5 2 66004 66003 47935 47936 14296 3 2 5 2 47870 65938 65937 47869 14297 3 2 5 2 65947 47879 47880 65948 @@ -175661,9 +175661,9 @@ $Elements 14300 3 2 5 2 66100 48032 48033 66101 14301 3 2 5 2 65950 47882 47883 65951 14302 3 2 5 2 65990 47922 47923 65991 -14303 3 2 5 2 66058 66057 47989 47990 -14304 3 2 5 2 66098 66097 48029 48030 -14305 3 2 5 2 66048 66047 47979 47980 +14303 3 2 5 2 66057 47989 47990 66058 +14304 3 2 5 2 66097 48029 48030 66098 +14305 3 2 5 2 66047 47979 47980 66048 14306 3 2 5 2 65940 47872 47873 65941 14307 3 2 5 2 66000 47932 47933 66001 14308 3 2 5 2 47666 47667 65735 65734 @@ -175690,16 +175690,16 @@ $Elements 14329 3 2 5 2 65732 47664 47665 65733 14330 3 2 5 2 65746 65745 47677 47678 14331 3 2 5 2 65771 47703 47704 65772 -14332 3 2 5 2 65779 65778 47710 47711 +14332 3 2 5 2 65778 47710 47711 65779 14333 3 2 5 2 65804 47736 47737 65805 14334 3 2 5 2 65831 47763 47764 65832 14335 3 2 5 2 65842 65841 47773 47774 -14336 3 2 5 2 65858 65857 47789 47790 +14336 3 2 5 2 65857 47789 47790 65858 14337 3 2 5 2 65862 47794 47795 65863 14338 3 2 5 2 65875 47807 47808 65876 -14339 3 2 5 2 65889 65888 47820 47821 +14339 3 2 5 2 65888 47820 47821 65889 14340 3 2 5 2 65893 47825 47826 65894 -14341 3 2 5 2 65921 65920 47852 47853 +14341 3 2 5 2 65920 47852 47853 65921 14342 3 2 5 2 65933 47865 47866 65934 14343 3 2 5 2 65943 47875 47876 65944 14344 3 2 5 2 65957 47889 47890 65958 @@ -175714,9 +175714,9 @@ $Elements 14353 3 2 5 2 66052 47984 47985 66053 14354 3 2 5 2 66060 47992 47993 66061 14355 3 2 5 2 66074 66073 48005 48006 -14356 3 2 5 2 66095 66094 48026 48027 +14356 3 2 5 2 66094 48026 48027 66095 14357 3 2 5 2 66108 48040 48041 66109 -14358 3 2 5 2 66118 66117 48049 48050 +14358 3 2 5 2 66117 48049 48050 66118 14359 3 2 5 2 66119 48051 48052 66120 14360 3 2 5 2 66130 66129 48061 48062 14361 3 2 5 2 47650 65718 65717 47649 @@ -175733,7 +175733,7 @@ $Elements 14372 3 2 5 2 47766 47767 65835 65834 14373 3 2 5 2 47769 47770 65838 65837 14374 3 2 5 2 47783 65851 65850 47782 -14375 3 2 5 2 47792 47793 65861 65860 +14375 3 2 5 2 47793 65861 65860 47792 14376 3 2 5 2 47795 47796 65864 65863 14377 3 2 5 2 47808 47809 65877 65876 14378 3 2 5 2 47821 47822 65890 65889 @@ -175772,7 +175772,7 @@ $Elements 14411 3 2 5 2 65743 47675 47676 65744 14412 3 2 5 2 65745 65744 47676 47677 14413 3 2 5 2 65751 65750 47682 47683 -14414 3 2 5 2 65752 65751 47683 47684 +14414 3 2 5 2 65751 47683 47684 65752 14415 3 2 5 2 65753 65752 47684 47685 14416 3 2 5 2 65753 47685 47686 65754 14417 3 2 5 2 65755 65754 47686 47687 @@ -175780,7 +175780,7 @@ $Elements 14419 3 2 5 2 65757 65756 47688 47689 14420 3 2 5 2 65758 65757 47689 47690 14421 3 2 5 2 65759 65758 47690 47691 -14422 3 2 5 2 65761 47693 47694 65762 +14422 3 2 5 2 65762 65761 47693 47694 14423 3 2 5 2 65762 47694 47695 65763 14424 3 2 5 2 65768 65767 47699 47700 14425 3 2 5 2 65768 47700 47701 65769 @@ -175788,7 +175788,7 @@ $Elements 14427 3 2 5 2 65771 65770 47702 47703 14428 3 2 5 2 65777 47709 47710 65778 14429 3 2 5 2 65782 65781 47713 47714 -14430 3 2 5 2 65784 65783 47715 47716 +14430 3 2 5 2 65783 47715 47716 65784 14431 3 2 5 2 65785 65784 47716 47717 14432 3 2 5 2 65787 47719 47720 65788 14433 3 2 5 2 65788 47720 47721 65789 @@ -175824,55 +175824,55 @@ $Elements 14463 3 2 5 2 65866 47798 47799 65867 14464 3 2 5 2 65868 47800 47801 65869 14465 3 2 5 2 65875 65874 47806 47807 -14466 3 2 5 2 65877 47809 47810 65878 +14466 3 2 5 2 65878 65877 47809 47810 14467 3 2 5 2 65880 65879 47811 47812 14468 3 2 5 2 65884 47816 47817 65885 -14469 3 2 5 2 65885 47817 47818 65886 +14469 3 2 5 2 65886 65885 47817 47818 14470 3 2 5 2 65886 47818 47819 65887 14471 3 2 5 2 65887 47819 47820 65888 14472 3 2 5 2 65892 65891 47823 47824 14473 3 2 5 2 65893 65892 47824 47825 -14474 3 2 5 2 65894 47826 47827 65895 +14474 3 2 5 2 65895 65894 47826 47827 14475 3 2 5 2 65901 47833 47834 65902 14476 3 2 5 2 65903 65902 47834 47835 14477 3 2 5 2 65903 47835 47836 65904 -14478 3 2 5 2 65904 47836 47837 65905 +14478 3 2 5 2 65905 65904 47836 47837 14479 3 2 5 2 65912 65911 47843 47844 14480 3 2 5 2 65913 65912 47844 47845 14481 3 2 5 2 65913 47845 47846 65914 14482 3 2 5 2 65915 65914 47846 47847 14483 3 2 5 2 65916 65915 47847 47848 -14484 3 2 5 2 65916 47848 47849 65917 -14485 3 2 5 2 65919 47851 47852 65920 +14484 3 2 5 2 65917 65916 47848 47849 +14485 3 2 5 2 65920 65919 47851 47852 14486 3 2 5 2 65930 47862 47863 65931 14487 3 2 5 2 65932 47864 47865 65933 14488 3 2 5 2 65935 65934 47866 47867 14489 3 2 5 2 65937 65936 47868 47869 -14490 3 2 5 2 65941 47873 47874 65942 -14491 3 2 5 2 65944 47876 47877 65945 +14490 3 2 5 2 65942 65941 47873 47874 +14491 3 2 5 2 65945 65944 47876 47877 14492 3 2 5 2 65951 47883 47884 65952 -14493 3 2 5 2 65952 47884 47885 65953 +14493 3 2 5 2 65953 65952 47884 47885 14494 3 2 5 2 65953 47885 47886 65954 -14495 3 2 5 2 65954 47886 47887 65955 +14495 3 2 5 2 65955 65954 47886 47887 14496 3 2 5 2 65955 47887 47888 65956 -14497 3 2 5 2 65956 47888 47889 65957 -14498 3 2 5 2 65958 47890 47891 65959 -14499 3 2 5 2 65959 47891 47892 65960 +14497 3 2 5 2 65957 65956 47888 47889 +14498 3 2 5 2 65959 65958 47890 47891 +14499 3 2 5 2 65960 65959 47891 47892 14500 3 2 5 2 65964 47896 47897 65965 14501 3 2 5 2 65966 65965 47897 47898 14502 3 2 5 2 65966 47898 47899 65967 -14503 3 2 5 2 65967 47899 47900 65968 +14503 3 2 5 2 65968 65967 47899 47900 14504 3 2 5 2 65969 47901 47902 65970 -14505 3 2 5 2 65971 47903 47904 65972 +14505 3 2 5 2 65972 65971 47903 47904 14506 3 2 5 2 65974 47906 47907 65975 14507 3 2 5 2 65975 47907 47908 65976 -14508 3 2 5 2 65982 47914 47915 65983 +14508 3 2 5 2 65983 65982 47914 47915 14509 3 2 5 2 65984 47916 47917 65985 -14510 3 2 5 2 65985 47917 47918 65986 +14510 3 2 5 2 65986 65985 47917 47918 14511 3 2 5 2 65988 47920 47921 65989 14512 3 2 5 2 65996 47928 47929 65997 -14513 3 2 5 2 65999 65998 47930 47931 -14514 3 2 5 2 65999 47931 47932 66000 +14513 3 2 5 2 65998 47930 47931 65999 +14514 3 2 5 2 66000 65999 47931 47932 14515 3 2 5 2 66004 47936 47937 66005 14516 3 2 5 2 66007 66006 47938 47939 14517 3 2 5 2 66010 66009 47941 47942 @@ -175908,7 +175908,7 @@ $Elements 14547 3 2 5 2 66092 66091 48023 48024 14548 3 2 5 2 66092 48024 48025 66093 14549 3 2 5 2 66094 66093 48025 48026 -14550 3 2 5 2 66096 48028 48029 66097 +14550 3 2 5 2 66097 66096 48028 48029 14551 3 2 5 2 66102 66101 48033 48034 14552 3 2 5 2 66111 48043 48044 66112 14553 3 2 5 2 66113 48045 48046 66114 @@ -175924,16 +175924,16 @@ $Elements 14563 3 2 5 2 47713 65781 65780 47712 14564 3 2 5 2 47719 65787 65786 47718 14565 3 2 5 2 47729 65797 65796 47728 -14566 3 2 5 2 47738 47739 65807 65806 -14567 3 2 5 2 47765 47766 65834 65833 +14566 3 2 5 2 47739 65807 65806 47738 +14567 3 2 5 2 47766 65834 65833 47765 14568 3 2 5 2 47771 65839 65838 47770 -14569 3 2 5 2 47791 47792 65860 65859 -14570 3 2 5 2 47796 47797 65865 65864 +14569 3 2 5 2 47792 65860 65859 47791 +14570 3 2 5 2 47797 65865 65864 47796 14571 3 2 5 2 47801 47802 65870 65869 14572 3 2 5 2 47811 65879 65878 47810 14573 3 2 5 2 47823 65891 65890 47822 14574 3 2 5 2 47828 65896 65895 47827 -14575 3 2 5 2 47837 47838 65906 65905 +14575 3 2 5 2 47838 65906 65905 47837 14576 3 2 5 2 47850 65918 65917 47849 14577 3 2 5 2 47853 47854 65922 65921 14578 3 2 5 2 47862 65930 65929 47861 @@ -175943,17 +175943,17 @@ $Elements 14582 3 2 5 2 47909 65977 65976 47908 14583 3 2 5 2 47928 65996 65995 47927 14584 3 2 5 2 47940 66008 66007 47939 -14585 3 2 5 2 47954 47955 66023 66022 +14585 3 2 5 2 47955 66023 66022 47954 14586 3 2 5 2 47960 66028 66027 47959 14587 3 2 5 2 47976 66044 66043 47975 14588 3 2 5 2 47982 66050 66049 47981 -14589 3 2 5 2 47993 47994 66062 66061 -14590 3 2 5 2 48009 48010 66078 66077 -14591 3 2 5 2 48013 48014 66082 66081 +14589 3 2 5 2 47994 66062 66061 47993 +14590 3 2 5 2 48010 66078 66077 48009 +14591 3 2 5 2 48014 66082 66081 48013 14592 3 2 5 2 48021 66089 66088 48020 14593 3 2 5 2 48035 66103 66102 48034 -14594 3 2 5 2 48042 48043 66111 66110 -14595 3 2 5 2 48047 48048 66116 66115 +14594 3 2 5 2 48043 66111 66110 48042 +14595 3 2 5 2 48048 66116 66115 48047 14596 3 2 5 2 65714 65713 47645 47646 14597 3 2 5 2 65800 65799 47731 47732 14598 3 2 5 2 65821 65820 47752 47753 @@ -175967,16 +175967,16 @@ $Elements 14606 3 2 5 2 47721 47722 65790 65789 14607 3 2 5 2 47763 65831 65830 47762 14608 3 2 5 2 65720 65719 47651 47652 -14609 3 2 5 2 65900 47832 47833 65901 +14609 3 2 5 2 65901 65900 47832 47833 14610 3 2 5 2 65710 65709 47641 47642 14611 3 2 5 2 65817 65816 47748 47749 14612 3 2 5 2 65910 47842 47843 65911 -14613 3 2 5 2 65923 47855 47856 65924 +14613 3 2 5 2 65924 65923 47855 47856 14614 3 2 5 2 66031 66030 47962 47963 14615 3 2 5 2 66124 48056 48057 66125 14616 3 2 5 2 47726 65794 65793 47725 14617 3 2 5 2 47736 65804 65803 47735 -14618 3 2 5 2 47758 47759 65827 65826 +14618 3 2 5 2 47759 65827 65826 47758 14619 3 2 5 2 47950 66018 66017 47949 14620 3 2 5 2 65747 65746 47678 47679 14621 3 2 5 2 65873 47805 47806 65874 @@ -175984,7 +175984,7 @@ $Elements 14623 3 2 5 2 65980 47912 47913 65981 14624 3 2 5 2 47698 47699 65767 65766 14625 3 2 5 2 47785 47786 65854 65853 -14626 3 2 5 2 66068 66067 47999 48000 +14626 3 2 5 2 66067 47999 48000 66068 14627 3 2 5 2 66087 48019 48020 66088 14628 3 2 5 2 66108 66107 48039 48040 14629 3 2 5 2 47669 65737 65736 47668 @@ -176041,7 +176041,7 @@ $Elements 14680 3 2 5 2 48038 66106 66105 48037 14681 3 2 5 2 48039 66107 66106 48038 14682 3 2 5 2 48054 66122 66121 48053 -14683 3 2 5 2 65723 65722 47654 47655 +14683 3 2 5 2 65722 47654 47655 65723 14684 3 2 5 2 65738 65737 47669 47670 14685 3 2 5 2 65792 65791 47723 47724 14686 3 2 5 2 65819 47751 47752 65820 @@ -176050,21 +176050,21 @@ $Elements 14689 3 2 5 2 65845 47777 47778 65846 14690 3 2 5 2 65854 47786 47787 65855 14691 3 2 5 2 65882 65881 47813 47814 -14692 3 2 5 2 65926 65925 47857 47858 +14692 3 2 5 2 65925 47857 47858 65926 14693 3 2 5 2 66033 47965 47966 66034 14694 3 2 5 2 66068 48000 48001 66069 14695 3 2 5 2 66122 48054 48055 66123 14696 3 2 5 2 66124 66123 48055 48056 -14697 3 2 5 2 47643 47644 65712 65711 +14697 3 2 5 2 47644 65712 65711 47643 14698 3 2 5 2 47680 65748 65747 47679 14699 3 2 5 2 47708 65776 65775 47707 -14700 3 2 5 2 47722 47723 65791 65790 +14700 3 2 5 2 47723 65791 65790 47722 14701 3 2 5 2 47751 65819 65818 47750 14702 3 2 5 2 47777 65845 65844 47776 14703 3 2 5 2 47805 65873 65872 47804 -14704 3 2 5 2 47814 47815 65883 65882 +14704 3 2 5 2 47815 65883 65882 47814 14705 3 2 5 2 47894 65962 65961 47893 -14706 3 2 5 2 47911 47912 65980 65979 +14706 3 2 5 2 47912 65980 65979 47911 14707 3 2 5 2 47948 66016 66015 47947 14708 3 2 5 2 220 339 63768 45700 14709 3 2 5 2 2865 252 360 67823 @@ -177271,8 +177271,8 @@ $Elements 15910 3 2 5 2 65136 65135 47067 47068 15911 3 2 5 2 65139 65138 47070 47071 15912 3 2 5 2 65198 47130 47131 65199 -15913 3 2 5 2 65239 47171 47172 65240 -15914 3 2 5 2 65240 47172 47173 65241 +15913 3 2 5 2 65240 65239 47171 47172 +15914 3 2 5 2 65241 65240 47172 47173 15915 3 2 5 2 65243 47175 47176 65244 15916 3 2 5 2 65267 47199 47200 65268 15917 3 2 5 2 46999 47000 65068 65067 @@ -177305,7 +177305,7 @@ $Elements 15944 3 2 5 2 65096 47028 47029 65097 15945 3 2 5 2 65204 65203 47135 47136 15946 3 2 5 2 65291 47223 47224 65292 -15947 3 2 5 2 65294 47226 47227 65295 +15947 3 2 5 2 65295 65294 47226 47227 15948 3 2 5 2 65290 65289 47221 47222 15949 3 2 5 2 47136 47137 65205 65204 15950 3 2 5 2 65099 65098 47030 47031 @@ -177355,7 +177355,7 @@ $Elements 15994 3 2 5 2 64851 64850 46782 46783 15995 3 2 5 2 64855 64854 46786 46787 15996 3 2 5 2 64857 46789 46790 64858 -15997 3 2 5 2 64858 46790 46791 64859 +15997 3 2 5 2 64859 64858 46790 46791 15998 3 2 5 2 64859 46791 46792 64860 15999 3 2 5 2 64861 64860 46792 46793 16000 3 2 5 2 64870 46802 46803 64871 @@ -177368,7 +177368,7 @@ $Elements 16007 3 2 5 2 64880 46812 46813 64881 16008 3 2 5 2 64881 46813 46814 64882 16009 3 2 5 2 64882 46814 46815 64883 -16010 3 2 5 2 64885 46817 46818 64886 +16010 3 2 5 2 64886 64885 46817 46818 16011 3 2 5 2 64887 46819 46820 64888 16012 3 2 5 2 64888 46820 46821 64889 16013 3 2 5 2 64889 46821 46822 64890 @@ -177476,8 +177476,8 @@ $Elements 16115 3 2 5 2 65108 47040 47041 65109 16116 3 2 5 2 65110 65109 47041 47042 16117 3 2 5 2 65111 47043 47044 65112 -16118 3 2 5 2 65114 65113 47045 47046 -16119 3 2 5 2 65114 47046 47047 65115 +16118 3 2 5 2 65113 47045 47046 65114 +16119 3 2 5 2 65115 65114 47046 47047 16120 3 2 5 2 65116 65115 47047 47048 16121 3 2 5 2 65116 47048 47049 65117 16122 3 2 5 2 65118 65117 47049 47050 @@ -177535,7 +177535,7 @@ $Elements 16174 3 2 5 2 65221 65220 47152 47153 16175 3 2 5 2 65221 47153 47154 65222 16176 3 2 5 2 65223 65222 47154 47155 -16177 3 2 5 2 65223 47155 47156 65224 +16177 3 2 5 2 65224 65223 47155 47156 16178 3 2 5 2 65224 47156 47157 65225 16179 3 2 5 2 65226 47158 47159 65227 16180 3 2 5 2 65227 47159 47160 65228 @@ -177545,8 +177545,8 @@ $Elements 16184 3 2 5 2 65250 65249 47181 47182 16185 3 2 5 2 65251 65250 47182 47183 16186 3 2 5 2 65251 47183 47184 65252 -16187 3 2 5 2 65252 47184 47185 65253 -16188 3 2 5 2 65254 47186 47187 65255 +16187 3 2 5 2 65253 65252 47184 47185 +16188 3 2 5 2 65255 65254 47186 47187 16189 3 2 5 2 65271 47203 47204 65272 16190 3 2 5 2 65273 65272 47204 47205 16191 3 2 5 2 65273 47205 47206 65274 @@ -177560,8 +177560,8 @@ $Elements 16199 3 2 5 2 65284 65283 47215 47216 16200 3 2 5 2 65285 47217 47218 65286 16201 3 2 5 2 65287 65286 47218 47219 -16202 3 2 5 2 65287 47219 47220 65288 -16203 3 2 5 2 65288 47220 47221 65289 +16202 3 2 5 2 65288 65287 47219 47220 +16203 3 2 5 2 65289 65288 47220 47221 16204 3 2 5 2 46768 46769 64837 64836 16205 3 2 5 2 46770 46771 64839 64838 16206 3 2 5 2 46772 64840 64839 46771 @@ -177721,14 +177721,14 @@ $Elements 16360 3 2 5 2 65231 47163 47164 65232 16361 3 2 5 2 65232 47164 47165 65233 16362 3 2 5 2 65233 47165 47166 65234 -16363 3 2 5 2 65234 47166 47167 65235 +16363 3 2 5 2 65235 65234 47166 47167 16364 3 2 5 2 65237 65236 47168 47169 16365 3 2 5 2 65258 65257 47189 47190 -16366 3 2 5 2 65258 47190 47191 65259 -16367 3 2 5 2 65260 47192 47193 65261 +16366 3 2 5 2 65259 65258 47190 47191 +16367 3 2 5 2 65261 65260 47192 47193 16368 3 2 5 2 65261 47193 47194 65262 16369 3 2 5 2 65262 47194 47195 65263 -16370 3 2 5 2 65297 47229 47230 65298 +16370 3 2 5 2 65298 65297 47229 47230 16371 3 2 5 2 49730 71364 71363 49731 16372 3 2 5 2 49731 71363 71362 49732 16373 3 2 5 2 52145 68949 68948 52146 @@ -178041,27 +178041,27 @@ $Elements 16680 3 2 5 2 49733 71361 71360 49734 16681 3 2 5 2 49734 71360 71359 49735 16682 3 2 5 2 46458 46459 64527 64526 -16683 3 2 5 2 46395 64463 64462 46394 +16683 3 2 5 2 46394 46395 64463 64462 16684 3 2 5 2 46395 46396 64464 64463 -16685 3 2 5 2 46458 64526 64525 46457 +16685 3 2 5 2 46457 46458 64526 64525 16686 3 2 5 2 64497 46429 46430 64498 16687 3 2 5 2 46431 64499 64498 46430 16688 3 2 5 2 46432 64500 64499 46431 -16689 3 2 5 2 46460 64528 64527 46459 +16689 3 2 5 2 46459 46460 64528 64527 16690 3 2 5 2 46429 64497 64496 46428 -16691 3 2 5 2 46330 64398 64397 46329 +16691 3 2 5 2 46329 46330 64398 64397 16692 3 2 5 2 46329 64397 64396 46328 16693 3 2 5 2 46456 46457 64525 64524 16694 3 2 5 2 46460 46461 64529 64528 16695 3 2 5 2 46393 46394 64462 64461 -16696 3 2 5 2 46397 64465 64464 46396 +16696 3 2 5 2 46396 46397 64465 64464 16697 3 2 5 2 64501 64500 46432 46433 16698 3 2 5 2 46363 64431 64430 46362 -16699 3 2 5 2 46364 64432 64431 46363 +16699 3 2 5 2 46363 46364 64432 64431 16700 3 2 5 2 64496 64495 46427 46428 16701 3 2 5 2 64398 46330 46331 64399 16702 3 2 5 2 64395 46327 46328 64396 -16703 3 2 5 2 46456 64524 64523 46455 +16703 3 2 5 2 46455 46456 64524 64523 16704 3 2 5 2 46461 46462 64530 64529 16705 3 2 5 2 46397 46398 64466 64465 16706 3 2 5 2 64461 64460 46392 46393 @@ -178085,11 +178085,11 @@ $Elements 16724 3 2 5 2 64386 46318 46319 64387 16725 3 2 5 2 64387 46319 46320 64388 16726 3 2 5 2 64391 64390 46322 46323 -16727 3 2 5 2 64392 64391 46323 46324 +16727 3 2 5 2 64391 46323 46324 64392 16728 3 2 5 2 64400 64399 46331 46332 16729 3 2 5 2 64400 46332 46333 64401 16730 3 2 5 2 64403 46335 46336 64404 -16731 3 2 5 2 64405 64404 46336 46337 +16731 3 2 5 2 64404 46336 46337 64405 16732 3 2 5 2 64408 46340 46341 64409 16733 3 2 5 2 64412 46344 46345 64413 16734 3 2 5 2 64417 64416 46348 46349 @@ -178098,25 +178098,25 @@ $Elements 16737 3 2 5 2 64424 46356 46357 64425 16738 3 2 5 2 64425 46357 46358 64426 16739 3 2 5 2 64436 46368 46369 64437 -16740 3 2 5 2 64443 64442 46374 46375 +16740 3 2 5 2 64442 46374 46375 64443 16741 3 2 5 2 64443 46375 46376 64444 -16742 3 2 5 2 64446 64445 46377 46378 +16742 3 2 5 2 64445 46377 46378 64446 16743 3 2 5 2 64446 46378 46379 64447 -16744 3 2 5 2 64451 64450 46382 46383 +16744 3 2 5 2 64450 46382 46383 64451 16745 3 2 5 2 64454 46386 46387 64455 16746 3 2 5 2 64458 46390 46391 64459 -16747 3 2 5 2 64467 64466 46398 46399 +16747 3 2 5 2 64466 46398 46399 64467 16748 3 2 5 2 64467 46399 46400 64468 -16749 3 2 5 2 64473 64472 46404 46405 +16749 3 2 5 2 64472 46404 46405 64473 16750 3 2 5 2 64476 64475 46407 46408 -16751 3 2 5 2 64480 64479 46411 46412 +16751 3 2 5 2 64479 46411 46412 64480 16752 3 2 5 2 64480 46412 46413 64481 16753 3 2 5 2 64482 46414 46415 64483 16754 3 2 5 2 64483 46415 46416 64484 16755 3 2 5 2 64488 46420 46421 64489 16756 3 2 5 2 64489 46421 46422 64490 16757 3 2 5 2 64493 64492 46424 46425 -16758 3 2 5 2 64505 64504 46436 46437 +16758 3 2 5 2 64504 46436 46437 64505 16759 3 2 5 2 64508 46440 46441 64509 16760 3 2 5 2 64510 64509 46441 46442 16761 3 2 5 2 64512 46444 46445 64513 @@ -178124,11 +178124,11 @@ $Elements 16763 3 2 5 2 64518 64517 46449 46450 16764 3 2 5 2 64518 46450 46451 64519 16765 3 2 5 2 64521 46453 46454 64522 -16766 3 2 5 2 64523 64522 46454 46455 +16766 3 2 5 2 64522 46454 46455 64523 16767 3 2 5 2 64530 46462 46463 64531 16768 3 2 5 2 64535 64534 46466 46467 16769 3 2 5 2 64535 46467 46468 64536 -16770 3 2 5 2 64540 64539 46471 46472 +16770 3 2 5 2 64539 46471 46472 64540 16771 3 2 5 2 64541 46473 46474 64542 16772 3 2 5 2 64542 46474 46475 64543 16773 3 2 5 2 46316 46317 64385 64384 @@ -178217,7 +178217,7 @@ $Elements 16856 3 2 5 2 50429 50428 70666 70665 16857 3 2 5 2 50427 50426 70668 70667 16858 3 2 5 2 50235 242 370 70859 -16859 3 2 5 2 50240 50239 70855 70854 +16859 3 2 5 2 50239 70855 70854 50240 16860 3 2 5 2 50235 70859 70858 50236 16861 3 2 5 2 70676 50418 50417 70677 16862 3 2 5 2 50429 70665 369 243 @@ -178295,7 +178295,7 @@ $Elements 16934 3 2 5 2 50268 70826 70825 50269 16935 3 2 5 2 50275 50274 70820 70819 16936 3 2 5 2 70821 50273 50272 70822 -16937 3 2 5 2 70820 50274 50273 70821 +16937 3 2 5 2 70821 70820 50274 50273 16938 3 2 5 2 70826 50268 50267 70827 16939 3 2 5 2 70706 50388 50387 70707 16940 3 2 5 2 50276 70818 70817 50277 @@ -178307,7 +178307,7 @@ $Elements 16946 3 2 5 2 50287 70807 70806 50288 16947 3 2 5 2 70717 70716 50378 50377 16948 3 2 5 2 70709 50385 50384 70710 -16949 3 2 5 2 50287 50286 70808 70807 +16949 3 2 5 2 50286 70808 70807 50287 16950 3 2 5 2 70815 70814 50280 50279 16951 3 2 5 2 70718 50376 50375 70719 16952 3 2 5 2 50288 70806 70805 50289 @@ -178327,7 +178327,7 @@ $Elements 16966 3 2 5 2 50289 70805 70804 50290 16967 3 2 5 2 70720 50374 50373 70721 16968 3 2 5 2 50290 70804 70803 50291 -16969 3 2 5 2 50371 50370 70724 70723 +16969 3 2 5 2 50370 70724 70723 50371 16970 3 2 5 2 50368 70726 70725 50369 16971 3 2 5 2 70736 50358 50357 70737 16972 3 2 5 2 70729 50365 50364 70730 @@ -178342,7 +178342,7 @@ $Elements 16981 3 2 5 2 70731 70730 50364 50363 16982 3 2 5 2 70735 50359 50358 70736 16983 3 2 5 2 50363 50362 70732 70731 -16984 3 2 5 2 70733 70732 50362 50361 +16984 3 2 5 2 70732 50362 50361 70733 16985 3 2 5 2 70734 50360 50359 70735 16986 3 2 5 2 70796 70795 50299 50298 16987 3 2 5 2 70793 50301 50300 70794 @@ -178373,7 +178373,7 @@ $Elements 17012 3 2 5 2 70780 50314 50313 70781 17013 3 2 5 2 70783 50311 50310 70784 17014 3 2 5 2 70782 70781 50313 50312 -17015 3 2 5 2 70782 50312 50311 70783 +17015 3 2 5 2 70783 70782 50312 50311 17016 3 2 5 2 70743 50351 50350 70744 17017 3 2 5 2 70744 50350 50349 70745 17018 3 2 5 2 70780 70779 50315 50314 @@ -178405,7 +178405,7 @@ $Elements 17044 3 2 5 2 50338 70756 70755 50339 17045 3 2 5 2 70758 50336 50335 70759 17046 3 2 5 2 70756 50338 50337 70757 -17047 3 2 5 2 70760 50334 50333 70761 +17047 3 2 5 2 70761 70760 50334 50333 17048 3 2 5 2 70759 50335 50334 70760 17049 3 2 5 2 70761 50333 50332 70762 17050 3 2 5 2 70757 50337 50336 70758 @@ -178479,17 +178479,17 @@ $Elements 17118 3 2 5 2 66373 66372 48304 48305 17119 3 2 5 2 66256 48188 48189 66257 17120 3 2 5 2 66258 48190 48191 66259 -17121 3 2 5 2 66260 66259 48191 48192 -17122 3 2 5 2 66264 66263 48195 48196 +17121 3 2 5 2 66259 48191 48192 66260 +17122 3 2 5 2 66263 48195 48196 66264 17123 3 2 5 2 66266 66265 48197 48198 -17124 3 2 5 2 66267 66266 48198 48199 -17125 3 2 5 2 66274 66273 48205 48206 -17126 3 2 5 2 66277 66276 48208 48209 +17124 3 2 5 2 66266 48198 48199 66267 +17125 3 2 5 2 66273 48205 48206 66274 +17126 3 2 5 2 66276 48208 48209 66277 17127 3 2 5 2 66277 48209 48210 66278 17128 3 2 5 2 66280 66279 48211 48212 17129 3 2 5 2 66283 66282 48214 48215 -17130 3 2 5 2 66284 66283 48215 48216 -17131 3 2 5 2 66286 66285 48217 48218 +17130 3 2 5 2 66283 48215 48216 66284 +17131 3 2 5 2 66285 48217 48218 66286 17132 3 2 5 2 66287 66286 48218 48219 17133 3 2 5 2 66294 66293 48225 48226 17134 3 2 5 2 66297 66296 48228 48229 @@ -178816,7 +178816,7 @@ $Elements 17455 3 2 5 2 48258 66326 66325 48257 17456 3 2 5 2 48264 66332 66331 48263 17457 3 2 5 2 66309 48241 48242 66310 -17458 3 2 5 2 66329 66328 48260 48261 +17458 3 2 5 2 66328 48260 48261 66329 17459 3 2 5 2 66170 66169 48101 48102 17460 3 2 5 2 48236 66304 66303 48235 17461 3 2 5 2 48237 66305 66304 48236 @@ -179027,7 +179027,7 @@ $Elements 17666 3 2 5 2 46113 64181 64180 46112 17667 3 2 5 2 64102 46034 46035 64103 17668 3 2 5 2 64162 64161 46093 46094 -17669 3 2 5 2 64101 64100 46032 46033 +17669 3 2 5 2 64100 46032 46033 64101 17670 3 2 5 2 64179 64178 46110 46111 17671 3 2 5 2 64164 64163 46095 46096 17672 3 2 5 2 64242 64241 46173 46174 @@ -179103,7 +179103,7 @@ $Elements 17742 3 2 5 2 65483 65482 47414 47415 17743 3 2 5 2 47428 47429 65497 65496 17744 3 2 5 2 47366 65434 65433 47365 -17745 3 2 5 2 65446 47378 47379 65447 +17745 3 2 5 2 65447 65446 47378 47379 17746 3 2 5 2 65442 47374 47375 65443 17747 3 2 5 2 65444 65443 47375 47376 17748 3 2 5 2 65466 47398 47399 65467 @@ -179322,7 +179322,7 @@ $Elements 17961 3 2 5 2 47504 65572 65571 47503 17962 3 2 5 2 47507 65575 65574 47506 17963 3 2 5 2 47513 65581 65580 47512 -17964 3 2 5 2 47515 65583 65582 47514 +17964 3 2 5 2 47514 47515 65583 65582 17965 3 2 5 2 47526 65594 65593 47525 17966 3 2 5 2 47531 65599 65598 47530 17967 3 2 5 2 47545 65613 65612 47544 @@ -179339,7 +179339,7 @@ $Elements 17978 3 2 5 2 47593 47594 65662 65661 17979 3 2 5 2 47597 65665 65664 47596 17980 3 2 5 2 47600 65668 65667 47599 -17981 3 2 5 2 47603 65671 65670 47602 +17981 3 2 5 2 47602 47603 65671 65670 17982 3 2 5 2 47606 65674 65673 47605 17983 3 2 5 2 47612 47613 65681 65680 17984 3 2 5 2 47616 65684 65683 47615 @@ -179935,7 +179935,7 @@ $Elements 18574 3 2 5 2 68736 68735 52359 52358 18575 3 2 5 2 68730 52364 52363 68731 18576 3 2 5 2 68759 68758 52336 52335 -18577 3 2 5 2 68751 52343 52342 68752 +18577 3 2 5 2 68752 68751 52343 52342 18578 3 2 5 2 68751 68750 52344 52343 18579 3 2 5 2 68745 68744 52350 52349 18580 3 2 5 2 68741 52353 52352 68742 @@ -179958,14 +179958,14 @@ $Elements 18597 3 2 5 2 52313 52312 68782 68781 18598 3 2 5 2 52323 68771 68770 52324 18599 3 2 5 2 52316 68778 68777 52317 -18600 3 2 5 2 68765 52329 52328 68766 +18600 3 2 5 2 68766 68765 52329 52328 18601 3 2 5 2 68715 68714 52380 52379 18602 3 2 5 2 52328 52327 68767 68766 18603 3 2 5 2 68772 68771 52323 52322 18604 3 2 5 2 52315 52314 68780 68779 18605 3 2 5 2 52326 68768 68767 52327 18606 3 2 5 2 52381 52380 68714 68713 -18607 3 2 5 2 68783 52311 52310 68784 +18607 3 2 5 2 68784 68783 52311 52310 18608 3 2 5 2 68785 68784 52310 52309 18609 3 2 5 2 68778 52316 52315 68779 18610 3 2 5 2 68712 52382 52381 68713 @@ -180023,7 +180023,7 @@ $Elements 18662 3 2 5 2 52410 68684 68683 52411 18663 3 2 5 2 52412 52411 68683 68682 18664 3 2 5 2 52418 68676 68675 52419 -18665 3 2 5 2 68669 68668 52426 52425 +18665 3 2 5 2 68668 52426 52425 68669 18666 3 2 5 2 68669 52425 52424 68670 18667 3 2 5 2 68668 68667 52427 52426 18668 3 2 5 2 52428 68666 68665 52429 @@ -180084,11 +180084,11 @@ $Elements 18723 3 2 5 2 68837 52257 52256 68838 18724 3 2 5 2 68833 52261 52260 68834 18725 3 2 5 2 52260 52259 68835 68834 -18726 3 2 5 2 52249 52248 68846 68845 -18727 3 2 5 2 52251 52250 68844 68843 -18728 3 2 5 2 52252 52251 68843 68842 +18726 3 2 5 2 52248 68846 68845 52249 +18727 3 2 5 2 52250 68844 68843 52251 +18728 3 2 5 2 52251 68843 68842 52252 18729 3 2 5 2 52255 52254 68840 68839 -18730 3 2 5 2 52258 52257 68837 68836 +18730 3 2 5 2 52257 68837 68836 52258 18731 3 2 5 2 52248 52247 68847 68846 18732 3 2 5 2 52283 52282 68812 68811 18733 3 2 5 2 52263 68831 68830 52264 @@ -180098,7 +180098,7 @@ $Elements 18737 3 2 5 2 68815 52279 52278 68816 18738 3 2 5 2 52272 68822 68821 52273 18739 3 2 5 2 68850 52244 52243 68851 -18740 3 2 5 2 68814 52280 52279 68815 +18740 3 2 5 2 68815 68814 52280 52279 18741 3 2 5 2 52270 68824 68823 52271 18742 3 2 5 2 52273 68821 68820 52274 18743 3 2 5 2 52276 68818 68817 52277 @@ -180109,7 +180109,7 @@ $Elements 18748 3 2 5 2 68818 52276 52275 68819 18749 3 2 5 2 52241 68853 68852 52242 18750 3 2 5 2 68825 52269 52268 68826 -18751 3 2 5 2 68819 52275 52274 68820 +18751 3 2 5 2 68820 68819 52275 52274 18752 3 2 5 2 68816 52278 52277 68817 18753 3 2 5 2 52241 52240 68854 68853 18754 3 2 5 2 52265 68829 68828 52266 @@ -180133,8 +180133,8 @@ $Elements 18772 3 2 5 2 52452 52451 68643 68642 18773 3 2 5 2 68856 68855 52239 52238 18774 3 2 5 2 52238 52237 68857 68856 -18775 3 2 5 2 68634 68633 52461 52460 -18776 3 2 5 2 68633 68632 52462 52461 +18775 3 2 5 2 68633 52461 52460 68634 +18776 3 2 5 2 68632 52462 52461 68633 18777 3 2 5 2 52455 52454 68640 68639 18778 3 2 5 2 52456 52455 68639 68638 18779 3 2 5 2 68637 52457 52456 68638 @@ -180150,9 +180150,9 @@ $Elements 18789 3 2 5 2 52503 52502 68592 68591 18790 3 2 5 2 68622 52472 52471 68623 18791 3 2 5 2 52469 52468 68626 68625 -18792 3 2 5 2 52473 68621 68620 52474 -18793 3 2 5 2 52475 68619 68618 52476 -18794 3 2 5 2 52476 68618 68617 52477 +18792 3 2 5 2 52474 52473 68621 68620 +18793 3 2 5 2 52476 52475 68619 68618 +18794 3 2 5 2 52477 52476 68618 68617 18795 3 2 5 2 68621 52473 52472 68622 18796 3 2 5 2 68617 68616 52478 52477 18797 3 2 5 2 68862 52232 52231 68863 @@ -180163,7 +180163,7 @@ $Elements 18802 3 2 5 2 68608 68607 52487 52486 18803 3 2 5 2 52487 68607 68606 52488 18804 3 2 5 2 68605 52489 52488 68606 -18805 3 2 5 2 52500 68594 68593 52501 +18805 3 2 5 2 52501 52500 68594 68593 18806 3 2 5 2 52507 52506 68588 68587 18807 3 2 5 2 52498 68596 68595 52499 18808 3 2 5 2 68604 68603 52491 52490 @@ -180218,15 +180218,15 @@ $Elements 18857 3 2 5 2 52201 52200 68894 68893 18858 3 2 5 2 52201 68893 68892 52202 18859 3 2 5 2 52200 52199 68895 68894 -18860 3 2 5 2 52206 52205 68889 68888 +18860 3 2 5 2 52205 68889 68888 52206 18861 3 2 5 2 52207 68887 68886 52208 18862 3 2 5 2 52203 68891 68890 52204 18863 3 2 5 2 68883 68882 52212 52211 18864 3 2 5 2 68881 68880 52214 52213 18865 3 2 5 2 52210 52209 68885 68884 18866 3 2 5 2 52204 68890 68889 52205 -18867 3 2 5 2 52207 52206 68888 68887 -18868 3 2 5 2 52209 52208 68886 68885 +18867 3 2 5 2 52206 68888 68887 52207 +18868 3 2 5 2 52208 68886 68885 52209 18869 3 2 5 2 52211 52210 68884 68883 18870 3 2 5 2 52213 52212 68882 68881 18871 3 2 5 2 52202 68892 68891 52203 @@ -180246,7 +180246,7 @@ $Elements 18885 3 2 5 2 52553 52552 68542 68541 18886 3 2 5 2 52171 52170 68924 68923 18887 3 2 5 2 52173 68921 68920 52174 -18888 3 2 5 2 52178 52177 68917 68916 +18888 3 2 5 2 52177 68917 68916 52178 18889 3 2 5 2 52180 68914 68913 52181 18890 3 2 5 2 52188 68906 68905 52189 18891 3 2 5 2 52190 52189 68905 68904 @@ -180274,7 +180274,7 @@ $Elements 18913 3 2 5 2 68899 52195 52194 68900 18914 3 2 5 2 52531 52530 68564 68563 18915 3 2 5 2 68551 52543 52542 68552 -18916 3 2 5 2 68551 68550 52544 52543 +18916 3 2 5 2 68550 52544 52543 68551 18917 3 2 5 2 52531 68563 68562 52532 18918 3 2 5 2 52551 52550 68544 68543 18919 3 2 5 2 68546 68545 52549 52548 @@ -180295,7 +180295,7 @@ $Elements 18934 3 2 5 2 52178 68916 68915 52179 18935 3 2 5 2 68548 52546 52545 68549 18936 3 2 5 2 68925 52169 52168 68926 -18937 3 2 5 2 52177 52176 68918 68917 +18937 3 2 5 2 52176 68918 68917 52177 18938 3 2 5 2 68540 52554 52553 68541 18939 3 2 5 2 52185 68909 68908 52186 18940 3 2 5 2 52192 52191 68903 68902 @@ -180311,8 +180311,8 @@ $Elements 18950 3 2 5 2 68530 52564 52563 68531 18951 3 2 5 2 52567 68527 68526 52568 18952 3 2 5 2 68529 52565 52564 68530 -18953 3 2 5 2 68933 52161 52160 68934 -18954 3 2 5 2 68911 52183 52182 68912 +18953 3 2 5 2 68934 68933 52161 52160 +18954 3 2 5 2 68912 68911 52183 52182 18955 3 2 5 2 52562 52561 68533 68532 18956 3 2 5 2 52565 68529 68528 52566 18957 3 2 5 2 52570 52569 68525 68524 @@ -180333,7 +180333,7 @@ $Elements 18972 3 2 5 2 68516 52578 52577 68517 18973 3 2 5 2 52584 68510 68509 52585 18974 3 2 5 2 250 52586 68508 362 -18975 3 2 5 2 52580 68514 68513 52581 +18975 3 2 5 2 52581 52580 68514 68513 18976 3 2 5 2 52582 52581 68513 68512 18977 3 2 5 2 68512 68511 52583 52582 18978 3 2 5 2 52585 68509 68508 52586 @@ -180429,7 +180429,7 @@ $Elements 19068 3 2 5 2 64043 45975 45976 64044 19069 3 2 5 2 64038 45970 45971 64039 19070 3 2 5 2 64028 64027 45959 45960 -19071 3 2 5 2 64089 64088 46020 46021 +19071 3 2 5 2 64088 46020 46021 64089 19072 3 2 5 2 63977 45909 45910 63978 19073 3 2 5 2 45945 64013 64012 45944 19074 3 2 5 2 46023 64091 64090 46022 @@ -180440,7 +180440,7 @@ $Elements 19079 3 2 5 2 45930 63998 63997 45929 19080 3 2 5 2 46001 64069 64068 46000 19081 3 2 5 2 45939 45940 64008 64007 -19082 3 2 5 2 45991 64059 64058 45990 +19082 3 2 5 2 45990 45991 64059 64058 19083 3 2 5 2 45955 64023 64022 45954 19084 3 2 5 2 63982 45914 45915 63983 19085 3 2 5 2 64045 64044 45976 45977 @@ -180495,7 +180495,7 @@ $Elements 19134 3 2 5 2 64049 64048 45980 45981 19135 3 2 5 2 45936 45937 64005 64004 19136 3 2 5 2 45954 64022 64021 45953 -19137 3 2 5 2 45978 64046 64045 45977 +19137 3 2 5 2 45977 45978 64046 64045 19138 3 2 5 2 64062 64061 45993 45994 19139 3 2 5 2 45923 63991 63990 45922 19140 3 2 5 2 46008 64076 64075 46007 @@ -180507,7 +180507,7 @@ $Elements 19146 3 2 5 2 45991 45992 64060 64059 19147 3 2 5 2 64060 45992 45993 64061 19148 3 2 5 2 45937 45938 64006 64005 -19149 3 2 5 2 45979 64047 64046 45978 +19149 3 2 5 2 45978 45979 64047 64046 19150 3 2 5 2 45952 45953 64021 64020 19151 3 2 5 2 63991 45923 45924 63992 19152 3 2 5 2 64019 45951 45952 64020 @@ -192686,10 +192686,10 @@ $Elements 31325 3 2 5 6 83576 83575 12804 12805 31326 3 2 5 6 83579 83578 12807 12808 31327 3 2 5 6 91 425 83796 22021 -31328 3 2 5 6 22158 83659 83658 22159 +31328 3 2 5 6 22159 22158 83659 83658 31329 3 2 5 6 22157 83660 83659 22158 31330 3 2 5 6 22153 83664 83663 22154 -31331 3 2 5 6 83666 83665 22152 22151 +31331 3 2 5 6 83665 22152 22151 83666 31332 3 2 5 6 22152 83665 83664 22153 31333 3 2 5 6 22147 83670 83669 22148 31334 3 2 5 6 83670 22147 22146 83671 @@ -192701,7 +192701,7 @@ $Elements 31340 3 2 5 6 83662 22155 22154 83663 31341 3 2 5 6 22022 83795 83794 22023 31342 3 2 5 6 22024 22023 83794 83793 -31343 3 2 5 6 83666 22151 22150 83667 +31343 3 2 5 6 83667 83666 22151 22150 31344 3 2 5 6 83656 22161 22160 83657 31345 3 2 5 6 22161 83656 424 92 31346 3 2 5 6 22032 83785 83784 22033 @@ -192734,7 +192734,7 @@ $Elements 31373 3 2 5 6 22036 22035 83782 83781 31374 3 2 5 6 83781 83780 22037 22036 31375 3 2 5 6 22047 83770 83769 22048 -31376 3 2 5 6 83775 22042 22041 83776 +31376 3 2 5 6 83776 83775 22042 22041 31377 3 2 5 6 83769 83768 22049 22048 31378 3 2 5 6 22051 83766 83765 22052 31379 3 2 5 6 83767 83766 22051 22050 @@ -192742,7 +192742,7 @@ $Elements 31381 3 2 5 6 83760 83759 22058 22057 31382 3 2 5 6 83677 22140 22139 83678 31383 3 2 5 6 22057 22056 83761 83760 -31384 3 2 5 6 22053 22052 83765 83764 +31384 3 2 5 6 22052 83765 83764 22053 31385 3 2 5 6 83758 22059 22058 83759 31386 3 2 5 6 83761 22056 22055 83762 31387 3 2 5 6 83763 22054 22053 83764 @@ -192788,7 +192788,7 @@ $Elements 31427 3 2 5 6 83749 83748 22069 22068 31428 3 2 5 6 83747 22070 22069 83748 31429 3 2 5 6 22127 22126 83691 83690 -31430 3 2 5 6 83679 22138 22137 83680 +31430 3 2 5 6 83680 83679 22138 22137 31431 3 2 5 6 22136 22135 83682 83681 31432 3 2 5 6 83700 22117 22116 83701 31433 3 2 5 6 22094 83723 83722 22095 @@ -192796,7 +192796,7 @@ $Elements 31435 3 2 5 6 22074 83743 83742 22075 31436 3 2 5 6 83740 22077 22076 83741 31437 3 2 5 6 83733 22084 22083 83734 -31438 3 2 5 6 83712 83711 22106 22105 +31438 3 2 5 6 83711 22106 22105 83712 31439 3 2 5 6 22125 22124 83693 83692 31440 3 2 5 6 22091 83726 83725 22092 31441 3 2 5 6 83710 83709 22108 22107 @@ -192813,7 +192813,7 @@ $Elements 31452 3 2 5 6 22085 83732 83731 22086 31453 3 2 5 6 83697 22120 22119 83698 31454 3 2 5 6 83699 83698 22119 22118 -31455 3 2 5 6 22118 22117 83700 83699 +31455 3 2 5 6 22117 83700 83699 22118 31456 3 2 5 6 22111 83706 83705 22112 31457 3 2 5 6 83705 83704 22113 22112 31458 3 2 5 6 22106 83711 83710 22107 @@ -192830,7 +192830,7 @@ $Elements 31469 3 2 5 6 431 85 20869 84947 31470 3 2 5 6 84 432 85161 20655 31471 3 2 5 6 20869 20868 84948 84947 -31472 3 2 5 6 20655 85161 85160 20656 +31472 3 2 5 6 20656 20655 85161 85160 31473 3 2 5 6 85160 85159 20657 20656 31474 3 2 5 6 84948 20868 20867 84949 31475 3 2 5 6 85158 20658 20657 85159 @@ -192840,7 +192840,7 @@ $Elements 31479 3 2 5 6 20864 84952 84951 20865 31480 3 2 5 6 20865 84951 84950 20866 31481 3 2 5 6 20862 84954 84953 20863 -31482 3 2 5 6 85157 85156 20660 20659 +31482 3 2 5 6 85156 20660 20659 85157 31483 3 2 5 6 20661 20660 85156 85155 31484 3 2 5 6 85154 20662 20661 85155 31485 3 2 5 6 20861 84955 84954 20862 @@ -192888,7 +192888,7 @@ $Elements 31527 3 2 5 6 20842 20841 84975 84974 31528 3 2 5 6 20842 84974 84973 20843 31529 3 2 5 6 20840 84976 84975 20841 -31530 3 2 5 6 85130 20686 20685 85131 +31530 3 2 5 6 85131 85130 20686 20685 31531 3 2 5 6 20840 20839 84977 84976 31532 3 2 5 6 85130 85129 20687 20686 31533 3 2 5 6 84977 20839 20838 84978 @@ -192918,7 +192918,7 @@ $Elements 31557 3 2 5 6 20695 85121 85120 20696 31558 3 2 5 6 20696 85120 85119 20697 31559 3 2 5 6 84993 20823 20822 84994 -31560 3 2 5 6 20698 20697 85119 85118 +31560 3 2 5 6 20697 85119 85118 20698 31561 3 2 5 6 20817 84999 84998 20818 31562 3 2 5 6 20818 84998 84997 20819 31563 3 2 5 6 20821 84995 84994 20822 @@ -192933,7 +192933,7 @@ $Elements 31572 3 2 5 6 20705 20704 85112 85111 31573 3 2 5 6 20706 20705 85111 85110 31574 3 2 5 6 85115 85114 20702 20701 -31575 3 2 5 6 20703 20702 85114 85113 +31575 3 2 5 6 20702 85114 85113 20703 31576 3 2 5 6 20814 85002 85001 20815 31577 3 2 5 6 20707 20706 85110 85109 31578 3 2 5 6 20814 20813 85003 85002 @@ -192946,8 +192946,8 @@ $Elements 31585 3 2 5 6 85102 20714 20713 85103 31586 3 2 5 6 85106 85105 20711 20710 31587 3 2 5 6 85006 20810 20809 85007 -31588 3 2 5 6 20708 85108 85107 20709 -31589 3 2 5 6 20709 85107 85106 20710 +31588 3 2 5 6 20709 20708 85108 85107 +31589 3 2 5 6 20710 20709 85107 85106 31590 3 2 5 6 85007 20809 20808 85008 31591 3 2 5 6 20715 20714 85102 85101 31592 3 2 5 6 20807 85009 85008 20808 @@ -192962,7 +192962,7 @@ $Elements 31601 3 2 5 6 20720 20719 85097 85096 31602 3 2 5 6 20802 85014 85013 20803 31603 3 2 5 6 85095 20721 20720 85096 -31604 3 2 5 6 85015 85014 20802 20801 +31604 3 2 5 6 85014 20802 20801 85015 31605 3 2 5 6 85094 20722 20721 85095 31606 3 2 5 6 20801 20800 85016 85015 31607 3 2 5 6 20723 20722 85094 85093 @@ -192975,7 +192975,7 @@ $Elements 31614 3 2 5 6 20796 85020 85019 20797 31615 3 2 5 6 85092 20724 20723 85093 31616 3 2 5 6 20726 20725 85091 85090 -31617 3 2 5 6 20728 85088 85087 20729 +31617 3 2 5 6 20729 20728 85088 85087 31618 3 2 5 6 20798 85018 85017 20799 31619 3 2 5 6 85018 20798 20797 85019 31620 3 2 5 6 20725 20724 85092 85091 @@ -192993,10 +192993,10 @@ $Elements 31632 3 2 5 6 20734 20733 85083 85082 31633 3 2 5 6 85030 20786 20785 85031 31634 3 2 5 6 85082 85081 20735 20734 -31635 3 2 5 6 85080 20736 20735 85081 +31635 3 2 5 6 85081 85080 20736 20735 31636 3 2 5 6 20784 85032 85031 20785 31637 3 2 5 6 85080 85079 20737 20736 -31638 3 2 5 6 20780 85036 85035 20781 +31638 3 2 5 6 20781 20780 85036 85035 31639 3 2 5 6 85034 20782 20781 85035 31640 3 2 5 6 20783 85033 85032 20784 31641 3 2 5 6 20779 85037 85036 20780 @@ -193031,13 +193031,13 @@ $Elements 31670 3 2 5 6 20757 85059 85058 20758 31671 3 2 5 6 20756 20755 85061 85060 31672 3 2 5 6 20754 20753 85063 85062 -31673 3 2 5 6 20768 85048 85047 20769 +31673 3 2 5 6 20769 20768 85048 85047 31674 3 2 5 6 85051 85050 20766 20765 31675 3 2 5 6 20767 20766 85050 85049 31676 3 2 5 6 20764 85052 85051 20765 31677 3 2 5 6 20754 85062 85061 20755 31678 3 2 5 6 20767 85049 85048 20768 -31679 3 2 5 6 20758 85058 85057 20759 +31679 3 2 5 6 20759 20758 85058 85057 31680 3 2 5 6 85053 85052 20764 20763 31681 3 2 5 6 85056 20760 20759 85057 31682 3 2 5 6 85054 85053 20763 20762 @@ -193351,7 +193351,7 @@ $Elements 31990 3 2 5 6 83942 21875 21874 83943 31991 3 2 5 6 21876 83941 83940 21877 31992 3 2 5 6 21878 21877 83940 83939 -31993 3 2 5 6 21879 21878 83939 83938 +31993 3 2 5 6 21878 83939 83938 21879 31994 3 2 5 6 83953 21864 21863 83954 31995 3 2 5 6 21801 84016 84015 21802 31996 3 2 5 6 21862 83955 83954 21863 @@ -193368,7 +193368,7 @@ $Elements 32007 3 2 5 6 84005 84004 21813 21812 32008 3 2 5 6 84006 84005 21812 21811 32009 3 2 5 6 21814 21813 84004 84003 -32010 3 2 5 6 84003 84002 21815 21814 +32010 3 2 5 6 84002 21815 21814 84003 32011 3 2 5 6 84001 21816 21815 84002 32012 3 2 5 6 21817 21816 84001 84000 32013 3 2 5 6 21818 83999 83998 21819 @@ -193427,23 +193427,23 @@ $Elements 32066 3 2 5 6 82702 19753 19754 82703 32067 3 2 5 6 82716 82715 19766 19767 32068 3 2 5 6 82762 82761 19812 19813 -32069 3 2 5 6 19681 82630 82629 19680 +32069 3 2 5 6 19680 19681 82630 82629 32070 3 2 5 6 19697 82646 82645 19696 -32071 3 2 5 6 19710 82659 82658 19709 +32071 3 2 5 6 19709 19710 82659 82658 32072 3 2 5 6 19738 19739 82688 82687 -32073 3 2 5 6 19756 82705 82704 19755 +32073 3 2 5 6 19755 19756 82705 82704 32074 3 2 5 6 19782 82731 82730 19781 32075 3 2 5 6 19783 19784 82733 82732 32076 3 2 5 6 19797 82746 82745 19796 32077 3 2 5 6 19811 82760 82759 19810 -32078 3 2 5 6 19823 82772 82771 19822 +32078 3 2 5 6 19822 19823 82772 82771 32079 3 2 5 6 19842 19843 82792 82791 32080 3 2 5 6 19852 82801 82800 19851 -32081 3 2 5 6 19624 82573 82572 19623 -32082 3 2 5 6 19668 82617 82616 19667 +32081 3 2 5 6 19623 19624 82573 82572 +32082 3 2 5 6 19667 19668 82617 82616 32083 3 2 5 6 19754 19755 82704 82703 -32084 3 2 5 6 19798 82747 82746 19797 -32085 3 2 5 6 19811 19812 82761 82760 +32084 3 2 5 6 19797 19798 82747 82746 +32085 3 2 5 6 19812 82761 82760 19811 32086 3 2 5 6 19822 82771 82770 19821 32087 3 2 5 6 19852 19853 82802 82801 32088 3 2 5 6 19840 19841 82790 82789 @@ -193451,11 +193451,11 @@ $Elements 32090 3 2 5 6 19639 19640 82589 82588 32091 3 2 5 6 82792 19843 19844 82793 32092 3 2 5 6 19681 19682 82631 82630 -32093 3 2 5 6 82645 82644 19695 19696 -32094 3 2 5 6 19825 82774 82773 19824 +32093 3 2 5 6 82644 19695 19696 82645 +32094 3 2 5 6 19824 19825 82774 82773 32095 3 2 5 6 19784 19785 82734 82733 32096 3 2 5 6 19795 82744 82743 19794 -32097 3 2 5 6 19652 82601 82600 19651 +32097 3 2 5 6 19651 19652 82601 82600 32098 3 2 5 6 82702 82701 19752 19753 32099 3 2 5 6 82574 82573 19624 19625 32100 3 2 5 6 82717 82716 19767 19768 @@ -193478,11 +193478,11 @@ $Elements 32117 3 2 5 6 82770 82769 19820 19821 32118 3 2 5 6 19638 82587 82586 19637 32119 3 2 5 6 19641 82590 82589 19640 -32120 3 2 5 6 19651 82600 82599 19650 -32121 3 2 5 6 19655 82604 82603 19654 -32122 3 2 5 6 19712 82661 82660 19711 -32123 3 2 5 6 19727 82676 82675 19726 -32124 3 2 5 6 19765 82714 82713 19764 +32120 3 2 5 6 19650 19651 82600 82599 +32121 3 2 5 6 19654 19655 82604 82603 +32122 3 2 5 6 19711 19712 82661 82660 +32123 3 2 5 6 19726 19727 82676 82675 +32124 3 2 5 6 19764 19765 82714 82713 32125 3 2 5 6 19786 82735 82734 19785 32126 3 2 5 6 19826 82775 82774 19825 32127 3 2 5 6 19844 19845 82794 82793 @@ -193512,7 +193512,7 @@ $Elements 32151 3 2 5 6 82627 19678 19679 82628 32152 3 2 5 6 82768 19819 19820 82769 32153 3 2 5 6 19636 19637 82586 82585 -32154 3 2 5 6 19741 82690 82689 19740 +32154 3 2 5 6 19740 19741 82690 82689 32155 3 2 5 6 19839 82788 82787 19838 32156 3 2 5 6 82685 82684 19735 19736 32157 3 2 5 6 82590 19641 19642 82591 @@ -193527,16 +193527,16 @@ $Elements 32166 3 2 5 6 19751 82700 82699 19750 32167 3 2 5 6 19626 19627 82576 82575 32168 3 2 5 6 82719 82718 19769 19770 -32169 3 2 5 6 19707 82656 82655 19706 +32169 3 2 5 6 19706 19707 82656 82655 32170 3 2 5 6 82619 19670 19671 82620 -32171 3 2 5 6 82757 82756 19807 19808 +32171 3 2 5 6 82756 19807 19808 82757 32172 3 2 5 6 19847 19848 82797 82796 -32173 3 2 5 6 82614 82613 19664 19665 -32174 3 2 5 6 82662 82661 19712 19713 +32173 3 2 5 6 82613 19664 19665 82614 +32174 3 2 5 6 82661 19712 19713 82662 32175 3 2 5 6 19816 82765 82764 19815 32176 3 2 5 6 82804 19855 19856 82805 -32177 3 2 5 6 82673 82672 19723 19724 -32178 3 2 5 6 19764 82713 82712 19763 +32177 3 2 5 6 82672 19723 19724 82673 +32178 3 2 5 6 19763 19764 82713 82712 32179 3 2 5 6 19621 82570 82569 19620 32180 3 2 5 6 82604 19655 19656 82605 32181 3 2 5 6 19759 82708 82707 19758 @@ -193546,15 +193546,15 @@ $Elements 32185 3 2 5 6 82593 19644 19645 82594 32186 3 2 5 6 82598 82597 19648 19649 32187 3 2 5 6 82605 19656 19657 82606 -32188 3 2 5 6 82611 82610 19661 19662 +32188 3 2 5 6 82610 19661 19662 82611 32189 3 2 5 6 82612 19663 19664 82613 32190 3 2 5 6 82623 19674 19675 82624 -32191 3 2 5 6 82638 82637 19688 19689 -32192 3 2 5 6 82651 82650 19701 19702 +32191 3 2 5 6 82637 19688 19689 82638 +32192 3 2 5 6 82650 19701 19702 82651 32193 3 2 5 6 82652 19703 19704 82653 -32194 3 2 5 6 82664 82663 19714 19715 +32194 3 2 5 6 82663 19714 19715 82664 32195 3 2 5 6 82665 19716 19717 82666 -32196 3 2 5 6 82671 82670 19721 19722 +32196 3 2 5 6 82670 19721 19722 82671 32197 3 2 5 6 82681 19732 19733 82682 32198 3 2 5 6 82694 19745 19746 82695 32199 3 2 5 6 82711 19762 19763 82712 @@ -193568,16 +193568,16 @@ $Elements 32207 3 2 5 6 19671 19672 82621 82620 32208 3 2 5 6 19685 82634 82633 19684 32209 3 2 5 6 19687 82636 82635 19686 -32210 3 2 5 6 19692 82641 82640 19691 +32210 3 2 5 6 19691 19692 82641 82640 32211 3 2 5 6 19700 82649 82648 19699 32212 3 2 5 6 19720 82669 82668 19719 32213 3 2 5 6 19728 19729 82678 82677 32214 3 2 5 6 19731 82680 82679 19730 32215 3 2 5 6 19742 82691 82690 19741 32216 3 2 5 6 19744 82693 82692 19743 -32217 3 2 5 6 19749 82698 82697 19748 +32217 3 2 5 6 19748 19749 82698 82697 32218 3 2 5 6 19760 82709 82708 19759 -32219 3 2 5 6 19771 82720 82719 19770 +32219 3 2 5 6 19770 19771 82720 82719 32220 3 2 5 6 19774 82723 82722 19773 32221 3 2 5 6 19779 82728 82727 19778 32222 3 2 5 6 19790 82739 82738 19789 @@ -193585,7 +193585,7 @@ $Elements 32224 3 2 5 6 19804 82753 82752 19803 32225 3 2 5 6 19806 82755 82754 19805 32226 3 2 5 6 19816 19817 82766 82765 -32227 3 2 5 6 19830 82779 82778 19829 +32227 3 2 5 6 19829 19830 82779 82778 32228 3 2 5 6 19833 82782 82781 19832 32229 3 2 5 6 19836 19837 82786 82785 32230 3 2 5 6 19846 19847 82796 82795 @@ -193777,7 +193777,7 @@ $Elements 32416 3 2 5 6 21133 21132 84684 84683 32417 3 2 5 6 84684 21132 21131 84685 32418 3 2 5 6 21062 84754 84753 21063 -32419 3 2 5 6 84686 84685 21131 21130 +32419 3 2 5 6 84685 21131 21130 84686 32420 3 2 5 6 84686 21130 21129 84687 32421 3 2 5 6 21063 84753 84752 21064 32422 3 2 5 6 21064 84752 84751 21065 @@ -194018,7 +194018,7 @@ $Elements 32657 3 2 5 6 19603 19604 82553 82552 32658 3 2 5 6 19609 19610 82559 82558 32659 3 2 5 6 19587 82536 82535 19586 -32660 3 2 5 6 19617 82566 82565 19616 +32660 3 2 5 6 19616 19617 82566 82565 32661 3 2 5 6 19567 82516 82515 19566 32662 3 2 5 6 82512 19563 19564 82513 32663 3 2 5 6 19571 82520 82519 19570 @@ -194111,7 +194111,7 @@ $Elements 32750 3 2 5 6 82510 82509 19560 19561 32751 3 2 5 6 82531 82530 19581 19582 32752 3 2 5 6 82538 82537 19588 19589 -32753 3 2 5 6 82565 82564 19615 19616 +32753 3 2 5 6 82564 19615 19616 82565 32754 3 2 5 6 19423 82372 82371 19422 32755 3 2 5 6 19433 82382 82381 19432 32756 3 2 5 6 19501 19502 82451 82450 @@ -194197,7 +194197,7 @@ $Elements 32836 3 2 5 6 19441 82390 82389 19440 32837 3 2 5 6 19459 19460 82409 82408 32838 3 2 5 6 19474 82423 82422 19473 -32839 3 2 5 6 19607 82556 82555 19606 +32839 3 2 5 6 19606 19607 82556 82555 32840 3 2 5 6 19458 82407 82406 19457 32841 3 2 5 6 19552 82501 82500 19551 32842 3 2 5 6 19444 19445 82394 82393 @@ -194900,7 +194900,7 @@ $Elements 33539 3 2 5 6 84598 21218 21217 84599 33540 3 2 5 6 21204 84612 84611 21205 33541 3 2 5 6 84600 21216 21215 84601 -33542 3 2 5 6 21208 21207 84609 84608 +33542 3 2 5 6 21207 84609 84608 21208 33543 3 2 5 6 21212 84604 84603 21213 33544 3 2 5 6 84606 21210 21209 84607 33545 3 2 5 6 21205 84611 84610 21206 @@ -198015,8 +198015,8 @@ $Elements 36654 3 2 1 7 91138 47841 47840 91139 36655 3 2 1 7 91121 91120 47859 47858 36656 3 2 1 7 47839 91140 91139 47840 -36657 3 2 1 7 91138 91137 47842 47841 -36658 3 2 1 7 91123 91122 47857 47856 +36657 3 2 1 7 91137 47842 47841 91138 +36658 3 2 1 7 91122 47857 47856 91123 36659 3 2 1 7 47858 47857 91122 91121 36660 3 2 1 7 47832 47831 91148 91147 36661 3 2 1 7 91113 91112 47867 47866 @@ -198042,7 +198042,7 @@ $Elements 36681 3 2 1 7 91161 91160 47819 47818 36682 3 2 1 7 47822 91157 91156 47823 36683 3 2 1 7 47875 91104 91103 47876 -36684 3 2 1 7 47821 47820 91159 91158 +36684 3 2 1 7 47820 91159 91158 47821 36685 3 2 1 7 47878 47877 91102 91101 36686 3 2 1 7 91154 47825 47824 91155 36687 3 2 1 7 91106 91105 47874 47873 @@ -198099,11 +198099,11 @@ $Elements 36738 3 2 1 7 47913 91066 91065 47914 36739 3 2 1 7 47793 91186 91185 47794 36740 3 2 1 7 47806 91173 91172 47807 -36741 3 2 1 7 47889 47888 91091 91090 +36741 3 2 1 7 47888 91091 91090 47889 36742 3 2 1 7 47896 91083 91082 47897 36743 3 2 1 7 47901 91078 91077 47902 36744 3 2 1 7 47918 91061 91060 47919 -36745 3 2 1 7 91082 91081 47898 47897 +36745 3 2 1 7 91081 47898 47897 91082 36746 3 2 1 7 47782 91197 91196 47783 36747 3 2 1 7 47797 91182 91181 47798 36748 3 2 1 7 47888 47887 91092 91091 @@ -198187,7 +198187,7 @@ $Elements 36826 3 2 1 7 91034 47945 47944 91035 36827 3 2 1 7 47727 47726 91253 91252 36828 3 2 1 7 47730 47729 91250 91249 -36829 3 2 1 7 47738 47737 91242 91241 +36829 3 2 1 7 47737 91242 91241 47738 36830 3 2 1 7 47739 47738 91241 91240 36831 3 2 1 7 47740 47739 91240 91239 36832 3 2 1 7 47742 91237 91236 47743 @@ -198290,7 +198290,7 @@ $Elements 36929 3 2 1 7 48016 48015 90964 90963 36930 3 2 1 7 91274 91273 47706 47705 36931 3 2 1 7 47675 47674 91305 91304 -36932 3 2 1 7 47678 47677 91302 91301 +36932 3 2 1 7 47677 91302 91301 47678 36933 3 2 1 7 47685 47684 91295 91294 36934 3 2 1 7 47688 47687 91292 91291 36935 3 2 1 7 47690 91289 91288 47691 @@ -198299,7 +198299,7 @@ $Elements 36938 3 2 1 7 47998 47997 90982 90981 36939 3 2 1 7 48008 48007 90972 90971 36940 3 2 1 7 48010 90969 90968 48011 -36941 3 2 1 7 48021 48020 90959 90958 +36941 3 2 1 7 48020 90959 90958 48021 36942 3 2 1 7 48024 48023 90956 90955 36943 3 2 1 7 47688 91291 91290 47689 36944 3 2 1 7 47692 47691 91288 91287 @@ -198376,7 +198376,7 @@ $Elements 37015 3 2 1 7 47648 47647 91332 91331 37016 3 2 1 7 48035 90944 90943 48036 37017 3 2 1 7 90931 48048 48047 90932 -37018 3 2 1 7 48049 48048 90931 90930 +37018 3 2 1 7 48048 90931 90930 48049 37019 3 2 1 7 48051 48050 90929 90928 37020 3 2 1 7 48051 90928 90927 48052 37021 3 2 1 7 48058 90921 90920 48059 @@ -198403,14 +198403,14 @@ $Elements 37042 3 2 1 7 47650 91329 91328 47651 37043 3 2 1 7 91315 47664 47663 91316 37044 3 2 1 7 90926 48053 48052 90927 -37045 3 2 1 7 48050 48049 90930 90929 +37045 3 2 1 7 48049 90930 90929 48050 37046 3 2 1 7 91337 47642 47641 91338 37047 3 2 1 7 90922 48057 48056 90923 37048 3 2 1 7 91335 47644 47643 91336 37049 3 2 1 7 91336 47643 47642 91337 37050 3 2 1 7 47644 91335 91334 47645 37051 3 2 1 7 90926 90925 48054 48053 -37052 3 2 1 7 48055 48054 90925 90924 +37052 3 2 1 7 48054 90925 90924 48055 37053 3 2 1 7 48056 48055 90924 90923 37054 3 2 1 7 49254 89725 89724 49255 37055 3 2 1 7 43167 43168 86919 86918 @@ -198460,20 +198460,20 @@ $Elements 37099 3 2 1 7 86976 86975 43224 43225 37100 3 2 1 7 86976 43225 43226 86977 37101 3 2 1 7 86979 86978 43227 43228 -37102 3 2 1 7 86987 86986 43235 43236 -37103 3 2 1 7 86990 86989 43238 43239 -37104 3 2 1 7 86993 86992 43241 43242 -37105 3 2 1 7 86995 43244 43245 86996 -37106 3 2 1 7 86999 86998 43247 43248 -37107 3 2 1 7 87002 87001 43250 43251 +37102 3 2 1 7 86986 43235 43236 86987 +37103 3 2 1 7 86989 43238 43239 86990 +37104 3 2 1 7 86992 43241 43242 86993 +37105 3 2 1 7 86996 86995 43244 43245 +37106 3 2 1 7 86998 43247 43248 86999 +37107 3 2 1 7 87001 43250 43251 87002 37108 3 2 1 7 87009 87008 43257 43258 -37109 3 2 1 7 87012 87011 43260 43261 +37109 3 2 1 7 87011 43260 43261 87012 37110 3 2 1 7 87014 43263 43264 87015 37111 3 2 1 7 87017 43266 43267 87018 37112 3 2 1 7 87020 43269 43270 87021 37113 3 2 1 7 87024 87023 43272 43273 37114 3 2 1 7 87046 43295 43296 87047 -37115 3 2 1 7 87048 87047 43296 43297 +37115 3 2 1 7 87047 43296 43297 87048 37116 3 2 1 7 87055 43304 43305 87056 37117 3 2 1 7 87058 43307 43308 87059 37118 3 2 1 7 87061 43310 43311 87062 @@ -198484,7 +198484,7 @@ $Elements 37123 3 2 1 7 87091 87090 43339 43340 37124 3 2 1 7 87093 43342 43343 87094 37125 3 2 1 7 87101 43350 43351 87102 -37126 3 2 1 7 87104 87103 43352 43353 +37126 3 2 1 7 87103 43352 43353 87104 37127 3 2 1 7 87104 43353 43354 87105 37128 3 2 1 7 87106 43355 43356 87107 37129 3 2 1 7 87107 43356 43357 87108 @@ -198510,7 +198510,7 @@ $Elements 37149 3 2 1 7 87137 43386 43387 87138 37150 3 2 1 7 87139 43388 43389 87140 37151 3 2 1 7 87140 43389 43390 87141 -37152 3 2 1 7 87143 87142 43391 43392 +37152 3 2 1 7 87142 43391 43392 87143 37153 3 2 1 7 87143 43392 43393 87144 37154 3 2 1 7 87146 87145 43394 43395 37155 3 2 1 7 87146 43395 43396 87147 @@ -198531,15 +198531,15 @@ $Elements 37170 3 2 1 7 87170 43419 43420 87171 37171 3 2 1 7 87172 43421 43422 87173 37172 3 2 1 7 87174 87173 43422 43423 -37173 3 2 1 7 87176 87175 43424 43425 +37173 3 2 1 7 87175 43424 43425 87176 37174 3 2 1 7 87176 43425 43426 87177 37175 3 2 1 7 87179 87178 43427 43428 37176 3 2 1 7 87179 43428 43429 87180 -37177 3 2 1 7 87182 87181 43430 43431 +37177 3 2 1 7 87181 43430 43431 87182 37178 3 2 1 7 87182 43431 43432 87183 37179 3 2 1 7 87184 43433 43434 87185 37180 3 2 1 7 87185 43434 43435 87186 -37181 3 2 1 7 87188 87187 43436 43437 +37181 3 2 1 7 87187 43436 43437 87188 37182 3 2 1 7 87188 43437 43438 87189 37183 3 2 1 7 87190 43439 43440 87191 37184 3 2 1 7 87191 43440 43441 87192 @@ -198557,12 +198557,12 @@ $Elements 37196 3 2 1 7 87209 43458 43459 87210 37197 3 2 1 7 87211 43460 43461 87212 37198 3 2 1 7 87212 43461 43462 87213 -37199 3 2 1 7 87215 87214 43463 43464 +37199 3 2 1 7 87214 43463 43464 87215 37200 3 2 1 7 87215 43464 43465 87216 37201 3 2 1 7 87217 43466 43467 87218 37202 3 2 1 7 87220 43469 43470 87221 37203 3 2 1 7 87221 43470 43471 87222 -37204 3 2 1 7 87224 87223 43472 43473 +37204 3 2 1 7 87223 43472 43473 87224 37205 3 2 1 7 87224 43473 43474 87225 37206 3 2 1 7 87226 43475 43476 87227 37207 3 2 1 7 87229 43478 43479 87230 @@ -198584,13 +198584,13 @@ $Elements 37223 3 2 1 7 87254 43503 43504 87255 37224 3 2 1 7 87256 43505 43506 87257 37225 3 2 1 7 87257 43506 43507 87258 -37226 3 2 1 7 87260 87259 43508 43509 +37226 3 2 1 7 87259 43508 43509 87260 37227 3 2 1 7 87260 43509 43510 87261 37228 3 2 1 7 87263 87262 43511 43512 37229 3 2 1 7 87264 87263 43512 43513 37230 3 2 1 7 87265 43514 43515 87266 37231 3 2 1 7 87266 43515 43516 87267 -37232 3 2 1 7 87269 87268 43517 43518 +37232 3 2 1 7 87268 43517 43518 87269 37233 3 2 1 7 444 212 43151 86902 37234 3 2 1 7 445 87270 43519 213 37235 3 2 1 7 86902 43151 43152 86903 @@ -198617,93 +198617,93 @@ $Elements 37256 3 2 1 7 86975 86974 43223 43224 37257 3 2 1 7 86978 86977 43226 43227 37258 3 2 1 7 86985 43234 43235 86986 -37259 3 2 1 7 86988 86987 43236 43237 +37259 3 2 1 7 86987 43236 43237 86988 37260 3 2 1 7 86990 43239 43240 86991 37261 3 2 1 7 86991 43240 43241 86992 -37262 3 2 1 7 86994 86993 43242 43243 +37262 3 2 1 7 86993 43242 43243 86994 37263 3 2 1 7 86996 43245 43246 86997 37264 3 2 1 7 86997 43246 43247 86998 37265 3 2 1 7 87000 86999 43248 43249 37266 3 2 1 7 87000 43249 43250 87001 -37267 3 2 1 7 87010 87009 43258 43259 +37267 3 2 1 7 87009 43258 43259 87010 37268 3 2 1 7 87010 43259 43260 87011 -37269 3 2 1 7 87013 87012 43261 43262 +37269 3 2 1 7 87012 43261 43262 87013 37270 3 2 1 7 87013 43262 43263 87014 37271 3 2 1 7 87015 43264 43265 87016 37272 3 2 1 7 87016 43265 43266 87017 -37273 3 2 1 7 87019 87018 43267 43268 +37273 3 2 1 7 87018 43267 43268 87019 37274 3 2 1 7 87019 43268 43269 87020 -37275 3 2 1 7 87022 87021 43270 43271 +37275 3 2 1 7 87021 43270 43271 87022 37276 3 2 1 7 87022 43271 43272 87023 37277 3 2 1 7 87032 43281 43282 87033 -37278 3 2 1 7 87057 87056 43305 43306 +37278 3 2 1 7 87056 43305 43306 87057 37279 3 2 1 7 87057 43306 43307 87058 -37280 3 2 1 7 87060 87059 43308 43309 +37280 3 2 1 7 87059 43308 43309 87060 37281 3 2 1 7 87060 43309 43310 87061 37282 3 2 1 7 87063 43312 43313 87064 -37283 3 2 1 7 87066 87065 43314 43315 +37283 3 2 1 7 87065 43314 43315 87066 37284 3 2 1 7 87066 43315 43316 87067 -37285 3 2 1 7 87069 87068 43317 43318 +37285 3 2 1 7 87068 43317 43318 87069 37286 3 2 1 7 87069 43318 43319 87070 37287 3 2 1 7 87079 87078 43327 43328 37288 3 2 1 7 87079 43328 43329 87080 37289 3 2 1 7 87086 43335 43336 87087 -37290 3 2 1 7 87089 87088 43337 43338 +37290 3 2 1 7 87088 43337 43338 87089 37291 3 2 1 7 87089 43338 43339 87090 -37292 3 2 1 7 87092 87091 43340 43341 +37292 3 2 1 7 87091 43340 43341 87092 37293 3 2 1 7 87092 43341 43342 87093 37294 3 2 1 7 87103 87102 43351 43352 -37295 3 2 1 7 87106 87105 43354 43355 -37296 3 2 1 7 87109 87108 43357 43358 +37295 3 2 1 7 87105 43354 43355 87106 +37296 3 2 1 7 87108 43357 43358 87109 37297 3 2 1 7 87112 87111 43360 43361 -37298 3 2 1 7 87115 87114 43363 43364 -37299 3 2 1 7 87118 87117 43366 43367 -37300 3 2 1 7 87121 87120 43369 43370 -37301 3 2 1 7 87124 87123 43372 43373 +37298 3 2 1 7 87114 43363 43364 87115 +37299 3 2 1 7 87117 43366 43367 87118 +37300 3 2 1 7 87120 43369 43370 87121 +37301 3 2 1 7 87123 43372 43373 87124 37302 3 2 1 7 87129 43378 43379 87130 -37303 3 2 1 7 87133 87132 43381 43382 +37303 3 2 1 7 87132 43381 43382 87133 37304 3 2 1 7 87139 87138 43387 43388 37305 3 2 1 7 87142 87141 43390 43391 -37306 3 2 1 7 87145 87144 43393 43394 +37306 3 2 1 7 87144 43393 43394 87145 37307 3 2 1 7 87148 87147 43396 43397 -37308 3 2 1 7 87151 87150 43399 43400 -37309 3 2 1 7 87154 87153 43402 43403 -37310 3 2 1 7 87157 87156 43405 43406 -37311 3 2 1 7 87160 87159 43408 43409 +37308 3 2 1 7 87150 43399 43400 87151 +37309 3 2 1 7 87153 43402 43403 87154 +37310 3 2 1 7 87156 43405 43406 87157 +37311 3 2 1 7 87159 43408 43409 87160 37312 3 2 1 7 87163 87162 43411 43412 37313 3 2 1 7 87166 87165 43414 43415 -37314 3 2 1 7 87169 87168 43417 43418 -37315 3 2 1 7 87175 87174 43423 43424 -37316 3 2 1 7 87178 87177 43426 43427 +37314 3 2 1 7 87168 43417 43418 87169 +37315 3 2 1 7 87174 43423 43424 87175 +37316 3 2 1 7 87177 43426 43427 87178 37317 3 2 1 7 87181 87180 43429 43430 37318 3 2 1 7 87184 87183 43432 43433 37319 3 2 1 7 87187 87186 43435 43436 -37320 3 2 1 7 87190 87189 43438 43439 -37321 3 2 1 7 87196 87195 43444 43445 -37322 3 2 1 7 87199 87198 43447 43448 -37323 3 2 1 7 87202 87201 43450 43451 +37320 3 2 1 7 87189 43438 43439 87190 +37321 3 2 1 7 87195 43444 43445 87196 +37322 3 2 1 7 87198 43447 43448 87199 +37323 3 2 1 7 87201 43450 43451 87202 37324 3 2 1 7 87205 87204 43453 43454 -37325 3 2 1 7 87208 87207 43456 43457 +37325 3 2 1 7 87207 43456 43457 87208 37326 3 2 1 7 87211 87210 43459 43460 37327 3 2 1 7 87214 87213 43462 43463 -37328 3 2 1 7 87217 87216 43465 43466 -37329 3 2 1 7 87220 87219 43468 43469 -37330 3 2 1 7 87223 87222 43471 43472 -37331 3 2 1 7 87226 87225 43474 43475 -37332 3 2 1 7 87229 87228 43477 43478 -37333 3 2 1 7 87232 87231 43480 43481 +37328 3 2 1 7 87216 43465 43466 87217 +37329 3 2 1 7 87219 43468 43469 87220 +37330 3 2 1 7 87222 43471 43472 87223 +37331 3 2 1 7 87225 43474 43475 87226 +37332 3 2 1 7 87228 43477 43478 87229 +37333 3 2 1 7 87231 43480 43481 87232 37334 3 2 1 7 87235 87234 43483 43484 -37335 3 2 1 7 87238 87237 43486 43487 +37335 3 2 1 7 87237 43486 43487 87238 37336 3 2 1 7 87241 87240 43489 43490 37337 3 2 1 7 87247 87246 43495 43496 -37338 3 2 1 7 87250 87249 43498 43499 -37339 3 2 1 7 87253 87252 43501 43502 -37340 3 2 1 7 87256 87255 43504 43505 -37341 3 2 1 7 87259 87258 43507 43508 -37342 3 2 1 7 87262 87261 43510 43511 -37343 3 2 1 7 87265 87264 43513 43514 -37344 3 2 1 7 87268 87267 43516 43517 -37345 3 2 1 7 87034 87033 43282 43283 +37338 3 2 1 7 87249 43498 43499 87250 +37339 3 2 1 7 87252 43501 43502 87253 +37340 3 2 1 7 87255 43504 43505 87256 +37341 3 2 1 7 87258 43507 43508 87259 +37342 3 2 1 7 87261 43510 43511 87262 +37343 3 2 1 7 87264 43513 43514 87265 +37344 3 2 1 7 87267 43516 43517 87268 +37345 3 2 1 7 87033 43282 43283 87034 37346 3 2 1 7 86956 86955 43204 43205 37347 3 2 1 7 87032 87031 43280 43281 37348 3 2 1 7 86932 43181 43182 86933 @@ -198711,7 +198711,7 @@ $Elements 37350 3 2 1 7 43343 43344 87095 87094 37351 3 2 1 7 86909 43158 43159 86910 37352 3 2 1 7 87077 43326 43327 87078 -37353 3 2 1 7 43321 87072 87071 43320 +37353 3 2 1 7 43320 43321 87072 87071 37354 3 2 1 7 43350 87101 87100 43349 37355 3 2 1 7 86915 43164 43165 86916 37356 3 2 1 7 87045 43294 43295 87046 @@ -198719,7 +198719,7 @@ $Elements 37358 3 2 1 7 87049 87048 43297 43298 37359 3 2 1 7 43275 87026 87025 43274 37360 3 2 1 7 86961 43210 43211 86962 -37361 3 2 1 7 43330 87081 87080 43329 +37361 3 2 1 7 43329 43330 87081 87080 37362 3 2 1 7 87002 43251 43252 87003 37363 3 2 1 7 86984 43233 43234 86985 37364 3 2 1 7 86980 86979 43228 43229 @@ -198792,9 +198792,9 @@ $Elements 37431 3 2 1 7 45607 45606 93373 93372 37432 3 2 1 7 45597 93382 93381 45598 37433 3 2 1 7 93380 45599 45598 93381 -37434 3 2 1 7 45593 93386 93385 45594 -37435 3 2 1 7 45602 93377 93376 45603 -37436 3 2 1 7 45592 93387 93386 45593 +37434 3 2 1 7 45594 45593 93386 93385 +37435 3 2 1 7 45603 45602 93377 93376 +37436 3 2 1 7 45593 45592 93387 93386 37437 3 2 1 7 93376 93375 45604 45603 37438 3 2 1 7 45592 162 472 93387 37439 3 2 1 7 45606 45605 93374 93373 @@ -198831,8 +198831,8 @@ $Elements 37470 3 2 1 7 45619 45618 93361 93360 37471 3 2 1 7 45692 45691 93288 93287 37472 3 2 1 7 93295 45684 45683 93296 -37473 3 2 1 7 93293 93292 45687 45686 -37474 3 2 1 7 45687 93292 93291 45688 +37473 3 2 1 7 93292 45687 45686 93293 +37474 3 2 1 7 45688 45687 93292 93291 37475 3 2 1 7 93298 45681 45680 93299 37476 3 2 1 7 45682 45681 93298 93297 37477 3 2 1 7 93296 45683 45682 93297 @@ -198849,7 +198849,7 @@ $Elements 37488 3 2 1 7 45674 93305 93304 45675 37489 3 2 1 7 45625 45624 93355 93354 37490 3 2 1 7 93354 93353 45626 45625 -37491 3 2 1 7 93352 45627 45626 93353 +37491 3 2 1 7 93353 93352 45627 45626 37492 3 2 1 7 45673 93306 93305 45674 37493 3 2 1 7 45628 45627 93352 93351 37494 3 2 1 7 45672 93307 93306 45673 @@ -198867,13 +198867,13 @@ $Elements 37506 3 2 1 7 93313 45666 45665 93314 37507 3 2 1 7 93313 93312 45667 45666 37508 3 2 1 7 45632 93347 93346 45633 -37509 3 2 1 7 93312 93311 45668 45667 +37509 3 2 1 7 93311 45668 45667 93312 37510 3 2 1 7 45637 45636 93343 93342 37511 3 2 1 7 93342 93341 45638 45637 37512 3 2 1 7 93315 93314 45665 45664 37513 3 2 1 7 45657 93322 93321 45658 37514 3 2 1 7 93340 45639 45638 93341 -37515 3 2 1 7 93320 45659 45658 93321 +37515 3 2 1 7 93321 93320 45659 45658 37516 3 2 1 7 45657 45656 93323 93322 37517 3 2 1 7 93317 45662 45661 93318 37518 3 2 1 7 93339 45640 45639 93340 @@ -198882,7 +198882,7 @@ $Elements 37521 3 2 1 7 93325 93324 45655 45654 37522 3 2 1 7 45656 45655 93324 93323 37523 3 2 1 7 45660 93319 93318 45661 -37524 3 2 1 7 45644 45643 93336 93335 +37524 3 2 1 7 45643 93336 93335 45644 37525 3 2 1 7 93320 93319 45660 45659 37526 3 2 1 7 93325 45654 45653 93326 37527 3 2 1 7 45653 45652 93327 93326 @@ -198891,7 +198891,7 @@ $Elements 37530 3 2 1 7 93331 93330 45649 45648 37531 3 2 1 7 93337 45642 45641 93338 37532 3 2 1 7 93337 93336 45643 45642 -37533 3 2 1 7 45648 45647 93332 93331 +37533 3 2 1 7 45647 93332 93331 45648 37534 3 2 1 7 45646 45645 93334 93333 37535 3 2 1 7 45647 45646 93333 93332 37536 3 2 1 7 93330 93329 45650 45649 @@ -198916,37 +198916,37 @@ $Elements 37555 3 2 1 7 42845 86596 442 210 37556 3 2 1 7 211 443 86762 43011 37557 3 2 1 7 86602 86601 42850 42851 -37558 3 2 1 7 86605 86604 42853 42854 +37558 3 2 1 7 86604 42853 42854 86605 37559 3 2 1 7 86608 86607 42856 42857 37560 3 2 1 7 86614 86613 42862 42863 37561 3 2 1 7 86633 86632 42881 42882 37562 3 2 1 7 86635 86634 42883 42884 -37563 3 2 1 7 86636 86635 42884 42885 -37564 3 2 1 7 86638 86637 42886 42887 -37565 3 2 1 7 86644 86643 42892 42893 -37566 3 2 1 7 86646 86645 42894 42895 -37567 3 2 1 7 86657 86656 42905 42906 +37563 3 2 1 7 86635 42884 42885 86636 +37564 3 2 1 7 86637 42886 42887 86638 +37565 3 2 1 7 86643 42892 42893 86644 +37566 3 2 1 7 86645 42894 42895 86646 +37567 3 2 1 7 86656 42905 42906 86657 37568 3 2 1 7 86661 86660 42909 42910 37569 3 2 1 7 86661 42910 42911 86662 -37570 3 2 1 7 86663 86662 42911 42912 +37570 3 2 1 7 86662 42911 42912 86663 37571 3 2 1 7 86663 42912 42913 86664 37572 3 2 1 7 86664 42913 42914 86665 37573 3 2 1 7 86667 86666 42915 42916 37574 3 2 1 7 86667 42916 42917 86668 -37575 3 2 1 7 86693 86692 42941 42942 +37575 3 2 1 7 86692 42941 42942 86693 37576 3 2 1 7 86696 86695 42944 42945 37577 3 2 1 7 86697 86696 42945 42946 37578 3 2 1 7 86702 86701 42950 42951 -37579 3 2 1 7 86705 86704 42953 42954 -37580 3 2 1 7 86716 86715 42964 42965 -37581 3 2 1 7 86721 86720 42969 42970 +37579 3 2 1 7 86704 42953 42954 86705 +37580 3 2 1 7 86715 42964 42965 86716 +37581 3 2 1 7 86720 42969 42970 86721 37582 3 2 1 7 86723 86722 42971 42972 37583 3 2 1 7 86723 42972 42973 86724 37584 3 2 1 7 86726 86725 42974 42975 37585 3 2 1 7 86726 42975 42976 86727 -37586 3 2 1 7 86751 86750 42999 43000 +37586 3 2 1 7 86750 42999 43000 86751 37587 3 2 1 7 86752 43001 43002 86753 -37588 3 2 1 7 86754 86753 43002 43003 +37588 3 2 1 7 86753 43002 43003 86754 37589 3 2 1 7 86756 86755 43004 43005 37590 3 2 1 7 86756 43005 43006 86757 37591 3 2 1 7 86745 42994 42995 86746 @@ -198964,23 +198964,23 @@ $Elements 37603 3 2 1 7 86713 42962 42963 86714 37604 3 2 1 7 86721 42970 42971 86722 37605 3 2 1 7 86724 42973 42974 86725 -37606 3 2 1 7 86752 86751 43000 43001 +37606 3 2 1 7 86751 43000 43001 86752 37607 3 2 1 7 86754 43003 43004 86755 37608 3 2 1 7 86760 43009 43010 86761 37609 3 2 1 7 42995 42996 86747 86746 -37610 3 2 1 7 42847 42848 86599 86598 -37611 3 2 1 7 42850 86601 86600 42849 +37610 3 2 1 7 42848 86599 86598 42847 +37611 3 2 1 7 42849 42850 86601 86600 37612 3 2 1 7 42855 86606 86605 42854 -37613 3 2 1 7 42858 86609 86608 42857 +37613 3 2 1 7 42857 42858 86609 86608 37614 3 2 1 7 42859 86610 86609 42858 37615 3 2 1 7 42860 86611 86610 42859 -37616 3 2 1 7 42861 86612 86611 42860 +37616 3 2 1 7 42860 42861 86612 86611 37617 3 2 1 7 42887 42888 86639 86638 -37618 3 2 1 7 42889 86640 86639 42888 +37618 3 2 1 7 42888 42889 86640 86639 37619 3 2 1 7 42890 86641 86640 42889 37620 3 2 1 7 42892 86643 86642 42891 37621 3 2 1 7 42896 86647 86646 42895 -37622 3 2 1 7 42898 86649 86648 42897 +37622 3 2 1 7 42897 42898 86649 86648 37623 3 2 1 7 42899 86650 86649 42898 37624 3 2 1 7 42899 42900 86651 86650 37625 3 2 1 7 42902 86653 86652 42901 @@ -198989,17 +198989,17 @@ $Elements 37628 3 2 1 7 42909 86660 86659 42908 37629 3 2 1 7 42918 86669 86668 42917 37630 3 2 1 7 42919 86670 86669 42918 -37631 3 2 1 7 42920 86671 86670 42919 +37631 3 2 1 7 42919 42920 86671 86670 37632 3 2 1 7 42936 42937 86688 86687 37633 3 2 1 7 42938 86689 86688 42937 37634 3 2 1 7 42939 86690 86689 42938 37635 3 2 1 7 42941 86692 86691 42940 37636 3 2 1 7 42944 86695 86694 42943 -37637 3 2 1 7 42948 86699 86698 42947 -37638 3 2 1 7 42949 86700 86699 42948 +37637 3 2 1 7 42947 42948 86699 86698 +37638 3 2 1 7 42948 42949 86700 86699 37639 3 2 1 7 42952 86703 86702 42951 37640 3 2 1 7 42955 86706 86705 42954 -37641 3 2 1 7 42957 86708 86707 42956 +37641 3 2 1 7 42956 42957 86708 86707 37642 3 2 1 7 42958 86709 86708 42957 37643 3 2 1 7 42958 42959 86710 86709 37644 3 2 1 7 42961 86712 86711 42960 @@ -199009,9 +199009,9 @@ $Elements 37648 3 2 1 7 42969 86720 86719 42968 37649 3 2 1 7 42997 86748 86747 42996 37650 3 2 1 7 42997 42998 86749 86748 -37651 3 2 1 7 42999 86750 86749 42998 +37651 3 2 1 7 42998 42999 86750 86749 37652 3 2 1 7 43007 86758 86757 43006 -37653 3 2 1 7 43008 43009 86760 86759 +37653 3 2 1 7 43009 86760 86759 43008 37654 3 2 1 7 86600 86599 42848 42849 37655 3 2 1 7 86758 43007 43008 86759 37656 3 2 1 7 86614 42863 42864 86615 @@ -199029,23 +199029,23 @@ $Elements 37668 3 2 1 7 86630 42879 42880 86631 37669 3 2 1 7 42922 86673 86672 42921 37670 3 2 1 7 86741 86740 42989 42990 -37671 3 2 1 7 42867 86618 86617 42866 -37672 3 2 1 7 42868 86619 86618 42867 +37671 3 2 1 7 42866 42867 86618 86617 +37672 3 2 1 7 42867 42868 86619 86618 37673 3 2 1 7 42870 86621 86620 42869 37674 3 2 1 7 42871 86622 86621 42870 37675 3 2 1 7 42872 42873 86624 86623 -37676 3 2 1 7 42874 86625 86624 42873 +37676 3 2 1 7 42873 42874 86625 86624 37677 3 2 1 7 42875 42876 86627 86626 37678 3 2 1 7 42878 86629 86628 42877 -37679 3 2 1 7 42923 86674 86673 42922 +37679 3 2 1 7 42922 42923 86674 86673 37680 3 2 1 7 42925 86676 86675 42924 37681 3 2 1 7 42927 86678 86677 42926 37682 3 2 1 7 42930 86681 86680 42929 37683 3 2 1 7 42930 42931 86682 86681 -37684 3 2 1 7 42933 86684 86683 42932 +37684 3 2 1 7 42932 42933 86684 86683 37685 3 2 1 7 42979 86730 86729 42978 37686 3 2 1 7 42981 86732 86731 42980 -37687 3 2 1 7 42983 86734 86733 42982 +37687 3 2 1 7 42982 42983 86734 86733 37688 3 2 1 7 42984 86735 86734 42983 37689 3 2 1 7 42986 86737 86736 42985 37690 3 2 1 7 42987 86738 86737 42986 @@ -199094,7 +199094,7 @@ $Elements 37733 3 2 1 7 447 87990 44239 215 37734 3 2 1 7 87578 43827 43828 87579 37735 3 2 1 7 87581 87580 43829 43830 -37736 3 2 1 7 87584 87583 43832 43833 +37736 3 2 1 7 87583 43832 43833 87584 37737 3 2 1 7 87585 43834 43835 87586 37738 3 2 1 7 87588 87587 43836 43837 37739 3 2 1 7 87591 43840 43841 87592 @@ -199103,25 +199103,25 @@ $Elements 37742 3 2 1 7 87600 43849 43850 87601 37743 3 2 1 7 87603 87602 43851 43852 37744 3 2 1 7 87605 43854 43855 87606 -37745 3 2 1 7 87619 87618 43867 43868 +37745 3 2 1 7 87618 43867 43868 87619 37746 3 2 1 7 87623 87622 43871 43872 37747 3 2 1 7 87625 87624 43873 43874 37748 3 2 1 7 87635 87634 43883 43884 -37749 3 2 1 7 87637 87636 43885 43886 +37749 3 2 1 7 87636 43885 43886 87637 37750 3 2 1 7 87640 87639 43888 43889 -37751 3 2 1 7 87646 87645 43894 43895 -37752 3 2 1 7 87651 87650 43899 43900 +37751 3 2 1 7 87645 43894 43895 87646 +37752 3 2 1 7 87650 43899 43900 87651 37753 3 2 1 7 87655 87654 43903 43904 37754 3 2 1 7 87660 87659 43908 43909 37755 3 2 1 7 87675 87674 43923 43924 -37756 3 2 1 7 87961 44210 44211 87962 +37756 3 2 1 7 87962 87961 44210 44211 37757 3 2 1 7 87966 44215 44216 87967 37758 3 2 1 7 87967 44216 44217 87968 37759 3 2 1 7 87971 87970 44219 44220 -37760 3 2 1 7 87972 44221 44222 87973 +37760 3 2 1 7 87973 87972 44221 44222 37761 3 2 1 7 87973 44222 44223 87974 -37762 3 2 1 7 87979 44228 44229 87980 -37763 3 2 1 7 87981 44230 44231 87982 +37762 3 2 1 7 87980 87979 44228 44229 +37763 3 2 1 7 87982 87981 44230 44231 37764 3 2 1 7 87986 44235 44236 87987 37765 3 2 1 7 87987 44236 44237 87988 37766 3 2 1 7 43841 43842 87593 87592 @@ -199137,12 +199137,12 @@ $Elements 37776 3 2 1 7 446 214 43827 87578 37777 3 2 1 7 87579 43828 43829 87580 37778 3 2 1 7 87581 43830 43831 87582 -37779 3 2 1 7 87585 87584 43833 43834 +37779 3 2 1 7 87584 43833 43834 87585 37780 3 2 1 7 87587 87586 43835 43836 -37781 3 2 1 7 87589 87588 43837 43838 +37781 3 2 1 7 87588 43837 43838 87589 37782 3 2 1 7 87589 43838 43839 87590 -37783 3 2 1 7 87591 87590 43839 43840 -37784 3 2 1 7 87596 87595 43844 43845 +37783 3 2 1 7 87590 43839 43840 87591 +37784 3 2 1 7 87595 43844 43845 87596 37785 3 2 1 7 87597 43846 43847 87598 37786 3 2 1 7 87600 87599 43848 43849 37787 3 2 1 7 87602 87601 43850 43851 @@ -199150,12 +199150,12 @@ $Elements 37789 3 2 1 7 87609 87608 43857 43858 37790 3 2 1 7 87610 87609 43858 43859 37791 3 2 1 7 87611 43860 43861 87612 -37792 3 2 1 7 87615 87614 43863 43864 +37792 3 2 1 7 87614 43863 43864 87615 37793 3 2 1 7 87615 43864 43865 87616 37794 3 2 1 7 87618 87617 43866 43867 37795 3 2 1 7 87619 43868 43869 87620 37796 3 2 1 7 87624 87623 43872 43873 -37797 3 2 1 7 87636 87635 43884 43885 +37797 3 2 1 7 87635 43884 43885 87636 37798 3 2 1 7 87641 87640 43889 43890 37799 3 2 1 7 87643 43892 43893 87644 37800 3 2 1 7 87644 43893 43894 87645 @@ -199186,19 +199186,19 @@ $Elements 37825 3 2 1 7 87792 44041 44042 87793 37826 3 2 1 7 87796 44045 44046 87797 37827 3 2 1 7 87959 44208 44209 87960 -37828 3 2 1 7 87960 44209 44210 87961 +37828 3 2 1 7 87961 87960 44209 44210 37829 3 2 1 7 87963 87962 44211 44212 -37830 3 2 1 7 87971 44220 44221 87972 +37830 3 2 1 7 87972 87971 44220 44221 37831 3 2 1 7 87977 87976 44225 44226 37832 3 2 1 7 87981 87980 44229 44230 -37833 3 2 1 7 87982 44231 44232 87983 +37833 3 2 1 7 87983 87982 44231 44232 37834 3 2 1 7 87989 44238 44239 87990 37835 3 2 1 7 43831 43832 87583 87582 37836 3 2 1 7 43866 87617 87616 43865 37837 3 2 1 7 43941 87692 87691 43940 37838 3 2 1 7 43945 87696 87695 43944 37839 3 2 1 7 43963 43964 87715 87714 -37840 3 2 1 7 43974 87725 87724 43973 +37840 3 2 1 7 43973 43974 87725 87724 37841 3 2 1 7 43993 87744 87743 43992 37842 3 2 1 7 44234 44235 87986 87985 37843 3 2 1 7 87649 87648 43897 43898 @@ -199229,7 +199229,7 @@ $Elements 37868 3 2 1 7 87671 43920 43921 87672 37869 3 2 1 7 87673 43922 43923 87674 37870 3 2 1 7 87677 43926 43927 87678 -37871 3 2 1 7 87679 87678 43927 43928 +37871 3 2 1 7 87678 43927 43928 87679 37872 3 2 1 7 87679 43928 43929 87680 37873 3 2 1 7 87682 43931 43932 87683 37874 3 2 1 7 87692 43941 43942 87693 @@ -199246,7 +199246,7 @@ $Elements 37885 3 2 1 7 87721 87720 43969 43970 37886 3 2 1 7 87725 43974 43975 87726 37887 3 2 1 7 87727 43976 43977 87728 -37888 3 2 1 7 87737 87736 43985 43986 +37888 3 2 1 7 87736 43985 43986 87737 37889 3 2 1 7 87738 87737 43986 43987 37890 3 2 1 7 87740 87739 43988 43989 37891 3 2 1 7 87745 87744 43993 43994 @@ -199255,15 +199255,15 @@ $Elements 37894 3 2 1 7 87765 44014 44015 87766 37895 3 2 1 7 87770 44019 44020 87771 37896 3 2 1 7 87775 87774 44023 44024 -37897 3 2 1 7 87777 87776 44025 44026 -37898 3 2 1 7 87780 87779 44028 44029 -37899 3 2 1 7 87782 87781 44030 44031 +37897 3 2 1 7 87776 44025 44026 87777 +37898 3 2 1 7 87779 44028 44029 87780 +37899 3 2 1 7 87781 44030 44031 87782 37900 3 2 1 7 87782 44031 44032 87783 37901 3 2 1 7 87785 44034 44035 87786 37902 3 2 1 7 87786 44035 44036 87787 37903 3 2 1 7 87790 44039 44040 87791 -37904 3 2 1 7 87795 87794 44043 44044 -37905 3 2 1 7 87802 87801 44050 44051 +37904 3 2 1 7 87794 44043 44044 87795 +37905 3 2 1 7 87801 44050 44051 87802 37906 3 2 1 7 87804 87803 44052 44053 37907 3 2 1 7 87805 44054 44055 87806 37908 3 2 1 7 87807 44056 44057 87808 @@ -199273,12 +199273,12 @@ $Elements 37912 3 2 1 7 87826 87825 44074 44075 37913 3 2 1 7 87827 44076 44077 87828 37914 3 2 1 7 87830 87829 44078 44079 -37915 3 2 1 7 87832 87831 44080 44081 -37916 3 2 1 7 87835 87834 44083 44084 -37917 3 2 1 7 87837 87836 44085 44086 -37918 3 2 1 7 87841 87840 44089 44090 +37915 3 2 1 7 87831 44080 44081 87832 +37916 3 2 1 7 87834 44083 44084 87835 +37917 3 2 1 7 87836 44085 44086 87837 +37918 3 2 1 7 87840 44089 44090 87841 37919 3 2 1 7 87845 44094 44095 87846 -37920 3 2 1 7 87850 87849 44098 44099 +37920 3 2 1 7 87849 44098 44099 87850 37921 3 2 1 7 87854 87853 44102 44103 37922 3 2 1 7 87870 87869 44118 44119 37923 3 2 1 7 87874 87873 44122 44123 @@ -199319,7 +199319,7 @@ $Elements 37958 3 2 1 7 87793 44042 44043 87794 37959 3 2 1 7 87796 87795 44044 44045 37960 3 2 1 7 87797 44046 44047 87798 -37961 3 2 1 7 87801 87800 44049 44050 +37961 3 2 1 7 87800 44049 44050 87801 37962 3 2 1 7 87802 44051 44052 87803 37963 3 2 1 7 87804 44053 44054 87805 37964 3 2 1 7 87806 44055 44056 87807 @@ -199333,16 +199333,16 @@ $Elements 37972 3 2 1 7 87821 44070 44071 87822 37973 3 2 1 7 87824 44073 44074 87825 37974 3 2 1 7 87827 87826 44075 44076 -37975 3 2 1 7 87831 87830 44079 44080 +37975 3 2 1 7 87830 44079 44080 87831 37976 3 2 1 7 87836 87835 44084 44085 37977 3 2 1 7 87840 87839 44088 44089 37978 3 2 1 7 87841 44090 44091 87842 37979 3 2 1 7 87847 87846 44095 44096 37980 3 2 1 7 87849 87848 44097 44098 -37981 3 2 1 7 87851 87850 44099 44100 +37981 3 2 1 7 87850 44099 44100 87851 37982 3 2 1 7 87859 44108 44109 87860 37983 3 2 1 7 87864 87863 44112 44113 -37984 3 2 1 7 87875 87874 44123 44124 +37984 3 2 1 7 87874 44123 44124 87875 37985 3 2 1 7 87890 87889 44138 44139 37986 3 2 1 7 87957 44206 44207 87958 37987 3 2 1 7 44007 87758 87757 44006 @@ -199350,12 +199350,12 @@ $Elements 37989 3 2 1 7 44104 44105 87856 87855 37990 3 2 1 7 44159 44160 87911 87910 37991 3 2 1 7 44170 87921 87920 44169 -37992 3 2 1 7 44154 87905 87904 44153 +37992 3 2 1 7 44153 44154 87905 87904 37993 3 2 1 7 44164 87915 87914 44163 37994 3 2 1 7 44174 87925 87924 44173 -37995 3 2 1 7 44178 44179 87930 87929 -37996 3 2 1 7 44188 87939 87938 44187 -37997 3 2 1 7 44198 87949 87948 44197 +37995 3 2 1 7 44179 87930 87929 44178 +37996 3 2 1 7 44187 44188 87939 87938 +37997 3 2 1 7 44197 44198 87949 87948 37998 3 2 1 7 87778 44027 44028 87779 37999 3 2 1 7 87900 87899 44148 44149 38000 3 2 1 7 87608 87607 43856 43857 @@ -199364,7 +199364,7 @@ $Elements 38003 3 2 1 7 44093 87844 87843 44092 38004 3 2 1 7 44158 44159 87910 87909 38005 3 2 1 7 44169 87920 87919 44168 -38006 3 2 1 7 43931 87682 87681 43930 +38006 3 2 1 7 43930 43931 87682 87681 38007 3 2 1 7 87838 44087 44088 87839 38008 3 2 1 7 87858 44107 44108 87859 38009 3 2 1 7 87863 87862 44111 44112 @@ -199461,9 +199461,9 @@ $Elements 38100 3 2 1 7 87736 87735 43984 43985 38101 3 2 1 7 87764 44013 44014 87765 38102 3 2 1 7 87759 87758 44007 44008 -38103 3 2 1 7 87627 87626 43875 43876 +38103 3 2 1 7 87626 43875 43876 87627 38104 3 2 1 7 87627 43876 43877 87628 -38105 3 2 1 7 87629 87628 43877 43878 +38105 3 2 1 7 87628 43877 43878 87629 38106 3 2 1 7 87632 87631 43880 43881 38107 3 2 1 7 87630 43879 43880 87631 38108 3 2 1 7 87685 43934 43935 87686 @@ -199478,7 +199478,7 @@ $Elements 38117 3 2 1 7 87731 43980 43981 87732 38118 3 2 1 7 87733 43982 43983 87734 38119 3 2 1 7 87734 43983 43984 87735 -38120 3 2 1 7 87761 87760 44009 44010 +38120 3 2 1 7 87760 44009 44010 87761 38121 3 2 1 7 87762 87761 44010 44011 38122 3 2 1 7 87688 87687 43936 43937 38123 3 2 1 7 87759 44008 44009 87760 @@ -199618,8 +199618,8 @@ $Elements 38257 3 2 1 7 87512 87511 43760 43761 38258 3 2 1 7 87509 43758 43759 87510 38259 3 2 1 7 43658 87409 87408 43657 -38260 3 2 1 7 43724 87475 87474 43723 -38261 3 2 1 7 43735 43736 87487 87486 +38260 3 2 1 7 43723 43724 87475 87474 +38261 3 2 1 7 43736 87487 87486 43735 38262 3 2 1 7 43656 87407 87406 43655 38263 3 2 1 7 87473 43722 43723 87474 38264 3 2 1 7 87488 87487 43736 43737 @@ -199665,7 +199665,7 @@ $Elements 38304 3 2 1 7 43817 43818 87569 87568 38305 3 2 1 7 43805 43806 87557 87556 38306 3 2 1 7 43642 87393 87392 43641 -38307 3 2 1 7 87405 87404 43653 43654 +38307 3 2 1 7 87404 43653 43654 87405 38308 3 2 1 7 43568 87319 87318 43567 38309 3 2 1 7 43763 87514 87513 43762 38310 3 2 1 7 87541 43790 43791 87542 @@ -199693,12 +199693,12 @@ $Elements 38332 3 2 1 7 87455 43704 43705 87456 38333 3 2 1 7 87463 87462 43711 43712 38334 3 2 1 7 87494 87493 43742 43743 -38335 3 2 1 7 43733 87484 87483 43732 -38336 3 2 1 7 43740 87491 87490 43739 -38337 3 2 1 7 43757 87508 87507 43756 +38335 3 2 1 7 43732 43733 87484 87483 +38336 3 2 1 7 43739 43740 87491 87490 +38337 3 2 1 7 43756 43757 87508 87507 38338 3 2 1 7 43764 87515 87514 43763 -38339 3 2 1 7 43770 43771 87522 87521 -38340 3 2 1 7 43774 87525 87524 43773 +38339 3 2 1 7 43771 87522 87521 43770 +38340 3 2 1 7 43773 43774 87525 87524 38341 3 2 1 7 43793 87544 87543 43792 38342 3 2 1 7 43798 87549 87548 43797 38343 3 2 1 7 43753 43754 87505 87504 @@ -199730,7 +199730,7 @@ $Elements 38369 3 2 1 7 43776 87527 87526 43775 38370 3 2 1 7 43786 87537 87536 43785 38371 3 2 1 7 43788 43789 87540 87539 -38372 3 2 1 7 43796 87547 87546 43795 +38372 3 2 1 7 43795 43796 87547 87546 38373 3 2 1 7 43713 87464 87463 43712 38374 3 2 1 7 43738 43739 87490 87489 38375 3 2 1 7 43773 87524 87523 43772 @@ -199775,9 +199775,9 @@ $Elements 38414 3 2 1 7 87451 43700 43701 87452 38415 3 2 1 7 43611 87362 87361 43610 38416 3 2 1 7 43621 43622 87373 87372 -38417 3 2 1 7 43625 87376 87375 43624 -38418 3 2 1 7 43635 87386 87385 43634 -38419 3 2 1 7 43639 87390 87389 43638 +38417 3 2 1 7 43624 43625 87376 87375 +38418 3 2 1 7 43634 43635 87386 87385 +38419 3 2 1 7 43638 43639 87390 87389 38420 3 2 1 7 43651 43652 87403 87402 38421 3 2 1 7 43661 43662 87413 87412 38422 3 2 1 7 43671 43672 87423 87422 @@ -199801,34 +199801,34 @@ $Elements 38440 3 2 1 7 43585 87336 87335 43584 38441 3 2 1 7 43588 87339 87338 43587 38442 3 2 1 7 43590 43591 87342 87341 -38443 3 2 1 7 43598 87349 87348 43597 +38443 3 2 1 7 43597 43598 87349 87348 38444 3 2 1 7 43600 43601 87352 87351 38445 3 2 1 7 43605 87356 87355 43604 38446 3 2 1 7 43607 43608 87359 87358 38447 3 2 1 7 43609 87360 87359 43608 -38448 3 2 1 7 43610 87361 87360 43609 +38448 3 2 1 7 43609 43610 87361 87360 38449 3 2 1 7 43612 87363 87362 43611 -38450 3 2 1 7 43613 87364 87363 43612 +38450 3 2 1 7 43612 43613 87364 87363 38451 3 2 1 7 43621 87372 87371 43620 38452 3 2 1 7 43623 87374 87373 43622 38453 3 2 1 7 43624 87375 87374 43623 38454 3 2 1 7 43626 87377 87376 43625 -38455 3 2 1 7 43627 87378 87377 43626 +38455 3 2 1 7 43626 43627 87378 87377 38456 3 2 1 7 43631 43632 87383 87382 38457 3 2 1 7 43635 43636 87387 87386 -38458 3 2 1 7 43637 87388 87387 43636 +38458 3 2 1 7 43636 43637 87388 87387 38459 3 2 1 7 43638 87389 87388 43637 38460 3 2 1 7 43640 87391 87390 43639 38461 3 2 1 7 43641 87392 87391 43640 38462 3 2 1 7 43649 43650 87401 87400 38463 3 2 1 7 43652 43653 87404 87403 38464 3 2 1 7 43663 87414 87413 43662 -38465 3 2 1 7 43664 87415 87414 43663 +38465 3 2 1 7 43663 43664 87415 87414 38466 3 2 1 7 43673 87424 87423 43672 38467 3 2 1 7 43674 87425 87424 43673 38468 3 2 1 7 43675 87426 87425 43674 -38469 3 2 1 7 43687 87438 87437 43686 -38470 3 2 1 7 43688 87439 87438 43687 +38469 3 2 1 7 43686 43687 87438 87437 +38470 3 2 1 7 43687 43688 87439 87438 38471 3 2 1 7 87324 87323 43572 43573 38472 3 2 1 7 87326 43575 43576 87327 38473 3 2 1 7 87328 87327 43576 43577 @@ -199838,14 +199838,14 @@ $Elements 38477 3 2 1 7 43560 87311 87310 43559 38478 3 2 1 7 87450 43699 43700 87451 38479 3 2 1 7 43695 87446 87445 43694 -38480 3 2 1 7 43524 87275 87274 43523 +38480 3 2 1 7 43523 43524 87275 87274 38481 3 2 1 7 43526 43527 87278 87277 38482 3 2 1 7 43528 43529 87280 87279 38483 3 2 1 7 43530 87281 87280 43529 -38484 3 2 1 7 43534 87285 87284 43533 -38485 3 2 1 7 43538 87289 87288 43537 +38484 3 2 1 7 43533 43534 87285 87284 +38485 3 2 1 7 43537 43538 87289 87288 38486 3 2 1 7 43547 87298 87297 43546 -38487 3 2 1 7 43550 87301 87300 43549 +38487 3 2 1 7 43549 43550 87301 87300 38488 3 2 1 7 43554 87305 87304 43553 38489 3 2 1 7 43554 43555 87306 87305 38490 3 2 1 7 43556 87307 87306 43555 @@ -199860,7 +199860,7 @@ $Elements 38499 3 2 1 7 43589 43590 87341 87340 38500 3 2 1 7 43592 87343 87342 43591 38501 3 2 1 7 43592 43593 87344 87343 -38502 3 2 1 7 43596 87347 87346 43595 +38502 3 2 1 7 43595 43596 87347 87346 38503 3 2 1 7 43601 43602 87353 87352 38504 3 2 1 7 43602 43603 87354 87353 38505 3 2 1 7 43604 87355 87354 43603 @@ -199869,7 +199869,7 @@ $Elements 38508 3 2 1 7 43619 43620 87371 87370 38509 3 2 1 7 43629 43630 87381 87380 38510 3 2 1 7 43630 43631 87382 87381 -38511 3 2 1 7 43808 87559 87558 43807 +38511 3 2 1 7 43807 43808 87559 87558 38512 3 2 1 7 43810 43811 87562 87561 38513 3 2 1 7 87401 43650 43651 87402 38514 3 2 1 7 87379 87378 43627 43628 @@ -199877,16 +199877,16 @@ $Elements 38516 3 2 1 7 43524 43525 87276 87275 38517 3 2 1 7 43526 87277 87276 43525 38518 3 2 1 7 43527 43528 87279 87278 -38519 3 2 1 7 43532 87283 87282 43531 +38519 3 2 1 7 43531 43532 87283 87282 38520 3 2 1 7 43533 87284 87283 43532 38521 3 2 1 7 43535 87286 87285 43534 -38522 3 2 1 7 43536 87287 87286 43535 +38522 3 2 1 7 43535 43536 87287 87286 38523 3 2 1 7 43537 87288 87287 43536 38524 3 2 1 7 43538 43539 87290 87289 38525 3 2 1 7 43540 87291 87290 43539 38526 3 2 1 7 43549 87300 87299 43548 38527 3 2 1 7 43550 43551 87302 87301 -38528 3 2 1 7 43552 87303 87302 43551 +38528 3 2 1 7 43551 43552 87303 87302 38529 3 2 1 7 43553 87304 87303 43552 38530 3 2 1 7 43570 87321 87320 43569 38531 3 2 1 7 43807 87558 87557 43806 @@ -199894,12 +199894,12 @@ $Elements 38533 3 2 1 7 43810 87561 87560 43809 38534 3 2 1 7 43812 87563 87562 43811 38535 3 2 1 7 43820 43821 87572 87571 -38536 3 2 1 7 43823 87574 87573 43822 +38536 3 2 1 7 43822 43823 87574 87573 38537 3 2 1 7 43824 87575 87574 43823 38538 3 2 1 7 87344 43593 43594 87345 38539 3 2 1 7 43594 43595 87346 87345 38540 3 2 1 7 43648 87399 87398 43647 -38541 3 2 1 7 43649 87400 87399 43648 +38541 3 2 1 7 43648 43649 87400 87399 38542 3 2 1 7 87292 43541 43542 87293 38543 3 2 1 7 43819 43820 87571 87570 38544 3 2 1 7 87294 87293 43542 43543 @@ -199910,8 +199910,8 @@ $Elements 38549 3 2 1 7 87572 43821 43822 87573 38550 3 2 1 7 43584 87335 87334 43583 38551 3 2 1 7 43597 87348 87347 43596 -38552 3 2 1 7 43544 87295 87294 43543 -38553 3 2 1 7 43545 87296 87295 43544 +38552 3 2 1 7 43543 43544 87295 87294 +38553 3 2 1 7 43544 43545 87296 87295 38554 3 2 1 7 43546 87297 87296 43545 38555 3 2 1 7 43779 87530 87529 43778 38556 3 2 1 7 43784 87535 87534 43783 @@ -200003,7 +200003,7 @@ $Elements 38642 3 2 1 7 46797 46796 92183 92182 38643 3 2 1 7 46795 46794 92185 92184 38644 3 2 1 7 46797 92182 92181 46798 -38645 3 2 1 7 46795 92184 92183 46796 +38645 3 2 1 7 46796 46795 92184 92183 38646 3 2 1 7 46799 46798 92181 92180 38647 3 2 1 7 46800 46799 92180 92179 38648 3 2 1 7 46803 46802 92177 92176 @@ -200030,8 +200030,8 @@ $Elements 38669 3 2 1 7 92165 46814 46813 92166 38670 3 2 1 7 46809 92170 92169 46810 38671 3 2 1 7 46823 92156 92155 46824 -38672 3 2 1 7 46825 92154 92153 46826 -38673 3 2 1 7 92167 92166 46813 46812 +38672 3 2 1 7 46826 46825 92154 92153 +38673 3 2 1 7 92166 46813 46812 92167 38674 3 2 1 7 92164 92163 46816 46815 38675 3 2 1 7 92164 46815 46814 92165 38676 3 2 1 7 92168 46811 46810 92169 @@ -200109,13 +200109,13 @@ $Elements 38748 3 2 1 7 46833 92146 92145 46834 38749 3 2 1 7 46837 92142 92141 46838 38750 3 2 1 7 46840 92139 92138 46841 -38751 3 2 1 7 46853 92126 92125 46854 +38751 3 2 1 7 46854 46853 92126 92125 38752 3 2 1 7 92144 46835 46834 92145 38753 3 2 1 7 92144 92143 46836 46835 -38754 3 2 1 7 92143 92142 46837 46836 +38754 3 2 1 7 92142 46837 46836 92143 38755 3 2 1 7 92140 46839 46838 92141 38756 3 2 1 7 92137 46842 46841 92138 -38757 3 2 1 7 92137 92136 46843 46842 +38757 3 2 1 7 92136 46843 46842 92137 38758 3 2 1 7 92136 92135 46844 46843 38759 3 2 1 7 92134 46845 46844 92135 38760 3 2 1 7 92133 92132 46847 46846 @@ -200234,7 +200234,7 @@ $Elements 38873 3 2 1 7 91892 91891 47088 47087 38874 3 2 1 7 91874 47105 47104 91875 38875 3 2 1 7 92067 46912 46911 92068 -38876 3 2 1 7 92070 92069 46910 46909 +38876 3 2 1 7 92069 46910 46909 92070 38877 3 2 1 7 92069 92068 46911 46910 38878 3 2 1 7 92062 92061 46918 46917 38879 3 2 1 7 92066 46913 46912 92067 @@ -200282,7 +200282,7 @@ $Elements 38921 3 2 1 7 46939 46938 92041 92040 38922 3 2 1 7 91914 47065 47064 91915 38923 3 2 1 7 46940 46939 92040 92039 -38924 3 2 1 7 46946 92033 92032 46947 +38924 3 2 1 7 46947 46946 92033 92032 38925 3 2 1 7 46944 92035 92034 46945 38926 3 2 1 7 46956 92023 92022 46957 38927 3 2 1 7 92037 46942 46941 92038 @@ -200298,7 +200298,7 @@ $Elements 38937 3 2 1 7 46950 92029 92028 46951 38938 3 2 1 7 46952 46951 92028 92027 38939 3 2 1 7 46952 92027 92026 46953 -38940 3 2 1 7 46953 92026 92025 46954 +38940 3 2 1 7 46954 46953 92026 92025 38941 3 2 1 7 46957 92022 92021 46958 38942 3 2 1 7 46959 46958 92021 92020 38943 3 2 1 7 91915 47064 47063 91916 @@ -200330,7 +200330,7 @@ $Elements 38969 3 2 1 7 47053 91926 91925 47054 38970 3 2 1 7 47055 91924 91923 47056 38971 3 2 1 7 91924 47055 47054 91925 -38972 3 2 1 7 91936 47043 47042 91937 +38972 3 2 1 7 91937 91936 47043 47042 38973 3 2 1 7 91934 47045 47044 91935 38974 3 2 1 7 91948 47031 47030 91949 38975 3 2 1 7 47039 47038 91941 91940 @@ -200338,7 +200338,7 @@ $Elements 38977 3 2 1 7 46965 92014 92013 46966 38978 3 2 1 7 91942 47037 47036 91943 38979 3 2 1 7 47032 47031 91948 91947 -38980 3 2 1 7 47032 91947 91946 47033 +38980 3 2 1 7 47033 47032 91947 91946 38981 3 2 1 7 47037 91942 91941 47038 38982 3 2 1 7 47035 91944 91943 47036 38983 3 2 1 7 47035 47034 91945 91944 @@ -200362,7 +200362,7 @@ $Elements 39001 3 2 1 7 91966 47013 47012 91967 39002 3 2 1 7 91962 47017 47016 91963 39003 3 2 1 7 91962 91961 47018 47017 -39004 3 2 1 7 47021 91958 91957 47022 +39004 3 2 1 7 47022 47021 91958 91957 39005 3 2 1 7 91964 91963 47016 47015 39006 3 2 1 7 47015 47014 91965 91964 39007 3 2 1 7 47012 47011 91968 91967 @@ -201361,13 +201361,13 @@ $Elements 40000 3 2 1 7 44607 44608 88359 88358 40001 3 2 1 7 44617 88368 88367 44616 40002 3 2 1 7 44629 44630 88381 88380 -40003 3 2 1 7 88382 44631 44632 88383 +40003 3 2 1 7 88383 88382 44631 44632 40004 3 2 1 7 88206 44455 44456 88207 40005 3 2 1 7 88321 44570 44571 88322 40006 3 2 1 7 88060 44309 44310 88061 40007 3 2 1 7 88069 44318 44319 88070 40008 3 2 1 7 88082 44331 44332 88083 -40009 3 2 1 7 88083 44332 44333 88084 +40009 3 2 1 7 88084 88083 44332 44333 40010 3 2 1 7 88085 44334 44335 88086 40011 3 2 1 7 88095 44344 44345 88096 40012 3 2 1 7 88109 44358 44359 88110 @@ -201376,8 +201376,8 @@ $Elements 40015 3 2 1 7 88146 44395 44396 88147 40016 3 2 1 7 88159 88158 44407 44408 40017 3 2 1 7 88168 44417 44418 88169 -40018 3 2 1 7 88171 44420 44421 88172 -40019 3 2 1 7 88180 44429 44430 88181 +40018 3 2 1 7 88172 88171 44420 44421 +40019 3 2 1 7 88181 88180 44429 44430 40020 3 2 1 7 88195 44444 44445 88196 40021 3 2 1 7 88208 44457 44458 88209 40022 3 2 1 7 88218 88217 44466 44467 @@ -201390,7 +201390,7 @@ $Elements 40029 3 2 1 7 88294 44543 44544 88295 40030 3 2 1 7 88307 44556 44557 88308 40031 3 2 1 7 44569 88320 88319 44568 -40032 3 2 1 7 44583 44584 88335 88334 +40032 3 2 1 7 44584 88335 88334 44583 40033 3 2 1 7 44593 88344 88343 44592 40034 3 2 1 7 44606 88357 88356 44605 40035 3 2 1 7 44609 88360 88359 44608 @@ -201405,14 +201405,14 @@ $Elements 40044 3 2 1 7 88185 44434 44435 88186 40045 3 2 1 7 44633 44634 88385 88384 40046 3 2 1 7 88080 44329 44330 88081 -40047 3 2 1 7 88098 44347 44348 88099 +40047 3 2 1 7 88099 88098 44347 44348 40048 3 2 1 7 88279 44528 44529 88280 40049 3 2 1 7 88297 44546 44547 88298 40050 3 2 1 7 88168 88167 44416 44417 40051 3 2 1 7 88211 88210 44459 44460 40052 3 2 1 7 44615 44616 88367 88366 40053 3 2 1 7 44504 88255 88254 44503 -40054 3 2 1 7 88055 44304 44305 88056 +40054 3 2 1 7 88056 88055 44304 44305 40055 3 2 1 7 88124 88123 44372 44373 40056 3 2 1 7 88322 44571 44572 88323 40057 3 2 1 7 44485 88236 88235 44484 @@ -201422,7 +201422,7 @@ $Elements 40061 3 2 1 7 88230 88229 44478 44479 40062 3 2 1 7 44596 44597 88348 88347 40063 3 2 1 7 44311 88062 88061 44310 -40064 3 2 1 7 44252 44253 88004 88003 +40064 3 2 1 7 44253 88004 88003 44252 40065 3 2 1 7 44267 88018 88017 44266 40066 3 2 1 7 87992 87991 44240 44241 40067 3 2 1 7 87994 87993 44242 44243 @@ -201461,7 +201461,7 @@ $Elements 40100 3 2 1 7 447 215 44240 87991 40101 3 2 1 7 87994 44243 44244 87995 40102 3 2 1 7 87998 44247 44248 87999 -40103 3 2 1 7 87999 44248 44249 88000 +40103 3 2 1 7 88000 87999 44248 44249 40104 3 2 1 7 88004 44253 44254 88005 40105 3 2 1 7 88008 88007 44256 44257 40106 3 2 1 7 88011 44260 44261 88012 @@ -201483,7 +201483,7 @@ $Elements 40122 3 2 1 7 44622 88373 88372 44621 40123 3 2 1 7 44249 44250 88001 88000 40124 3 2 1 7 88030 88029 44278 44279 -40125 3 2 1 7 88204 44453 44454 88205 +40125 3 2 1 7 88205 88204 44453 44454 40126 3 2 1 7 88285 44534 44535 88286 40127 3 2 1 7 88291 44540 44541 88292 40128 3 2 1 7 44336 88087 88086 44335 @@ -201502,8 +201502,8 @@ $Elements 40141 3 2 1 7 88242 88241 44490 44491 40142 3 2 1 7 88137 88136 44385 44386 40143 3 2 1 7 88130 88129 44378 44379 -40144 3 2 1 7 88248 44497 44498 88249 -40145 3 2 1 7 44577 44578 88329 88328 +40144 3 2 1 7 88249 88248 44497 44498 +40145 3 2 1 7 44578 88329 88328 44577 40146 3 2 1 7 216 448 88387 44636 40147 3 2 1 7 88047 44296 44297 88048 40148 3 2 1 7 88048 44297 44298 88049 @@ -201545,7 +201545,7 @@ $Elements 40184 3 2 1 7 88241 88240 44489 44490 40185 3 2 1 7 88252 44501 44502 88253 40186 3 2 1 7 88263 88262 44511 44512 -40187 3 2 1 7 88264 44513 44514 88265 +40187 3 2 1 7 88265 88264 44513 44514 40188 3 2 1 7 88265 44514 44515 88266 40189 3 2 1 7 88273 44522 44523 88274 40190 3 2 1 7 88275 44524 44525 88276 @@ -201568,10 +201568,10 @@ $Elements 40207 3 2 1 7 44615 88366 88365 44614 40208 3 2 1 7 44623 88374 88373 44622 40209 3 2 1 7 44635 88386 88385 44634 -40210 3 2 1 7 88161 44410 44411 88162 +40210 3 2 1 7 88162 88161 44410 44411 40211 3 2 1 7 88049 44298 44299 88050 40212 3 2 1 7 88050 44299 44300 88051 -40213 3 2 1 7 88077 44326 44327 88078 +40213 3 2 1 7 88078 88077 44326 44327 40214 3 2 1 7 88078 44327 44328 88079 40215 3 2 1 7 88080 88079 44328 44329 40216 3 2 1 7 88100 44349 44350 88101 @@ -201591,13 +201591,13 @@ $Elements 40230 3 2 1 7 88279 88278 44527 44528 40231 3 2 1 7 88299 88298 44547 44548 40232 3 2 1 7 88300 44549 44550 88301 -40233 3 2 1 7 88324 44573 44574 88325 +40233 3 2 1 7 88325 88324 44573 44574 40234 3 2 1 7 44576 88327 88326 44575 40235 3 2 1 7 44577 88328 88327 44576 40236 3 2 1 7 88337 88336 44585 44586 40237 3 2 1 7 44598 88349 88348 44597 40238 3 2 1 7 44600 88351 88350 44599 -40239 3 2 1 7 88364 44613 44614 88365 +40239 3 2 1 7 88365 88364 44613 44614 40240 3 2 1 7 88375 88374 44623 44624 40241 3 2 1 7 44627 88378 88377 44626 40242 3 2 1 7 88386 44635 44636 88387 @@ -201606,50 +201606,50 @@ $Elements 40245 3 2 1 7 88376 88375 44624 44625 40246 3 2 1 7 88201 44450 44451 88202 40247 3 2 1 7 88051 44300 44301 88052 -40248 3 2 1 7 88053 44302 44303 88054 -40249 3 2 1 7 88063 44312 44313 88064 +40248 3 2 1 7 88054 88053 44302 44303 +40249 3 2 1 7 88064 88063 44312 44313 40250 3 2 1 7 88065 44314 44315 88066 -40251 3 2 1 7 88074 44323 44324 88075 -40252 3 2 1 7 88076 44325 44326 88077 +40251 3 2 1 7 88075 88074 44323 44324 +40252 3 2 1 7 88077 88076 44325 44326 40253 3 2 1 7 88089 88088 44337 44338 -40254 3 2 1 7 88090 44339 44340 88091 +40254 3 2 1 7 88091 88090 44339 44340 40255 3 2 1 7 88103 88102 44351 44352 40256 3 2 1 7 88104 44353 44354 88105 -40257 3 2 1 7 88113 44362 44363 88114 +40257 3 2 1 7 88114 88113 44362 44363 40258 3 2 1 7 88115 44364 44365 88116 -40259 3 2 1 7 88125 44374 44375 88126 -40260 3 2 1 7 88137 44386 44387 88138 +40259 3 2 1 7 88126 88125 44374 44375 +40260 3 2 1 7 88138 88137 44386 44387 40261 3 2 1 7 88141 88140 44389 44390 40262 3 2 1 7 88153 88152 44401 44402 -40263 3 2 1 7 88162 44411 44412 88163 -40264 3 2 1 7 88164 44413 44414 88165 -40265 3 2 1 7 88175 44424 44425 88176 +40263 3 2 1 7 88163 88162 44411 44412 +40264 3 2 1 7 88165 88164 44413 44414 +40265 3 2 1 7 88176 88175 44424 44425 40266 3 2 1 7 88177 88176 44425 44426 -40267 3 2 1 7 88187 44436 44437 88188 -40268 3 2 1 7 88189 44438 44439 88190 -40269 3 2 1 7 88191 44440 44441 88192 -40270 3 2 1 7 88211 44460 44461 88212 -40271 3 2 1 7 88214 44463 44464 88215 -40272 3 2 1 7 88224 44473 44474 88225 +40267 3 2 1 7 88188 88187 44436 44437 +40268 3 2 1 7 88190 88189 44438 44439 +40269 3 2 1 7 88192 88191 44440 44441 +40270 3 2 1 7 88212 88211 44460 44461 +40271 3 2 1 7 88215 88214 44463 44464 +40272 3 2 1 7 88225 88224 44473 44474 40273 3 2 1 7 88237 88236 44485 44486 -40274 3 2 1 7 88239 44488 44489 88240 -40275 3 2 1 7 88251 44500 44501 88252 -40276 3 2 1 7 88253 44502 44503 88254 -40277 3 2 1 7 88261 44510 44511 88262 -40278 3 2 1 7 88263 44512 44513 88264 -40279 3 2 1 7 88274 44523 44524 88275 +40274 3 2 1 7 88240 88239 44488 44489 +40275 3 2 1 7 88252 88251 44500 44501 +40276 3 2 1 7 88254 88253 44502 44503 +40277 3 2 1 7 88262 88261 44510 44511 +40278 3 2 1 7 88264 88263 44512 44513 +40279 3 2 1 7 88275 88274 44523 44524 40280 3 2 1 7 88278 88277 44526 44527 -40281 3 2 1 7 88286 44535 44536 88287 +40281 3 2 1 7 88287 88286 44535 44536 40282 3 2 1 7 88290 88289 44538 44539 40283 3 2 1 7 88301 44550 44551 88302 -40284 3 2 1 7 88303 44552 44553 88304 -40285 3 2 1 7 44560 44561 88312 88311 -40286 3 2 1 7 44562 44563 88314 88313 +40284 3 2 1 7 88304 88303 44552 44553 +40285 3 2 1 7 44561 88312 88311 44560 +40286 3 2 1 7 44563 88314 88313 44562 40287 3 2 1 7 44589 88340 88339 44588 40288 3 2 1 7 44599 88350 88349 44598 40289 3 2 1 7 44601 88352 88351 44600 -40290 3 2 1 7 44610 44611 88362 88361 -40291 3 2 1 7 44295 44296 88047 88046 +40290 3 2 1 7 44611 88362 88361 44610 +40291 3 2 1 7 44296 88047 88046 44295 40292 3 2 1 7 88100 88099 44348 44349 40293 3 2 1 7 88128 44377 44378 88129 40294 3 2 1 7 88227 44476 44477 88228 @@ -201828,7 +201828,7 @@ $Elements 40467 3 2 1 7 91672 47307 47306 91673 40468 3 2 1 7 47366 91613 91612 47367 40469 3 2 1 7 47301 91678 91677 47302 -40470 3 2 1 7 91633 91632 47347 47346 +40470 3 2 1 7 91632 47347 47346 91633 40471 3 2 1 7 91600 91599 47380 47379 40472 3 2 1 7 47322 47321 91658 91657 40473 3 2 1 7 91593 47386 47385 91594 @@ -202483,7 +202483,7 @@ $Elements 41122 3 2 1 7 47508 91471 91470 47509 41123 3 2 1 7 47511 91468 91467 47512 41124 3 2 1 7 47528 47527 91452 91451 -41125 3 2 1 7 47499 47498 91481 91480 +41125 3 2 1 7 47498 91481 91480 47499 41126 3 2 1 7 47505 47504 91475 91474 41127 3 2 1 7 47508 47507 91472 91471 41128 3 2 1 7 47517 47516 91463 91462 @@ -202517,7 +202517,7 @@ $Elements 41156 3 2 1 7 91456 47523 47522 91457 41157 3 2 1 7 47522 47521 91458 91457 41158 3 2 1 7 89738 49241 238 453 -41159 3 2 1 7 90094 48885 48884 90095 +41159 3 2 1 7 90095 90094 48885 48884 41160 3 2 1 7 90097 48882 48881 90098 41161 3 2 1 7 90090 48889 48888 90091 41162 3 2 1 7 90087 48892 48891 90088 @@ -202541,7 +202541,7 @@ $Elements 41180 3 2 1 7 90110 90109 48870 48869 41181 3 2 1 7 48899 48898 90081 90080 41182 3 2 1 7 48901 90078 90077 48902 -41183 3 2 1 7 48903 48902 90077 90076 +41183 3 2 1 7 48902 90077 90076 48903 41184 3 2 1 7 90101 48878 48877 90102 41185 3 2 1 7 48900 48899 90080 90079 41186 3 2 1 7 48900 90079 90078 48901 @@ -202577,11 +202577,11 @@ $Elements 41216 3 2 1 7 48937 48936 90043 90042 41217 3 2 1 7 90040 48939 48938 90041 41218 3 2 1 7 90039 90038 48941 48940 -41219 3 2 1 7 90036 48943 48942 90037 +41219 3 2 1 7 90037 90036 48943 48942 41220 3 2 1 7 90034 48945 48944 90035 41221 3 2 1 7 90040 90039 48940 48939 41222 3 2 1 7 48942 48941 90038 90037 -41223 3 2 1 7 48944 48943 90036 90035 +41223 3 2 1 7 48943 90036 90035 48944 41224 3 2 1 7 48945 90034 90033 48946 41225 3 2 1 7 48835 90144 90143 48836 41226 3 2 1 7 48828 90151 90150 48829 @@ -202607,14 +202607,14 @@ $Elements 41246 3 2 1 7 90140 90139 48840 48839 41247 3 2 1 7 48809 236 455 90170 41248 3 2 1 7 90124 48855 48854 90125 -41249 3 2 1 7 48856 48855 90124 90123 -41250 3 2 1 7 90122 48857 48856 90123 +41249 3 2 1 7 48855 90124 90123 48856 +41250 3 2 1 7 90123 90122 48857 48856 41251 3 2 1 7 48960 90019 90018 48961 41252 3 2 1 7 48814 48813 90166 90165 41253 3 2 1 7 237 48965 90014 454 41254 3 2 1 7 48809 90170 90169 48810 41255 3 2 1 7 48811 48810 90169 90168 -41256 3 2 1 7 48812 48811 90168 90167 +41256 3 2 1 7 48811 90168 90167 48812 41257 3 2 1 7 48812 90167 90166 48813 41258 3 2 1 7 48962 48961 90018 90017 41259 3 2 1 7 48963 48962 90017 90016 @@ -202625,11 +202625,11 @@ $Elements 41264 3 2 1 7 90058 48921 48920 90059 41265 3 2 1 7 48841 90138 90137 48842 41266 3 2 1 7 48854 48853 90126 90125 -41267 3 2 1 7 90032 48947 48946 90033 +41267 3 2 1 7 90033 90032 48947 48946 41268 3 2 1 7 90151 48828 48827 90152 41269 3 2 1 7 90019 48960 48959 90020 41270 3 2 1 7 90165 90164 48815 48814 -41271 3 2 1 7 48922 48921 90058 90057 +41271 3 2 1 7 48921 90058 90057 48922 41272 3 2 1 7 90048 90047 48932 48931 41273 3 2 1 7 48852 90127 90126 48853 41274 3 2 1 7 90136 48843 48842 90137 @@ -202684,14 +202684,14 @@ $Elements 41323 3 2 1 7 43073 86824 86823 43072 41324 3 2 1 7 86841 86840 43089 43090 41325 3 2 1 7 43124 43125 86876 86875 -41326 3 2 1 7 43028 86779 86778 43027 +41326 3 2 1 7 43027 43028 86779 86778 41327 3 2 1 7 43029 43030 86781 86780 41328 3 2 1 7 43074 43075 86826 86825 41329 3 2 1 7 43132 43133 86884 86883 41330 3 2 1 7 43135 86886 86885 43134 41331 3 2 1 7 86788 43037 43038 86789 41332 3 2 1 7 43040 86791 86790 43039 -41333 3 2 1 7 43088 86839 86838 43087 +41333 3 2 1 7 43087 43088 86839 86838 41334 3 2 1 7 43123 86874 86873 43122 41335 3 2 1 7 43025 43026 86777 86776 41336 3 2 1 7 43032 86783 86782 43031 @@ -202732,14 +202732,14 @@ $Elements 41371 3 2 1 7 86872 43121 43122 86873 41372 3 2 1 7 86887 43136 43137 86888 41373 3 2 1 7 43026 43027 86778 86777 -41374 3 2 1 7 43076 86827 86826 43075 -41375 3 2 1 7 43081 86832 86831 43080 +41374 3 2 1 7 43075 43076 86827 86826 +41375 3 2 1 7 43080 43081 86832 86831 41376 3 2 1 7 43121 86872 86871 43120 41377 3 2 1 7 43132 86883 86882 43131 41378 3 2 1 7 43139 86890 86889 43138 41379 3 2 1 7 43023 43024 86775 86774 41380 3 2 1 7 86843 86842 43091 43092 -41381 3 2 1 7 43045 86796 86795 43044 +41381 3 2 1 7 43044 43045 86796 86795 41382 3 2 1 7 43071 43072 86823 86822 41383 3 2 1 7 86796 43045 43046 86797 41384 3 2 1 7 86820 43069 43070 86821 @@ -202756,10 +202756,10 @@ $Elements 41395 3 2 1 7 43093 43094 86845 86844 41396 3 2 1 7 86890 43139 43140 86891 41397 3 2 1 7 43143 86894 86893 43142 -41398 3 2 1 7 86864 86863 43112 43113 +41398 3 2 1 7 86863 43112 43113 86864 41399 3 2 1 7 86846 43095 43096 86847 41400 3 2 1 7 86818 43067 43068 86819 -41401 3 2 1 7 43022 86773 86772 43021 +41401 3 2 1 7 43021 43022 86773 86772 41402 3 2 1 7 43019 86770 86769 43018 41403 3 2 1 7 43054 86805 86804 43053 41404 3 2 1 7 43109 86860 86859 43108 @@ -202771,7 +202771,7 @@ $Elements 41410 3 2 1 7 86806 86805 43054 43055 41411 3 2 1 7 86813 43062 43063 86814 41412 3 2 1 7 86848 43097 43098 86849 -41413 3 2 1 7 86851 86850 43099 43100 +41413 3 2 1 7 86850 43099 43100 86851 41414 3 2 1 7 43065 86816 86815 43064 41415 3 2 1 7 43110 86861 86860 43109 41416 3 2 1 7 86768 43017 43018 86769 @@ -202800,18 +202800,18 @@ $Elements 41439 3 2 1 7 43145 43146 86897 86896 41440 3 2 1 7 43147 43148 86899 86898 41441 3 2 1 7 43148 43149 86900 86899 -41442 3 2 1 7 86764 86763 43012 43013 +41442 3 2 1 7 86763 43012 43013 86764 41443 3 2 1 7 86766 43015 43016 86767 -41444 3 2 1 7 86799 86798 43047 43048 +41444 3 2 1 7 86798 43047 43048 86799 41445 3 2 1 7 86801 43050 43051 86802 -41446 3 2 1 7 86809 86808 43057 43058 -41447 3 2 1 7 86852 86851 43100 43101 -41448 3 2 1 7 86858 86857 43106 43107 +41446 3 2 1 7 86808 43057 43058 86809 +41447 3 2 1 7 86851 43100 43101 86852 +41448 3 2 1 7 86857 43106 43107 86858 41449 3 2 1 7 86897 43146 43147 86898 -41450 3 2 1 7 86812 86811 43060 43061 +41450 3 2 1 7 86811 43060 43061 86812 41451 3 2 1 7 86817 43066 43067 86818 41452 3 2 1 7 86847 43096 43097 86848 -41453 3 2 1 7 86855 86854 43103 43104 +41453 3 2 1 7 86854 43103 43104 86855 41454 3 2 1 7 86861 43110 43111 86862 41455 3 2 1 7 86862 43111 43112 86863 41456 3 2 1 7 86901 86900 43149 43150 @@ -202896,7 +202896,7 @@ $Elements 41535 3 2 1 7 86506 42755 42756 86507 41536 3 2 1 7 86568 86567 42816 42817 41537 3 2 1 7 42696 42697 86448 86447 -41538 3 2 1 7 86424 86423 42672 42673 +41538 3 2 1 7 86423 42672 42673 86424 41539 3 2 1 7 42674 86425 86424 42673 41540 3 2 1 7 86496 42745 42746 86497 41541 3 2 1 7 42729 86480 86479 42728 @@ -202908,7 +202908,7 @@ $Elements 41547 3 2 1 7 86442 86441 42690 42691 41548 3 2 1 7 86511 42760 42761 86512 41549 3 2 1 7 42685 42686 86437 86436 -41550 3 2 1 7 86435 86434 42683 42684 +41550 3 2 1 7 86434 42683 42684 86435 41551 3 2 1 7 86435 42684 42685 86436 41552 3 2 1 7 42687 86438 86437 42686 41553 3 2 1 7 42680 86431 86430 42679 @@ -202916,7 +202916,7 @@ $Elements 41555 3 2 1 7 42683 86434 86433 42682 41556 3 2 1 7 42719 86470 86469 42718 41557 3 2 1 7 42677 86428 86427 42676 -41558 3 2 1 7 42682 86433 86432 42681 +41558 3 2 1 7 42681 42682 86433 86432 41559 3 2 1 7 86562 42811 42812 86563 41560 3 2 1 7 86429 42678 42679 86430 41561 3 2 1 7 42678 86429 86428 42677 @@ -202941,7 +202941,7 @@ $Elements 41580 3 2 1 7 42635 42636 86387 86386 41581 3 2 1 7 42640 42641 86392 86391 41582 3 2 1 7 42643 42644 86395 86394 -41583 3 2 1 7 42638 86389 86388 42637 +41583 3 2 1 7 42637 42638 86389 86388 41584 3 2 1 7 42642 42643 86394 86393 41585 3 2 1 7 42632 42633 86384 86383 41586 3 2 1 7 86385 42634 42635 86386 @@ -202966,7 +202966,7 @@ $Elements 41605 3 2 1 7 86564 86563 42812 42813 41606 3 2 1 7 42699 86450 86449 42698 41607 3 2 1 7 86544 42793 42794 86545 -41608 3 2 1 7 86399 86398 42647 42648 +41608 3 2 1 7 86398 42647 42648 86399 41609 3 2 1 7 42768 42769 86520 86519 41610 3 2 1 7 86556 42805 42806 86557 41611 3 2 1 7 42799 86550 86549 42798 @@ -202979,7 +202979,7 @@ $Elements 41618 3 2 1 7 86530 86529 42778 42779 41619 3 2 1 7 86523 42772 42773 86524 41620 3 2 1 7 42779 42780 86531 86530 -41621 3 2 1 7 42774 86525 86524 42773 +41621 3 2 1 7 42773 42774 86525 86524 41622 3 2 1 7 42759 86510 86509 42758 41623 3 2 1 7 42767 86518 86517 42766 41624 3 2 1 7 86522 42771 42772 86523 @@ -203030,12 +203030,12 @@ $Elements 41669 3 2 1 7 42700 86451 86450 42699 41670 3 2 1 7 42844 210 442 86595 41671 3 2 1 7 86589 42838 42839 86590 -41672 3 2 1 7 42837 42838 86589 86588 +41672 3 2 1 7 42838 86589 86588 42837 41673 3 2 1 7 42708 42709 86460 86459 41674 3 2 1 7 42707 86458 86457 42706 41675 3 2 1 7 86578 86577 42826 42827 41676 3 2 1 7 42702 86453 86452 42701 -41677 3 2 1 7 42714 86465 86464 42713 +41677 3 2 1 7 42713 42714 86465 86464 41678 3 2 1 7 42722 86473 86472 42721 41679 3 2 1 7 86472 86471 42720 42721 41680 3 2 1 7 86576 42825 42826 86577 @@ -203137,7 +203137,7 @@ $Elements 41776 3 2 1 7 86290 86289 42538 42539 41777 3 2 1 7 86128 86127 42376 42377 41778 3 2 1 7 86129 86128 42377 42378 -41779 3 2 1 7 42378 42379 86130 86129 +41779 3 2 1 7 42379 86130 86129 42378 41780 3 2 1 7 42396 42397 86148 86147 41781 3 2 1 7 42394 42395 86146 86145 41782 3 2 1 7 42394 86145 86144 42393 @@ -203147,7 +203147,7 @@ $Elements 41786 3 2 1 7 42497 86248 86247 42496 41787 3 2 1 7 42613 42614 86365 86364 41788 3 2 1 7 42375 42376 86127 86126 -41789 3 2 1 7 42628 42629 86380 86379 +41789 3 2 1 7 42629 86380 86379 42628 41790 3 2 1 7 86106 440 208 42355 41791 3 2 1 7 441 86380 42629 209 41792 3 2 1 7 86314 42563 42564 86315 @@ -203187,7 +203187,7 @@ $Elements 41826 3 2 1 7 42465 42466 86217 86216 41827 3 2 1 7 42419 86170 86169 42418 41828 3 2 1 7 42415 42416 86167 86166 -41829 3 2 1 7 42421 42422 86173 86172 +41829 3 2 1 7 42422 86173 86172 42421 41830 3 2 1 7 86168 42417 42418 86169 41831 3 2 1 7 86170 42419 42420 86171 41832 3 2 1 7 86171 42420 42421 86172 @@ -203252,7 +203252,7 @@ $Elements 41891 3 2 1 7 86375 86374 42623 42624 41892 3 2 1 7 86368 86367 42616 42617 41893 3 2 1 7 42620 42621 86372 86371 -41894 3 2 1 7 86184 42433 42434 86185 +41894 3 2 1 7 86185 86184 42433 42434 41895 3 2 1 7 86372 42621 42622 86373 41896 3 2 1 7 42466 42467 86218 86217 41897 3 2 1 7 42371 86122 86121 42370 @@ -211243,13 +211243,13 @@ $Elements 49882 3 2 4 11 108973 44016 44017 108972 49883 3 2 4 11 44048 44049 108940 108941 49884 3 2 4 11 108967 44022 44023 108966 -49885 3 2 4 11 108946 108947 44042 44043 +49885 3 2 4 11 108947 44042 44043 108946 49886 3 2 4 11 108942 108943 44046 44047 49887 3 2 4 11 44039 108950 108951 44038 49888 3 2 4 11 44049 44050 108939 108940 49889 3 2 4 11 44032 44033 108956 108957 -49890 3 2 4 11 44037 108952 108953 44036 -49891 3 2 4 11 44048 108941 108942 44047 +49890 3 2 4 11 44036 44037 108952 108953 +49891 3 2 4 11 44047 44048 108941 108942 49892 3 2 4 11 108952 44037 44038 108951 49893 3 2 4 11 44018 108971 108972 44017 49894 3 2 4 11 44028 44029 108960 108961 @@ -211336,15 +211336,15 @@ $Elements 49975 3 2 4 11 108880 108881 44108 44109 49976 3 2 4 11 44107 44108 108881 108882 49977 3 2 4 11 43969 43970 109019 109020 -49978 3 2 4 11 108899 44090 44091 108898 -49979 3 2 4 11 108893 108894 44095 44096 -49980 3 2 4 11 108889 108890 44099 44100 +49978 3 2 4 11 108898 108899 44090 44091 +49979 3 2 4 11 108894 44095 44096 108893 +49980 3 2 4 11 108890 44099 44100 108889 49981 3 2 4 11 108887 108888 44101 44102 -49982 3 2 4 11 108885 108886 44103 44104 -49983 3 2 4 11 108882 108883 44106 44107 +49982 3 2 4 11 108886 44103 44104 108885 +49983 3 2 4 11 108883 44106 44107 108882 49984 3 2 4 11 108878 108879 44110 44111 49985 3 2 4 11 108870 108871 44118 44119 -49986 3 2 4 11 108870 44119 44120 108869 +49986 3 2 4 11 108869 108870 44119 44120 49987 3 2 4 11 108867 44122 44123 108866 49988 3 2 4 11 108865 108866 44123 44124 49989 3 2 4 11 44087 44088 108901 108902 @@ -211354,7 +211354,7 @@ $Elements 49993 3 2 4 11 44091 44092 108897 108898 49994 3 2 4 11 44097 108892 108893 44096 49995 3 2 4 11 44098 44099 108890 108891 -49996 3 2 4 11 44101 108888 108889 44100 +49996 3 2 4 11 44100 44101 108888 108889 49997 3 2 4 11 44102 44103 108886 108887 49998 3 2 4 11 44106 108883 108884 44105 49999 3 2 4 11 44110 108879 108880 44109 @@ -211386,7 +211386,7 @@ $Elements 50025 3 2 4 11 44116 108873 108874 44115 50026 3 2 4 11 109047 43942 43943 109046 50027 3 2 4 11 109044 109045 43944 43945 -50028 3 2 4 11 109044 43945 43946 109043 +50028 3 2 4 11 109043 109044 43945 43946 50029 3 2 4 11 109040 109041 43948 43949 50030 3 2 4 11 109035 109036 43953 43954 50031 3 2 4 11 109032 43957 43958 109031 @@ -211431,7 +211431,7 @@ $Elements 50070 3 2 4 11 108851 108852 44137 44138 50071 3 2 4 11 109063 43926 43927 109062 50072 3 2 4 11 43928 43929 109060 109061 -50073 3 2 4 11 43931 43932 109057 109058 +50073 3 2 4 11 43932 109057 109058 43931 50074 3 2 4 11 108854 108855 44134 44135 50075 3 2 4 11 108849 108850 44139 44140 50076 3 2 4 11 44136 44137 108852 108853 @@ -211510,10 +211510,10 @@ $Elements 50149 3 2 4 11 43887 43888 109101 109102 50150 3 2 4 11 43893 109096 109097 43892 50151 3 2 4 11 43896 43897 109092 109093 -50152 3 2 4 11 43897 43898 109091 109092 +50152 3 2 4 11 43898 109091 109092 43897 50153 3 2 4 11 43902 43903 109086 109087 50154 3 2 4 11 43906 43907 109082 109083 -50155 3 2 4 11 43907 43908 109081 109082 +50155 3 2 4 11 43908 109081 109082 43907 50156 3 2 4 11 43913 109076 109077 43912 50157 3 2 4 11 43916 43917 109072 109073 50158 3 2 4 11 43918 109071 109072 43917 @@ -211542,7 +211542,7 @@ $Elements 50181 3 2 4 11 44190 44191 108798 108799 50182 3 2 4 11 43876 109113 109114 43875 50183 3 2 4 11 44191 44192 108797 108798 -50184 3 2 4 11 108796 108797 44192 44193 +50184 3 2 4 11 108797 44192 44193 108796 50185 3 2 4 11 108796 44193 44194 108795 50186 3 2 4 11 108794 108795 44194 44195 50187 3 2 4 11 108793 108794 44195 44196 @@ -211572,39 +211572,39 @@ $Elements 50211 3 2 4 11 557 214 43827 109162 50212 3 2 4 11 43828 109161 109162 43827 50213 3 2 4 11 43829 43830 109159 109160 -50214 3 2 4 11 109159 43830 43831 109158 +50214 3 2 4 11 109158 109159 43830 43831 50215 3 2 4 11 43835 109154 109155 43834 -50216 3 2 4 11 109154 43835 43836 109153 -50217 3 2 4 11 43836 43837 109152 109153 -50218 3 2 4 11 109152 43837 43838 109151 +50216 3 2 4 11 109153 109154 43835 43836 +50217 3 2 4 11 43837 109152 109153 43836 +50218 3 2 4 11 109151 109152 43837 43838 50219 3 2 4 11 43838 43839 109150 109151 -50220 3 2 4 11 109150 43839 43840 109149 +50220 3 2 4 11 109149 109150 43839 43840 50221 3 2 4 11 43841 109148 109149 43840 50222 3 2 4 11 43843 43844 109145 109146 -50223 3 2 4 11 109144 109145 43844 43845 +50223 3 2 4 11 109145 43844 43845 109144 50224 3 2 4 11 43845 43846 109143 109144 50225 3 2 4 11 109142 109143 43846 43847 50226 3 2 4 11 43849 43850 109139 109140 -50227 3 2 4 11 109139 43850 43851 109138 -50228 3 2 4 11 43854 43855 109134 109135 +50227 3 2 4 11 109138 109139 43850 43851 +50228 3 2 4 11 43855 109134 109135 43854 50229 3 2 4 11 109133 109134 43855 43856 50230 3 2 4 11 109133 43856 43857 109132 50231 3 2 4 11 109132 43857 43858 109131 50232 3 2 4 11 109128 43861 43862 109127 50233 3 2 4 11 43862 43863 109126 109127 -50234 3 2 4 11 109126 43863 43864 109125 +50234 3 2 4 11 109125 109126 43863 43864 50235 3 2 4 11 43868 109121 109122 43867 50236 3 2 4 11 109119 109120 43869 43870 50237 3 2 4 11 43871 43872 109117 109118 -50238 3 2 4 11 109117 43872 43873 109116 +50238 3 2 4 11 109116 109117 43872 43873 50239 3 2 4 11 44211 108778 108779 44210 -50240 3 2 4 11 108777 108778 44211 44212 +50240 3 2 4 11 108778 44211 44212 108777 50241 3 2 4 11 44212 44213 108776 108777 -50242 3 2 4 11 108774 108775 44214 44215 +50242 3 2 4 11 108775 44214 44215 108774 50243 3 2 4 11 44215 44216 108773 108774 50244 3 2 4 11 44217 108772 108773 44216 -50245 3 2 4 11 44220 108769 108770 44219 -50246 3 2 4 11 108768 108769 44220 44221 +50245 3 2 4 11 44219 44220 108769 108770 +50246 3 2 4 11 108769 44220 44221 108768 50247 3 2 4 11 44222 108767 108768 44221 50248 3 2 4 11 44223 108766 108767 44222 50249 3 2 4 11 44224 108765 108766 44223 @@ -211963,18 +211963,18 @@ $Elements 50602 3 2 4 11 26477 104746 104747 26478 50603 3 2 4 11 32993 107018 107019 32994 50604 3 2 4 11 54532 103721 103722 54533 -50605 3 2 4 11 54549 54548 103737 103738 -50606 3 2 4 11 54573 54572 103761 103762 -50607 3 2 4 11 54606 54605 103794 103795 -50608 3 2 4 11 54622 54621 103810 103811 +50605 3 2 4 11 54548 103737 103738 54549 +50606 3 2 4 11 54572 103761 103762 54573 +50607 3 2 4 11 54605 103794 103795 54606 +50608 3 2 4 11 54621 103810 103811 54622 50609 3 2 4 11 54540 103729 103730 54541 50610 3 2 4 11 54565 54564 103753 103754 50611 3 2 4 11 54605 54604 103793 103794 50612 3 2 4 11 54614 54613 103802 103803 50613 3 2 4 11 54637 103826 103827 54638 -50614 3 2 4 11 54646 103835 103836 54647 +50614 3 2 4 11 54647 54646 103835 103836 50615 3 2 4 11 54654 54653 103842 103843 -50616 3 2 4 11 54598 54597 103786 103787 +50616 3 2 4 11 54597 103786 103787 54598 50617 3 2 4 11 54588 103777 103778 54589 50618 3 2 4 11 54630 103819 103820 54631 50619 3 2 4 11 103746 54557 54556 103745 @@ -211990,22 +211990,22 @@ $Elements 50629 3 2 4 11 54607 54606 103795 103796 50630 3 2 4 11 54653 54652 103841 103842 50631 3 2 4 11 54541 103730 103731 54542 -50632 3 2 4 11 54572 54571 103760 103761 +50632 3 2 4 11 54571 103760 103761 54572 50633 3 2 4 11 54614 103803 103804 54615 50634 3 2 4 11 54549 103738 103739 54550 50635 3 2 4 11 54622 103811 103812 54623 50636 3 2 4 11 54563 103752 103753 54564 50637 3 2 4 11 54637 54636 103825 103826 -50638 3 2 4 11 54548 54547 103736 103737 -50639 3 2 4 11 54621 54620 103809 103810 +50638 3 2 4 11 54547 103736 103737 54548 +50639 3 2 4 11 54620 103809 103810 54621 50640 3 2 4 11 54556 54555 103744 103745 50641 3 2 4 11 54557 103746 103747 54558 50642 3 2 4 11 54565 103754 103755 54566 -50643 3 2 4 11 54629 54628 103817 103818 -50644 3 2 4 11 54639 54638 103827 103828 +50643 3 2 4 11 54628 103817 103818 54629 +50644 3 2 4 11 54638 103827 103828 54639 50645 3 2 4 11 54539 103728 103729 54540 50646 3 2 4 11 54573 103762 103763 54574 -50647 3 2 4 11 54613 54612 103801 103802 +50647 3 2 4 11 54612 103801 103802 54613 50648 3 2 4 11 103721 54532 54531 103720 50649 3 2 4 11 54581 103770 103771 54582 50650 3 2 4 11 54654 103843 103844 54655 @@ -212013,14 +212013,14 @@ $Elements 50652 3 2 4 11 103779 54590 54589 103778 50653 3 2 4 11 54524 103713 103714 54525 50654 3 2 4 11 54597 54596 103785 103786 -50655 3 2 4 11 54662 54661 103850 103851 +50655 3 2 4 11 54661 103850 103851 54662 50656 3 2 4 11 103712 103713 54524 54523 -50657 3 2 4 11 54646 54645 103834 103835 -50658 3 2 4 11 54649 54648 103837 103838 +50657 3 2 4 11 54645 103834 103835 54646 +50658 3 2 4 11 54648 103837 103838 54649 50659 3 2 4 11 54633 54632 103821 103822 -50660 3 2 4 11 54603 54602 103791 103792 +50660 3 2 4 11 54602 103791 103792 54603 50661 3 2 4 11 54665 54664 103853 103854 -50662 3 2 4 11 54587 54586 103775 103776 +50662 3 2 4 11 54586 103775 103776 54587 50663 3 2 4 11 54600 54599 103788 103789 50664 3 2 4 11 103840 103841 54652 54651 50665 3 2 4 11 103724 54535 54534 103723 @@ -212028,7 +212028,7 @@ $Elements 50667 3 2 4 11 103731 103732 54543 54542 50668 3 2 4 11 103804 103805 54616 54615 50669 3 2 4 11 54570 103759 103760 54571 -50670 3 2 4 11 54563 54562 103751 103752 +50670 3 2 4 11 54562 103751 103752 54563 50671 3 2 4 11 54636 54635 103824 103825 50672 3 2 4 11 54551 54550 103739 103740 50673 3 2 4 11 54624 54623 103812 103813 @@ -212066,23 +212066,23 @@ $Elements 50705 3 2 4 11 54530 54529 103718 103719 50706 3 2 4 11 54536 103725 103726 54537 50707 3 2 4 11 54537 103726 103727 54538 -50708 3 2 4 11 54544 54543 103732 103733 +50708 3 2 4 11 54543 103732 103733 54544 50709 3 2 4 11 54546 54545 103734 103735 -50710 3 2 4 11 54551 103740 103741 54552 +50710 3 2 4 11 54552 54551 103740 103741 50711 3 2 4 11 54561 103750 103751 54562 -50712 3 2 4 11 54568 54567 103756 103757 +50712 3 2 4 11 54567 103756 103757 54568 50713 3 2 4 11 54568 103757 103758 54569 50714 3 2 4 11 54576 54575 103764 103765 -50715 3 2 4 11 54577 54576 103765 103766 -50716 3 2 4 11 54578 54577 103766 103767 +50715 3 2 4 11 54576 103765 103766 54577 +50716 3 2 4 11 54577 103766 103767 54578 50717 3 2 4 11 54579 54578 103767 103768 -50718 3 2 4 11 54585 54584 103773 103774 -50719 3 2 4 11 54586 54585 103774 103775 +50718 3 2 4 11 54584 103773 103774 54585 +50719 3 2 4 11 54585 103774 103775 54586 50720 3 2 4 11 54591 103780 103781 54592 50721 3 2 4 11 54595 54594 103783 103784 50722 3 2 4 11 54602 54601 103790 103791 50723 3 2 4 11 54609 103798 103799 54610 -50724 3 2 4 11 54611 54610 103799 103800 +50724 3 2 4 11 54610 103799 103800 54611 50725 3 2 4 11 54616 103805 103806 54617 50726 3 2 4 11 54619 54618 103807 103808 50727 3 2 4 11 54624 103813 103814 54625 @@ -212090,8 +212090,8 @@ $Elements 50729 3 2 4 11 54641 54640 103829 103830 50730 3 2 4 11 54641 103830 103831 54642 50731 3 2 4 11 54644 54643 103832 103833 -50732 3 2 4 11 54650 54649 103838 103839 -50733 3 2 4 11 54651 54650 103839 103840 +50732 3 2 4 11 54649 103838 103839 54650 +50733 3 2 4 11 54650 103839 103840 54651 50734 3 2 4 11 54657 54656 103845 103846 50735 3 2 4 11 54658 54657 103846 103847 50736 3 2 4 11 54659 54658 103847 103848 @@ -212382,10 +212382,10 @@ $Elements 51021 3 2 4 11 105984 31959 31958 105983 51022 3 2 4 11 106006 31981 31980 106005 51023 3 2 4 11 106022 31997 31996 106021 -51024 3 2 4 11 106026 32001 32000 106025 +51024 3 2 4 11 106025 106026 32001 32000 51025 3 2 4 11 106029 32004 32003 106028 51026 3 2 4 11 106030 106031 32006 32005 -51027 3 2 4 11 106032 32007 32006 106031 +51027 3 2 4 11 106031 106032 32007 32006 51028 3 2 4 11 106032 106033 32008 32007 51029 3 2 4 11 106036 32011 32010 106035 51030 3 2 4 11 106036 106037 32012 32011 @@ -212393,7 +212393,7 @@ $Elements 51032 3 2 4 11 106039 106040 32015 32014 51033 3 2 4 11 106044 106045 32020 32019 51034 3 2 4 11 106046 106047 32022 32021 -51035 3 2 4 11 106048 32023 32022 106047 +51035 3 2 4 11 106047 106048 32023 32022 51036 3 2 4 11 106049 32024 32023 106048 51037 3 2 4 11 106050 32025 32024 106049 51038 3 2 4 11 106050 106051 32026 32025 @@ -212401,7 +212401,7 @@ $Elements 51040 3 2 4 11 106057 106058 32033 32032 51041 3 2 4 11 106070 106071 32046 32045 51042 3 2 4 11 106074 32049 32048 106073 -51043 3 2 4 11 106075 32050 32049 106074 +51043 3 2 4 11 106074 106075 32050 32049 51044 3 2 4 11 106082 106083 32058 32057 51045 3 2 4 11 106093 106094 32069 32068 51046 3 2 4 11 106104 106105 32080 32079 @@ -212459,7 +212459,7 @@ $Elements 51098 3 2 4 11 31932 31931 105956 105957 51099 3 2 4 11 31941 105966 105967 31942 51100 3 2 4 11 32269 32268 106293 106294 -51101 3 2 4 11 31925 31924 105949 105950 +51101 3 2 4 11 31924 105949 105950 31925 51102 3 2 4 11 31934 105959 105960 31935 51103 3 2 4 11 106292 106293 32268 32267 51104 3 2 4 11 32264 106289 106290 32265 @@ -212514,8 +212514,8 @@ $Elements 51153 3 2 4 11 31501 31500 105525 105526 51154 3 2 4 11 31591 31590 105615 105616 51155 3 2 4 11 31209 105234 105235 31210 -51156 3 2 4 11 31220 105245 105246 31221 -51157 3 2 4 11 31222 105247 105248 31223 +51156 3 2 4 11 31221 31220 105245 105246 +51157 3 2 4 11 31223 31222 105247 105248 51158 3 2 4 11 31225 31224 105249 105250 51159 3 2 4 11 31226 105251 105252 31227 51160 3 2 4 11 31229 105254 105255 31230 @@ -212561,7 +212561,7 @@ $Elements 51200 3 2 4 11 31565 105590 105591 31566 51201 3 2 4 11 31568 31567 105592 105593 51202 3 2 4 11 31580 105605 105606 31581 -51203 3 2 4 11 31587 31586 105611 105612 +51203 3 2 4 11 31586 105611 105612 31587 51204 3 2 4 11 31589 31588 105613 105614 51205 3 2 4 11 31593 31592 105617 105618 51206 3 2 4 11 31596 105621 105622 31597 @@ -212702,13 +212702,13 @@ $Elements 51341 3 2 4 11 105655 31630 31629 105654 51342 3 2 4 11 31204 31203 105228 105229 51343 3 2 4 11 31207 31206 105231 105232 -51344 3 2 4 11 31208 105233 105234 31209 +51344 3 2 4 11 31209 31208 105233 105234 51345 3 2 4 11 31229 31228 105253 105254 -51346 3 2 4 11 31230 105255 105256 31231 -51347 3 2 4 11 31232 105257 105258 31233 -51348 3 2 4 11 31235 105260 105261 31236 +51346 3 2 4 11 31231 31230 105255 105256 +51347 3 2 4 11 31233 31232 105257 105258 +51348 3 2 4 11 31236 31235 105260 105261 51349 3 2 4 11 31238 31237 105262 105263 -51350 3 2 4 11 31239 105264 105265 31240 +51350 3 2 4 11 31240 31239 105264 105265 51351 3 2 4 11 31241 105266 105267 31242 51352 3 2 4 11 31253 31252 105277 105278 51353 3 2 4 11 31254 105279 105280 31255 @@ -212780,7 +212780,7 @@ $Elements 51419 3 2 4 11 31553 31552 105577 105578 51420 3 2 4 11 31569 105594 105595 31570 51421 3 2 4 11 31580 31579 105604 105605 -51422 3 2 4 11 31584 31583 105608 105609 +51422 3 2 4 11 31583 105608 105609 31584 51423 3 2 4 11 31595 105620 105621 31596 51424 3 2 4 11 31609 31608 105633 105634 51425 3 2 4 11 31626 105651 105652 31627 @@ -213308,8 +213308,8 @@ $Elements 51947 3 2 4 11 44392 44393 108596 108597 51948 3 2 4 11 44432 44433 108556 108557 51949 3 2 4 11 44496 44497 108492 108493 -51950 3 2 4 11 44335 108654 108655 44334 -51951 3 2 4 11 108609 44380 44381 108608 +51950 3 2 4 11 44334 44335 108654 108655 +51951 3 2 4 11 108608 108609 44380 44381 51952 3 2 4 11 108509 108510 44479 44480 51953 3 2 4 11 108445 108446 44543 44544 51954 3 2 4 11 108422 44567 44568 108421 @@ -213337,18 +213337,18 @@ $Elements 51976 3 2 4 11 44530 108459 108460 44529 51977 3 2 4 11 44532 108457 108458 44531 51978 3 2 4 11 44544 44545 108444 108445 -51979 3 2 4 11 108619 108620 44369 44370 +51979 3 2 4 11 108620 44369 44370 108619 51980 3 2 4 11 108580 44409 44410 108579 -51981 3 2 4 11 108557 108558 44431 44432 +51981 3 2 4 11 108558 44431 44432 108557 51982 3 2 4 11 108543 44446 44447 108542 51983 3 2 4 11 108520 108521 44468 44469 51984 3 2 4 11 108480 108481 44508 44509 51985 3 2 4 11 108458 108459 44530 44531 51986 3 2 4 11 108434 108435 44554 44555 51987 3 2 4 11 108632 44357 44358 108631 -51988 3 2 4 11 44380 108609 108610 44379 +51988 3 2 4 11 44379 44380 108609 108610 51989 3 2 4 11 44394 44395 108594 108595 -51990 3 2 4 11 44422 108567 108568 44421 +51990 3 2 4 11 44421 44422 108567 108568 51991 3 2 4 11 44443 44444 108545 108546 51992 3 2 4 11 44457 108532 108533 44456 51993 3 2 4 11 44484 108505 108506 44483 @@ -213515,7 +213515,7 @@ $Elements 52154 3 2 4 11 44282 108707 108708 44281 52155 3 2 4 11 108743 108744 44245 44246 52156 3 2 4 11 44265 108724 108725 44264 -52157 3 2 4 11 44423 108566 108567 44422 +52157 3 2 4 11 44422 44423 108566 108567 52158 3 2 4 11 44254 108735 108736 44253 52159 3 2 4 11 44247 44248 108741 108742 52160 3 2 4 11 44251 44252 108737 108738 @@ -213551,9 +213551,9 @@ $Elements 52190 3 2 4 11 108601 108602 44387 44388 52191 3 2 4 11 108528 44461 44462 108527 52192 3 2 4 11 44374 108615 108616 44373 -52193 3 2 4 11 44366 108623 108624 44365 -52194 3 2 4 11 44413 108576 108577 44412 -52195 3 2 4 11 44440 108549 108550 44439 +52193 3 2 4 11 44365 44366 108623 108624 +52194 3 2 4 11 44412 44413 108576 108577 +52195 3 2 4 11 44439 44440 108549 108550 52196 3 2 4 11 44452 108537 108538 44451 52197 3 2 4 11 44466 108523 108524 44465 52198 3 2 4 11 44475 108514 108515 44474 @@ -213575,7 +213575,7 @@ $Elements 52214 3 2 4 11 44390 44391 108598 108599 52215 3 2 4 11 44402 44403 108586 108587 52216 3 2 4 11 44415 44416 108573 108574 -52217 3 2 4 11 44424 108565 108566 44423 +52217 3 2 4 11 44423 44424 108565 108566 52218 3 2 4 11 44437 44438 108551 108552 52219 3 2 4 11 44453 108536 108537 44452 52220 3 2 4 11 44462 44463 108526 108527 @@ -213668,7 +213668,7 @@ $Elements 52307 3 2 4 11 44610 44611 108378 108379 52308 3 2 4 11 44636 216 555 108353 52309 3 2 4 11 108690 44299 44300 108689 -52310 3 2 4 11 44303 108686 108687 44302 +52310 3 2 4 11 44302 44303 108686 108687 52311 3 2 4 11 108661 44328 44329 108660 52312 3 2 4 11 44498 44499 108490 108491 52313 3 2 4 11 44549 44550 108439 108440 @@ -213834,7 +213834,7 @@ $Elements 52473 3 2 4 11 110944 42045 42046 110943 52474 3 2 4 11 111079 111080 41909 41910 52475 3 2 4 11 110951 42038 42039 110950 -52476 3 2 4 11 110953 42036 42037 110952 +52476 3 2 4 11 110952 110953 42036 42037 52477 3 2 4 11 110952 42037 42038 110951 52478 3 2 4 11 41920 111069 111070 41919 52479 3 2 4 11 110953 110954 42035 42036 @@ -214140,7 +214140,7 @@ $Elements 52779 3 2 4 11 110798 42191 42192 110797 52780 3 2 4 11 110772 110773 42216 42217 52781 3 2 4 11 110771 110772 42217 42218 -52782 3 2 4 11 110770 110771 42218 42219 +52782 3 2 4 11 110771 42218 42219 110770 52783 3 2 4 11 110773 110774 42215 42216 52784 3 2 4 11 42193 110796 110797 42192 52785 3 2 4 11 42193 42194 110795 110796 @@ -214443,7 +214443,7 @@ $Elements 53082 3 2 4 11 32290 32289 106314 106315 53083 3 2 4 11 32293 106318 106319 32294 53084 3 2 4 11 32295 106320 106321 32296 -53085 3 2 4 11 32501 32500 106525 106526 +53085 3 2 4 11 32500 106525 106526 32501 53086 3 2 4 11 32501 106526 106527 32502 53087 3 2 4 11 32508 32507 106532 106533 53088 3 2 4 11 106327 32302 32301 106326 @@ -214486,7 +214486,7 @@ $Elements 53125 3 2 4 11 106329 32304 32303 106328 53126 3 2 4 11 32296 106321 106322 32297 53127 3 2 4 11 32479 106504 106505 32480 -53128 3 2 4 11 106520 32495 32494 106519 +53128 3 2 4 11 106519 106520 32495 32494 53129 3 2 4 11 32485 32484 106509 106510 53130 3 2 4 11 106506 32481 32480 106505 53131 3 2 4 11 32482 32481 106506 106507 @@ -214510,7 +214510,7 @@ $Elements 53149 3 2 4 11 106333 106334 32309 32308 53150 3 2 4 11 32375 106400 106401 32376 53151 3 2 4 11 32366 106391 106392 32367 -53152 3 2 4 11 106524 32499 32498 106523 +53152 3 2 4 11 106523 106524 32499 32498 53153 3 2 4 11 106449 32424 32423 106448 53154 3 2 4 11 32349 32348 106373 106374 53155 3 2 4 11 106343 106344 32319 32318 @@ -214559,7 +214559,7 @@ $Elements 53198 3 2 4 11 106482 106483 32458 32457 53199 3 2 4 11 106399 106400 32375 32374 53200 3 2 4 11 32470 32469 106494 106495 -53201 3 2 4 11 32471 32470 106495 106496 +53201 3 2 4 11 32470 106495 106496 32471 53202 3 2 4 11 32491 106516 106517 32492 53203 3 2 4 11 106516 32491 32490 106515 53204 3 2 4 11 106529 32504 32503 106528 @@ -214902,7 +214902,7 @@ $Elements 53541 3 2 4 11 42367 42368 110621 110622 53542 3 2 4 11 110378 110379 42610 42611 53543 3 2 4 11 110611 110612 42377 42378 -53544 3 2 4 11 110613 42376 42377 110612 +53544 3 2 4 11 110612 110613 42376 42377 53545 3 2 4 11 110379 110380 42609 42610 53546 3 2 4 11 42378 42379 110610 110611 53547 3 2 4 11 42606 42607 110382 110383 @@ -215185,7 +215185,7 @@ $Elements 53824 3 2 4 11 32829 32828 106853 106854 53825 3 2 4 11 32840 106865 106866 32841 53826 3 2 4 11 32853 106878 106879 32854 -53827 3 2 4 11 32857 32856 106881 106882 +53827 3 2 4 11 32856 106881 106882 32857 53828 3 2 4 11 32868 32867 106892 106893 53829 3 2 4 11 32871 32870 106895 106896 53830 3 2 4 11 32884 32883 106908 106909 @@ -215351,7 +215351,7 @@ $Elements 53990 3 2 4 11 32809 32808 106833 106834 53991 3 2 4 11 106832 106833 32808 32807 53992 3 2 4 11 32822 32821 106846 106847 -53993 3 2 4 11 32832 32831 106856 106857 +53993 3 2 4 11 32831 106856 106857 32832 53994 3 2 4 11 32834 32833 106858 106859 53995 3 2 4 11 106857 106858 32833 32832 53996 3 2 4 11 32838 32837 106862 106863 @@ -215444,7 +215444,7 @@ $Elements 54083 3 2 4 11 32524 106549 106550 32525 54084 3 2 4 11 32584 106609 106610 32585 54085 3 2 4 11 32901 106926 106927 32902 -54086 3 2 4 11 32645 32644 106669 106670 +54086 3 2 4 11 32644 106669 106670 32645 54087 3 2 4 11 32842 32841 106866 106867 54088 3 2 4 11 32962 32961 106986 106987 54089 3 2 4 11 32705 32704 106729 106730 @@ -215475,24 +215475,24 @@ $Elements 54114 3 2 4 11 32603 106628 106629 32604 54115 3 2 4 11 106629 106630 32605 32604 54116 3 2 4 11 106666 106667 32642 32641 -54117 3 2 4 11 32644 32643 106668 106669 +54117 3 2 4 11 32643 106668 106669 32644 54118 3 2 4 11 106695 106696 32671 32670 54119 3 2 4 11 32701 106726 106727 32702 -54120 3 2 4 11 32704 32703 106728 106729 +54120 3 2 4 11 32703 106728 106729 32704 54121 3 2 4 11 32755 106780 106781 32756 54122 3 2 4 11 106782 106783 32758 32757 54123 3 2 4 11 32759 106784 106785 32760 54124 3 2 4 11 106807 106808 32783 32782 54125 3 2 4 11 32785 32784 106809 106810 -54126 3 2 4 11 32816 32815 106840 106841 -54127 3 2 4 11 32844 32843 106868 106869 +54126 3 2 4 11 32815 106840 106841 32816 +54127 3 2 4 11 32843 106868 106869 32844 54128 3 2 4 11 106934 106935 32910 32909 54129 3 2 4 11 32911 106936 106937 32912 54130 3 2 4 11 32543 32542 106567 106568 54131 3 2 4 11 106569 106570 32545 32544 54132 3 2 4 11 32576 32575 106600 106601 54133 3 2 4 11 106628 32603 32602 106627 -54134 3 2 4 11 32643 32642 106667 106668 +54134 3 2 4 11 32642 106667 106668 32643 54135 3 2 4 11 32670 32669 106694 106695 54136 3 2 4 11 32671 106696 106697 32672 54137 3 2 4 11 32703 32702 106727 106728 @@ -215500,9 +215500,9 @@ $Elements 54139 3 2 4 11 32757 32756 106781 106782 54140 3 2 4 11 32758 106783 106784 32759 54141 3 2 4 11 32784 32783 106808 106809 -54142 3 2 4 11 32815 32814 106839 106840 +54142 3 2 4 11 32814 106839 106840 32815 54143 3 2 4 11 32817 32816 106841 106842 -54144 3 2 4 11 32843 32842 106867 106868 +54144 3 2 4 11 32842 106867 106868 32843 54145 3 2 4 11 32845 32844 106869 106870 54146 3 2 4 11 32910 106935 106936 32911 54147 3 2 4 11 32664 32663 106688 106689 @@ -215524,7 +215524,7 @@ $Elements 54163 3 2 4 11 106661 106662 32637 32636 54164 3 2 4 11 106687 106688 32663 32662 54165 3 2 4 11 106689 106690 32665 32664 -54166 3 2 4 11 32696 32695 106720 106721 +54166 3 2 4 11 32695 106720 106721 32696 54167 3 2 4 11 106719 106720 32695 32694 54168 3 2 4 11 106721 106722 32697 32696 54169 3 2 4 11 32723 32722 106747 106748 @@ -215538,7 +215538,7 @@ $Elements 54177 3 2 4 11 106842 106843 32818 32817 54178 3 2 4 11 32820 32819 106844 106845 54179 3 2 4 11 106843 106844 32819 32818 -54180 3 2 4 11 32851 32850 106875 106876 +54180 3 2 4 11 32850 106875 106876 32851 54181 3 2 4 11 106874 106875 32850 32849 54182 3 2 4 11 106876 106877 32852 32851 54183 3 2 4 11 106899 106900 32875 32874 @@ -215597,7 +215597,7 @@ $Elements 54236 3 2 4 11 32607 106632 106633 32608 54237 3 2 4 11 32639 32638 106663 106664 54238 3 2 4 11 32667 106692 106693 32668 -54239 3 2 4 11 32848 32847 106872 106873 +54239 3 2 4 11 32847 106872 106873 32848 54240 3 2 4 11 32906 106931 106932 32907 54241 3 2 4 11 106631 106632 32607 32606 54242 3 2 4 11 106664 106665 32640 32639 @@ -225187,19 +225187,19 @@ $Elements 63826 3 2 4 15 17441 17442 119718 119717 63827 3 2 4 15 119677 119676 17400 17401 63828 3 2 4 15 17414 17415 119691 119690 -63829 3 2 4 15 119703 119702 17426 17427 +63829 3 2 4 15 119702 17426 17427 119703 63830 3 2 4 15 17451 17452 119728 119727 63831 3 2 4 15 17388 119664 119663 17387 63832 3 2 4 15 119666 17390 17391 119667 -63833 3 2 4 15 17402 119678 119677 17401 +63833 3 2 4 15 17401 17402 119678 119677 63834 3 2 4 15 119689 17413 17414 119690 63835 3 2 4 15 119700 17424 17425 119701 -63836 3 2 4 15 119701 17425 17426 119702 -63837 3 2 4 15 17428 119704 119703 17427 +63836 3 2 4 15 119702 119701 17425 17426 +63837 3 2 4 15 17427 17428 119704 119703 63838 3 2 4 15 17453 119729 119728 17452 63839 3 2 4 15 17430 119706 119705 17429 63840 3 2 4 15 119651 119650 17374 17375 -63841 3 2 4 15 17402 17403 119679 119678 +63841 3 2 4 15 17403 119679 119678 17402 63842 3 2 4 15 119729 17453 17454 119730 63843 3 2 4 15 17392 119668 119667 17391 63844 3 2 4 15 119654 119653 17377 17378 @@ -225208,12 +225208,12 @@ $Elements 63847 3 2 4 15 17365 119641 119640 17364 63848 3 2 4 15 119641 17365 17366 119642 63849 3 2 4 15 119639 17363 17364 119640 -63850 3 2 4 15 17373 17374 119650 119649 +63850 3 2 4 15 17374 119650 119649 17373 63851 3 2 4 15 17424 119700 119699 17423 63852 3 2 4 15 17379 119655 119654 17378 63853 3 2 4 15 17400 119676 119675 17399 63854 3 2 4 15 17450 17451 119727 119726 -63855 3 2 4 15 119648 17372 17373 119649 +63855 3 2 4 15 119649 119648 17372 17373 63856 3 2 4 15 17410 17411 119687 119686 63857 3 2 4 15 119663 119662 17386 17387 63858 3 2 4 15 17438 119714 119713 17437 @@ -225225,8 +225225,8 @@ $Elements 63864 3 2 4 15 119735 17459 17460 119736 63865 3 2 4 15 17463 119739 119738 17462 63866 3 2 4 15 119644 17368 17369 119645 -63867 3 2 4 15 17369 17370 119646 119645 -63868 3 2 4 15 119646 17370 17371 119647 +63867 3 2 4 15 17370 119646 119645 17369 +63868 3 2 4 15 119647 119646 17370 17371 63869 3 2 4 15 119656 119655 17379 17380 63870 3 2 4 15 119658 119657 17381 17382 63871 3 2 4 15 17383 119659 119658 17382 @@ -225236,7 +225236,7 @@ $Elements 63875 3 2 4 15 17397 119673 119672 17396 63876 3 2 4 15 119674 119673 17397 17398 63877 3 2 4 15 119675 119674 17398 17399 -63878 3 2 4 15 119679 17403 17404 119680 +63878 3 2 4 15 119680 119679 17403 17404 63879 3 2 4 15 119681 17405 17406 119682 63880 3 2 4 15 119680 17404 17405 119681 63881 3 2 4 15 119684 119683 17407 17408 @@ -225247,8 +225247,8 @@ $Elements 63886 3 2 4 15 119694 17418 17419 119695 63887 3 2 4 15 17419 17420 119696 119695 63888 3 2 4 15 119697 119696 17420 17421 -63889 3 2 4 15 119698 119697 17421 17422 -63890 3 2 4 15 119699 119698 17422 17423 +63889 3 2 4 15 119697 17421 17422 119698 +63890 3 2 4 15 119698 17422 17423 119699 63891 3 2 4 15 119706 17430 17431 119707 63892 3 2 4 15 17431 17432 119708 119707 63893 3 2 4 15 17433 119709 119708 17432 @@ -225257,17 +225257,17 @@ $Elements 63896 3 2 4 15 17435 17436 119712 119711 63897 3 2 4 15 119712 17436 17437 119713 63898 3 2 4 15 17445 17446 119722 119721 -63899 3 2 4 15 17444 17445 119721 119720 +63899 3 2 4 15 17445 119721 119720 17444 63900 3 2 4 15 119722 17446 17447 119723 63901 3 2 4 15 119723 17447 17448 119724 -63902 3 2 4 15 119725 119724 17448 17449 +63902 3 2 4 15 119724 17448 17449 119725 63903 3 2 4 15 17454 17455 119731 119730 63904 3 2 4 15 17455 17456 119732 119731 63905 3 2 4 15 17457 119733 119732 17456 63906 3 2 4 15 17459 119735 119734 17458 63907 3 2 4 15 119733 17457 17458 119734 63908 3 2 4 15 17461 119737 119736 17460 -63909 3 2 4 15 119737 17461 17462 119738 +63909 3 2 4 15 119738 119737 17461 17462 63910 3 2 4 15 119647 17371 17372 119648 63911 3 2 4 15 17367 17368 119644 119643 63912 3 2 4 15 119657 119656 17380 17381 @@ -225284,17 +225284,17 @@ $Elements 63923 3 2 4 15 119540 17264 17265 119541 63924 3 2 4 15 119541 17265 17266 119542 63925 3 2 4 15 119543 17267 17268 119544 -63926 3 2 4 15 119544 17268 17269 119545 +63926 3 2 4 15 119545 119544 17268 17269 63927 3 2 4 15 119547 119546 17270 17271 63928 3 2 4 15 119548 119547 17271 17272 63929 3 2 4 15 119552 17276 17277 119553 63930 3 2 4 15 119553 17277 17278 119554 63931 3 2 4 15 119568 119567 17291 17292 -63932 3 2 4 15 119567 119566 17290 17291 +63932 3 2 4 15 119566 17290 17291 119567 63933 3 2 4 15 17308 119584 119583 17307 63934 3 2 4 15 119582 17306 17307 119583 63935 3 2 4 15 119591 119590 17314 17315 -63936 3 2 4 15 119591 17315 17316 119592 +63936 3 2 4 15 119592 119591 17315 17316 63937 3 2 4 15 17334 119610 119609 17333 63938 3 2 4 15 119610 17334 17335 119611 63939 3 2 4 15 17341 119617 119616 17340 @@ -225302,7 +225302,7 @@ $Elements 63941 3 2 4 15 119635 17359 17360 119636 63942 3 2 4 15 17361 119637 119636 17360 63943 3 2 4 15 119637 17361 17362 119638 -63944 3 2 4 15 119639 119638 17362 17363 +63944 3 2 4 15 119638 17362 17363 119639 63945 3 2 4 15 119543 119542 17266 17267 63946 3 2 4 15 119545 17269 17270 119546 63947 3 2 4 15 119561 119560 17284 17285 @@ -225343,7 +225343,7 @@ $Elements 63982 3 2 4 15 119594 119593 17317 17318 63983 3 2 4 15 119596 17320 17321 119597 63984 3 2 4 15 119595 17319 17320 119596 -63985 3 2 4 15 119597 17321 17322 119598 +63985 3 2 4 15 119598 119597 17321 17322 63986 3 2 4 15 119599 17323 17324 119600 63987 3 2 4 15 119601 17325 17326 119602 63988 3 2 4 15 119603 17327 17328 119604 @@ -225359,7 +225359,7 @@ $Elements 63998 3 2 4 15 119621 17345 17346 119622 63999 3 2 4 15 119623 119622 17346 17347 64000 3 2 4 15 119625 119624 17348 17349 -64001 3 2 4 15 17348 119624 119623 17347 +64001 3 2 4 15 17347 17348 119624 119623 64002 3 2 4 15 17351 119627 119626 17350 64003 3 2 4 15 119626 119625 17349 17350 64004 3 2 4 15 119628 119627 17351 17352 @@ -225374,7 +225374,7 @@ $Elements 64013 3 2 4 15 17303 119579 119578 17302 64014 3 2 4 15 119588 17312 17313 119589 64015 3 2 4 15 17323 119599 119598 17322 -64016 3 2 4 15 119601 119600 17324 17325 +64016 3 2 4 15 119600 17324 17325 119601 64017 3 2 4 15 119620 17344 17345 119621 64018 3 2 4 15 119739 17463 17464 119740 64019 3 2 4 15 68 601 119740 17464 @@ -228996,12 +228996,12 @@ $Elements 67635 3 2 3 16 39004 39003 124093 124094 67636 3 2 3 16 124052 38962 38961 124051 67637 3 2 3 16 124089 38999 38998 124088 -67638 3 2 3 16 38865 123955 123956 38866 +67638 3 2 3 16 38866 38865 123955 123956 67639 3 2 3 16 38861 123951 123952 38862 67640 3 2 3 16 123956 123957 38867 38866 67641 3 2 3 16 123957 123958 38868 38867 67642 3 2 3 16 38880 123970 123971 38881 -67643 3 2 3 16 123955 38865 38864 123954 +67643 3 2 3 16 123954 123955 38865 38864 67644 3 2 3 16 123944 123945 38855 38854 67645 3 2 3 16 123945 123946 38856 38855 67646 3 2 3 16 123950 123951 38861 38860 @@ -229318,7 +229318,7 @@ $Elements 67957 3 2 3 16 39651 125175 125176 39650 67958 3 2 3 16 124968 39858 39859 124967 67959 3 2 3 16 39650 125176 125177 39649 -67960 3 2 3 16 124966 124967 39859 39860 +67960 3 2 3 16 124967 39859 39860 124966 67961 3 2 3 16 39861 124965 124966 39860 67962 3 2 3 16 124964 39862 39863 124963 67963 3 2 3 16 39862 124964 124965 39861 @@ -230930,18 +230930,18 @@ $Elements 69569 3 2 3 17 22052 22051 126182 126183 69570 3 2 3 17 22083 22082 126213 126214 69571 3 2 3 17 126218 126219 22088 22087 -69572 3 2 3 17 126227 126228 22097 22096 +69572 3 2 3 17 126228 22097 22096 126227 69573 3 2 3 17 126228 126229 22098 22097 69574 3 2 3 17 22105 22104 126235 126236 -69575 3 2 3 17 22109 126240 126241 22110 +69575 3 2 3 17 22110 22109 126240 126241 69576 3 2 3 17 22115 22114 126245 126246 69577 3 2 3 17 22116 22115 126246 126247 69578 3 2 3 17 22121 126252 126253 22122 69579 3 2 3 17 126253 126254 22123 22122 69580 3 2 3 17 126259 22128 22127 126258 69581 3 2 3 17 126266 22135 22134 126265 -69582 3 2 3 17 126270 126271 22140 22139 -69583 3 2 3 17 22140 126271 126272 22141 +69582 3 2 3 17 126271 22140 22139 126270 +69583 3 2 3 17 22141 22140 126271 126272 69584 3 2 3 17 126273 126274 22143 22142 69585 3 2 3 17 22148 22147 126278 126279 69586 3 2 3 17 22153 22152 126283 126284 @@ -230953,7 +230953,7 @@ $Elements 69592 3 2 3 17 22032 22031 126162 126163 69593 3 2 3 17 126264 22133 22132 126263 69594 3 2 3 17 126193 126194 22063 22062 -69595 3 2 3 17 22102 126233 126234 22103 +69595 3 2 3 17 22103 22102 126233 126234 69596 3 2 3 17 22089 22088 126219 126220 69597 3 2 3 17 126230 126231 22100 22099 69598 3 2 3 17 22058 22057 126188 126189 @@ -230965,9 +230965,9 @@ $Elements 69604 3 2 3 17 22077 22076 126207 126208 69605 3 2 3 17 22160 22159 126290 126291 69606 3 2 3 17 22046 22045 126176 126177 -69607 3 2 3 17 126156 126157 22026 22025 +69607 3 2 3 17 126157 22026 22025 126156 69608 3 2 3 17 126217 126218 22087 22086 -69609 3 2 3 17 22057 22056 126187 126188 +69609 3 2 3 17 22056 126187 126188 22057 69610 3 2 3 17 126279 126280 22149 22148 69611 3 2 3 17 126195 126196 22065 22064 69612 3 2 3 17 22094 126225 126226 22095 @@ -230990,14 +230990,14 @@ $Elements 69629 3 2 3 17 126193 22062 22061 126192 69630 3 2 3 17 126221 22090 22089 126220 69631 3 2 3 17 126236 126237 22106 22105 -69632 3 2 3 17 126190 22059 22058 126189 +69632 3 2 3 17 126189 126190 22059 22058 69633 3 2 3 17 22042 126173 126174 22043 69634 3 2 3 17 22138 22137 126268 126269 -69635 3 2 3 17 22027 126158 126159 22028 +69635 3 2 3 17 22028 22027 126158 126159 69636 3 2 3 17 126205 22074 22073 126204 -69637 3 2 3 17 22135 126266 126267 22136 +69637 3 2 3 17 22136 22135 126266 126267 69638 3 2 3 17 126239 22108 22107 126238 -69639 3 2 3 17 126209 22078 22077 126208 +69639 3 2 3 17 126208 126209 22078 22077 69640 3 2 3 17 126177 126178 22047 22046 69641 3 2 3 17 22024 126155 126156 22025 69642 3 2 3 17 22124 126255 126256 22125 @@ -231010,7 +231010,7 @@ $Elements 69649 3 2 3 17 22085 22084 126215 126216 69650 3 2 3 17 126199 22068 22067 126198 69651 3 2 3 17 22144 22143 126274 126275 -69652 3 2 3 17 22054 22053 126184 126185 +69652 3 2 3 17 22053 126184 126185 22054 69653 3 2 3 17 22022 126153 126154 22023 69654 3 2 3 17 126282 22151 22150 126281 69655 3 2 3 17 22049 22048 126179 126180 @@ -231018,7 +231018,7 @@ $Elements 69657 3 2 3 17 126210 126211 22080 22079 69658 3 2 3 17 22120 126251 126252 22121 69659 3 2 3 17 126172 126173 22042 22041 -69660 3 2 3 17 126203 22072 22071 126202 +69660 3 2 3 17 126202 126203 22072 22071 69661 3 2 3 17 22094 22093 126224 126225 69662 3 2 3 17 126248 126249 22118 22117 69663 3 2 3 17 126257 22126 22125 126256 @@ -231033,8 +231033,8 @@ $Elements 69672 3 2 3 17 126178 126179 22048 22047 69673 3 2 3 17 126185 126186 22055 22054 69674 3 2 3 17 22060 22059 126190 126191 -69675 3 2 3 17 22061 22060 126191 126192 -69676 3 2 3 17 22067 22066 126197 126198 +69675 3 2 3 17 22060 126191 126192 22061 +69676 3 2 3 17 22066 126197 126198 22067 69677 3 2 3 17 126204 22073 22072 126203 69678 3 2 3 17 22079 22078 126209 126210 69679 3 2 3 17 22091 22090 126221 126222 @@ -231042,12 +231042,12 @@ $Elements 69681 3 2 3 17 126233 22102 22101 126232 69682 3 2 3 17 22106 126237 126238 22107 69683 3 2 3 17 22112 22111 126242 126243 -69684 3 2 3 17 22113 22112 126243 126244 +69684 3 2 3 17 22112 126243 126244 22113 69685 3 2 3 17 126249 126250 22119 22118 69686 3 2 3 17 126250 126251 22120 22119 69687 3 2 3 17 126261 126262 22131 22130 69688 3 2 3 17 22132 22131 126262 126263 -69689 3 2 3 17 126275 126276 22145 22144 +69689 3 2 3 17 126276 22145 22144 126275 69690 3 2 3 17 22156 22155 126286 126287 69691 3 2 3 17 54424 54425 126994 126995 69692 3 2 3 17 54430 126989 126990 54429 @@ -238022,7 +238022,7 @@ $Elements 76661 3 2 3 19 22610 132554 132555 22611 76662 3 2 3 19 22632 22631 132575 132576 76663 3 2 3 19 22636 132580 132581 22637 -76664 3 2 3 19 22658 132602 132603 22659 +76664 3 2 3 19 22659 22658 132602 132603 76665 3 2 3 19 22664 22663 132607 132608 76666 3 2 3 19 22669 22668 132612 132613 76667 3 2 3 19 22685 22684 132628 132629 @@ -238044,14 +238044,14 @@ $Elements 76683 3 2 3 19 22633 132577 132578 22634 76684 3 2 3 19 22639 22638 132582 132583 76685 3 2 3 19 22656 22655 132599 132600 -76686 3 2 3 19 22660 132604 132605 22661 +76686 3 2 3 19 22661 22660 132604 132605 76687 3 2 3 19 22665 132609 132610 22666 76688 3 2 3 19 22687 22686 132630 132631 76689 3 2 3 19 22692 22691 132635 132636 76690 3 2 3 19 22710 22709 132653 132654 76691 3 2 3 19 22711 132655 132656 22712 -76692 3 2 3 19 22715 22714 132658 132659 -76693 3 2 3 19 22720 22719 132663 132664 +76692 3 2 3 19 22714 132658 132659 22715 +76693 3 2 3 19 22719 132663 132664 22720 76694 3 2 3 19 22736 132680 132681 22737 76695 3 2 3 19 22742 22741 132685 132686 76696 3 2 3 19 22747 22746 132690 132691 @@ -238096,10 +238096,10 @@ $Elements 76735 3 2 3 19 22733 22732 132676 132677 76736 3 2 3 19 22760 132704 132705 22761 76737 3 2 3 19 22602 22601 132545 132546 -76738 3 2 3 19 22592 22591 132535 132536 +76738 3 2 3 19 22591 132535 132536 22592 76739 3 2 3 19 22699 22698 132642 132643 76740 3 2 3 19 132519 132520 22576 22575 -76741 3 2 3 19 22723 22722 132666 132667 +76741 3 2 3 19 22722 132666 132667 22723 76742 3 2 3 19 22704 132648 132649 22705 76743 3 2 3 19 132625 22681 22680 132624 76744 3 2 3 19 22618 22617 132561 132562 @@ -238198,7 +238198,7 @@ $Elements 76837 3 2 3 19 133672 133673 15035 15034 76838 3 2 3 19 9423 132139 132140 9422 76839 3 2 3 19 133672 15034 15033 133671 -76840 3 2 3 19 133670 133671 15033 15032 +76840 3 2 3 19 133671 15033 15032 133670 76841 3 2 3 19 133670 15032 15031 133669 76842 3 2 3 19 133668 133669 15031 15030 76843 3 2 3 19 15030 15029 133667 133668 @@ -238537,7 +238537,7 @@ $Elements 77176 3 2 3 19 133696 133697 15059 15058 77177 3 2 3 19 133691 133692 15054 15053 77178 3 2 3 19 14994 14993 133631 133632 -77179 3 2 3 19 14993 14992 133630 133631 +77179 3 2 3 19 14992 133630 133631 14993 77180 3 2 3 19 133629 133630 14992 14991 77181 3 2 3 19 133628 133629 14991 14990 77182 3 2 3 19 14989 133627 133628 14990 @@ -238700,7 +238700,7 @@ $Elements 77339 3 2 3 19 133555 14917 14916 133554 77340 3 2 3 19 133070 133071 14437 14436 77341 3 2 3 19 14915 133553 133554 14916 -77342 3 2 3 19 133071 133072 14438 14437 +77342 3 2 3 19 133072 14438 14437 133071 77343 3 2 3 19 14915 14914 133552 133553 77344 3 2 3 19 133072 133073 14439 14438 77345 3 2 3 19 133074 14440 14439 133073 @@ -238820,7 +238820,7 @@ $Elements 77459 3 2 3 19 14363 14362 132996 132997 77460 3 2 3 19 133130 133131 14497 14496 77461 3 2 3 19 133511 14873 14872 133510 -77462 3 2 3 19 133131 133132 14498 14497 +77462 3 2 3 19 133132 14498 14497 133131 77463 3 2 3 19 133509 133510 14872 14871 77464 3 2 3 19 25196 25197 134251 134252 77465 3 2 3 19 133133 14499 14498 133132 @@ -238879,7 +238879,7 @@ $Elements 77518 3 2 3 19 132395 22451 22450 132394 77519 3 2 3 19 22425 132369 132370 22426 77520 3 2 3 19 22438 132382 132383 22439 -77521 3 2 3 19 132403 22459 22458 132402 +77521 3 2 3 19 132402 132403 22459 22458 77522 3 2 3 19 132401 132402 22458 22457 77523 3 2 3 19 22433 22432 132376 132377 77524 3 2 3 19 22466 22465 132409 132410 @@ -238907,12 +238907,12 @@ $Elements 77546 3 2 3 19 22514 132458 132459 22515 77547 3 2 3 19 132339 22395 22394 132338 77548 3 2 3 19 22432 22431 132375 132376 -77549 3 2 3 19 22402 22401 132345 132346 +77549 3 2 3 19 22401 132345 132346 22402 77550 3 2 3 19 22425 22424 132368 132369 77551 3 2 3 19 22439 132383 132384 22440 77552 3 2 3 19 132428 132429 22485 22484 77553 3 2 3 19 22418 22417 132361 132362 -77554 3 2 3 19 22491 132435 132436 22492 +77554 3 2 3 19 22492 22491 132435 132436 77555 3 2 3 19 22477 22476 132420 132421 77556 3 2 3 19 22446 132390 132391 22447 77557 3 2 3 19 132353 22409 22408 132352 @@ -238924,7 +238924,7 @@ $Elements 77563 3 2 3 19 132451 132452 22508 22507 77564 3 2 3 19 132355 132356 22412 22411 77565 3 2 3 19 22498 22497 132441 132442 -77566 3 2 3 19 132334 22390 22389 132333 +77566 3 2 3 19 132333 132334 22390 22389 77567 3 2 3 19 22525 132469 132470 22526 77568 3 2 3 19 22527 22526 132470 132471 77569 3 2 3 19 22519 132463 132464 22520 @@ -238973,7 +238973,7 @@ $Elements 77612 3 2 3 19 22449 22448 132392 132393 77613 3 2 3 19 22474 132418 132419 22475 77614 3 2 3 19 132420 22476 22475 132419 -77615 3 2 3 19 132412 132413 22469 22468 +77615 3 2 3 19 132413 22469 22468 132412 77616 3 2 3 19 132423 132424 22480 22479 77617 3 2 3 19 22482 22481 132425 132426 77618 3 2 3 19 22486 132430 132431 22487 @@ -239045,7 +239045,7 @@ $Elements 77684 3 2 3 19 14846 133484 133485 14847 77685 3 2 3 19 14534 14533 133167 133168 77686 3 2 3 19 22775 22774 132718 132719 -77687 3 2 3 19 14845 133483 133484 14846 +77687 3 2 3 19 14846 14845 133483 133484 77688 3 2 3 19 14534 133168 133169 14535 77689 3 2 3 19 133430 133431 14793 14792 77690 3 2 3 19 14791 14790 133428 133429 @@ -239158,7 +239158,7 @@ $Elements 77797 3 2 3 19 14811 133449 133450 14812 77798 3 2 3 19 133440 133441 14803 14802 77799 3 2 3 19 14581 133215 133216 14582 -77800 3 2 3 19 14582 133216 133217 14583 +77800 3 2 3 19 14583 14582 133216 133217 77801 3 2 3 19 14811 268 679 133449 77802 3 2 3 19 683 110 25512 133936 77803 3 2 3 19 14584 14583 133217 133218 @@ -239176,7 +239176,7 @@ $Elements 77815 3 2 3 19 14592 133226 133227 14593 77816 3 2 3 19 22383 132327 132328 22384 77817 3 2 3 19 133443 133444 14806 14805 -77818 3 2 3 19 133227 133228 14594 14593 +77818 3 2 3 19 133228 14594 14593 133227 77819 3 2 3 19 14595 14594 133228 133229 77820 3 2 3 19 25190 25191 134257 134258 77821 3 2 3 19 14596 14595 133229 133230 @@ -239988,7 +239988,7 @@ $Elements 78627 3 2 3 20 137804 17267 17266 137805 78628 3 2 3 20 137808 137807 17264 17263 78629 3 2 3 20 17262 67 710 137809 -78630 3 2 3 20 17263 17262 137809 137808 +78630 3 2 3 20 17262 137809 137808 17263 78631 3 2 3 20 17460 17459 137612 137611 78632 3 2 3 20 17267 137804 137803 17268 78633 3 2 3 20 17461 137610 137609 17462 @@ -240007,9 +240007,9 @@ $Elements 78646 3 2 3 20 17457 17456 137615 137614 78647 3 2 3 20 17451 17450 137621 137620 78648 3 2 3 20 137799 137798 17273 17272 -78649 3 2 3 20 137616 137615 17456 17455 +78649 3 2 3 20 137615 17456 17455 137616 78650 3 2 3 20 17455 17454 137617 137616 -78651 3 2 3 20 17450 17449 137622 137621 +78651 3 2 3 20 17449 137622 137621 17450 78652 3 2 3 20 137622 17449 17448 137623 78653 3 2 3 20 137798 137797 17274 17273 78654 3 2 3 20 137623 17448 17447 137624 @@ -240020,7 +240020,7 @@ $Elements 78659 3 2 3 20 137626 17445 17444 137627 78660 3 2 3 20 137794 17277 17276 137795 78661 3 2 3 20 17443 137628 137627 17444 -78662 3 2 3 20 137794 137793 17278 17277 +78662 3 2 3 20 137793 17278 17277 137794 78663 3 2 3 20 137628 17443 17442 137629 78664 3 2 3 20 137792 17279 17278 137793 78665 3 2 3 20 137792 137791 17280 17279 @@ -240108,8 +240108,8 @@ $Elements 78747 3 2 3 20 137749 137748 17323 17322 78748 3 2 3 20 17402 137669 137668 17403 78749 3 2 3 20 17323 137748 137747 17324 -78750 3 2 3 20 137670 137669 17402 17401 -78751 3 2 3 20 137747 137746 17325 17324 +78750 3 2 3 20 137669 17402 17401 137670 +78751 3 2 3 20 137746 17325 17324 137747 78752 3 2 3 20 137670 17401 17400 137671 78753 3 2 3 20 137746 137745 17326 17325 78754 3 2 3 20 17400 17399 137672 137671 @@ -240321,7 +240321,7 @@ $Elements 78960 3 2 3 20 135824 16881 16882 135825 78961 3 2 3 20 135848 135847 16904 16905 78962 3 2 3 20 135863 16920 16921 135864 -78963 3 2 3 20 135934 16991 16992 135935 +78963 3 2 3 20 135935 135934 16991 16992 78964 3 2 3 20 16735 135678 135677 16734 78965 3 2 3 20 16804 16805 135748 135747 78966 3 2 3 20 16809 16810 135753 135752 @@ -240335,7 +240335,7 @@ $Elements 78974 3 2 3 20 16884 135827 135826 16883 78975 3 2 3 20 16902 135845 135844 16901 78976 3 2 3 20 16928 16929 135872 135871 -78977 3 2 3 20 16968 135911 135910 16967 +78977 3 2 3 20 16967 16968 135911 135910 78978 3 2 3 20 16971 16972 135915 135914 78979 3 2 3 20 16979 16980 135923 135922 78980 3 2 3 20 135686 16743 16744 135687 @@ -241064,7 +241064,7 @@ $Elements 79703 3 2 3 20 15917 15918 134861 134860 79704 3 2 3 20 134920 134919 15976 15977 79705 3 2 3 20 134912 134911 15968 15969 -79706 3 2 3 20 134918 15975 15976 134919 +79706 3 2 3 20 134919 134918 15975 15976 79707 3 2 3 20 15971 134914 134913 15970 79708 3 2 3 20 15897 15898 134841 134840 79709 3 2 3 20 134871 15928 15929 134872 @@ -241316,14 +241316,14 @@ $Elements 79955 3 2 3 20 15722 15723 134666 134665 79956 3 2 3 20 15742 15743 134686 134685 79957 3 2 3 20 134668 134667 15724 15725 -79958 3 2 3 20 15694 15695 134638 134637 +79958 3 2 3 20 15695 134638 134637 15694 79959 3 2 3 20 134663 15720 15721 134664 79960 3 2 3 20 134634 134633 15690 15691 79961 3 2 3 20 134647 15704 15705 134648 79962 3 2 3 20 15695 15696 134639 134638 79963 3 2 3 20 15744 15745 134688 134687 79964 3 2 3 20 134656 15713 15714 134657 -79965 3 2 3 20 134695 134694 15751 15752 +79965 3 2 3 20 134694 15751 15752 134695 79966 3 2 3 20 134671 134670 15727 15728 79967 3 2 3 20 134681 134680 15737 15738 79968 3 2 3 20 15747 15748 134691 134690 @@ -241392,7 +241392,7 @@ $Elements 80031 3 2 3 20 134634 15691 15692 134635 80032 3 2 3 20 134597 687 52 15654 80033 3 2 3 20 134616 15673 15674 134617 -80034 3 2 3 20 15693 15694 134637 134636 +80034 3 2 3 20 15694 134637 134636 15693 80035 3 2 3 20 134615 15672 15673 134616 80036 3 2 3 20 15685 15686 134629 134628 80037 3 2 3 20 15692 15693 134636 134635 @@ -242380,7 +242380,7 @@ $Elements 81019 3 2 3 20 135277 16334 16335 135278 81020 3 2 3 20 16390 135333 135332 16389 81021 3 2 3 20 16456 135399 135398 16455 -81022 3 2 3 20 16353 16354 135297 135296 +81022 3 2 3 20 16354 135297 135296 16353 81023 3 2 3 20 16371 135314 135313 16370 81024 3 2 3 20 16437 135380 135379 16436 81025 3 2 3 20 135283 16340 16341 135284 @@ -242478,12 +242478,12 @@ $Elements 81117 3 2 3 20 16376 16377 135320 135319 81118 3 2 3 20 16349 135292 135291 16348 81119 3 2 3 20 16376 135319 135318 16375 -81120 3 2 3 20 16335 16336 135279 135278 +81120 3 2 3 20 16336 135279 135278 16335 81121 3 2 3 20 16349 16350 135293 135292 81122 3 2 3 20 135302 16359 16360 135303 81123 3 2 3 20 16351 16352 135295 135294 81124 3 2 3 20 16385 16386 135329 135328 -81125 3 2 3 20 16358 16359 135302 135301 +81125 3 2 3 20 16359 135302 135301 16358 81126 3 2 3 20 135280 135279 16336 16337 81127 3 2 3 20 16410 16411 135354 135353 81128 3 2 3 20 16362 16363 135306 135305 @@ -251448,13 +251448,13 @@ $Elements 90087 3 2 2 27 21109 21110 145116 145115 90088 3 2 2 27 145163 145162 21156 21157 90089 3 2 2 27 145167 145166 21160 21161 -90090 3 2 2 27 21136 21137 145143 145142 +90090 3 2 2 27 21137 145143 145142 21136 90091 3 2 2 27 145119 21113 21114 145120 90092 3 2 2 27 21090 145096 145095 21089 90093 3 2 2 27 20999 21000 145006 145005 90094 3 2 2 27 21087 145093 145092 21086 90095 3 2 2 27 21116 21117 145123 145122 -90096 3 2 2 27 145139 21133 21134 145140 +90096 3 2 2 27 145140 145139 21133 21134 90097 3 2 2 27 21153 21154 145160 145159 90098 3 2 2 27 145113 145112 21106 21107 90099 3 2 2 27 145149 21143 21144 145150 @@ -251496,14 +251496,14 @@ $Elements 90135 3 2 2 27 145166 145165 21159 21160 90136 3 2 2 27 145021 21015 21016 145022 90137 3 2 2 27 21019 21020 145026 145025 -90138 3 2 2 27 21050 21051 145057 145056 +90138 3 2 2 27 21051 145057 145056 21050 90139 3 2 2 27 145028 21022 21023 145029 90140 3 2 2 27 145037 21031 21032 145038 90141 3 2 2 27 145040 21034 21035 145041 90142 3 2 2 27 145069 21063 21064 145070 90143 3 2 2 27 145088 21082 21083 145089 90144 3 2 2 27 145110 21104 21105 145111 -90145 3 2 2 27 145091 21085 21086 145092 +90145 3 2 2 27 145092 145091 21085 21086 90146 3 2 2 27 21016 21017 145023 145022 90147 3 2 2 27 21100 145106 145105 21099 90148 3 2 2 27 21131 145137 145136 21130 @@ -251557,7 +251557,7 @@ $Elements 90196 3 2 2 27 21126 21127 145133 145132 90197 3 2 2 27 145175 21169 87 780 90198 3 2 2 27 145024 145023 21017 21018 -90199 3 2 2 27 145035 145034 21028 21029 +90199 3 2 2 27 145034 21028 21029 145035 90200 3 2 2 27 145078 21072 21073 145079 90201 3 2 2 27 145125 145124 21118 21119 90202 3 2 2 27 145137 21131 21132 145138 @@ -251581,15 +251581,15 @@ $Elements 90220 3 2 2 27 39278 39277 145528 145527 90221 3 2 2 27 145002 20996 20997 145003 90222 3 2 2 27 20993 20994 145000 144999 -90223 3 2 2 27 20988 20989 144995 144994 +90223 3 2 2 27 20989 144995 144994 20988 90224 3 2 2 27 20985 20986 144992 144991 90225 3 2 2 27 20981 144987 144986 20980 90226 3 2 2 27 20977 20978 144984 144983 90227 3 2 2 27 20972 20973 144979 144978 -90228 3 2 2 27 20972 144978 144977 20971 +90228 3 2 2 27 20971 20972 144978 144977 90229 3 2 2 27 20976 20977 144983 144982 90230 3 2 2 27 20980 144986 144985 20979 -90231 3 2 2 27 20985 144991 144990 20984 +90231 3 2 2 27 20984 20985 144991 144990 90232 3 2 2 27 144898 144897 20891 20892 90233 3 2 2 27 144994 144993 20987 20988 90234 3 2 2 27 20890 20891 144897 144896 @@ -251650,10 +251650,10 @@ $Elements 90289 3 2 2 27 20870 144876 778 85 90290 3 2 2 27 20877 144883 144882 20876 90291 3 2 2 27 20882 144888 144887 20881 -90292 3 2 2 27 144892 20886 20887 144893 +90292 3 2 2 27 144893 144892 20886 20887 90293 3 2 2 27 20889 144895 144894 20888 90294 3 2 2 27 20873 144879 144878 20872 -90295 3 2 2 27 20875 20876 144882 144881 +90295 3 2 2 27 20876 144882 144881 20875 90296 3 2 2 27 144890 20884 20885 144891 90297 3 2 2 27 144895 20889 20890 144896 90298 3 2 2 27 20903 144909 144908 20902 @@ -251665,12 +251665,12 @@ $Elements 90304 3 2 2 27 20883 144889 144888 20882 90305 3 2 2 27 20883 20884 144890 144889 90306 3 2 2 27 20872 144878 144877 20871 -90307 3 2 2 27 20971 144977 144976 20970 +90307 3 2 2 27 20970 20971 144977 144976 90308 3 2 2 27 144912 20906 20907 144913 90309 3 2 2 27 20961 20962 144968 144967 90310 3 2 2 27 20897 144903 144902 20896 90311 3 2 2 27 20957 20958 144964 144963 -90312 3 2 2 27 20975 20976 144982 144981 +90312 3 2 2 27 20976 144982 144981 20975 90313 3 2 2 27 20892 20893 144899 144898 90314 3 2 2 27 20911 144917 144916 20910 90315 3 2 2 27 144920 20914 20915 144921 @@ -251691,7 +251691,7 @@ $Elements 90330 3 2 2 27 20998 86 779 145004 90331 3 2 2 27 20894 144900 144899 20893 90332 3 2 2 27 144904 144903 20897 20898 -90333 3 2 2 27 144916 144915 20909 20910 +90333 3 2 2 27 144915 20909 20910 144916 90334 3 2 2 27 144920 144919 20913 20914 90335 3 2 2 27 144924 144923 20917 20918 90336 3 2 2 27 144936 144935 20929 20930 @@ -254510,7 +254510,7 @@ $Elements 93149 3 2 2 28 8553 147587 147588 8554 93150 3 2 2 28 8553 8552 147586 147587 93151 3 2 2 28 8543 8542 147576 147577 -93152 3 2 2 28 147565 147566 8532 8531 +93152 3 2 2 28 147566 8532 8531 147565 93153 3 2 2 28 147583 8549 8548 147582 93154 3 2 2 28 8533 147567 147568 8534 93155 3 2 2 28 8546 147580 147581 8547 @@ -254532,13 +254532,13 @@ $Elements 93171 3 2 2 28 147528 147529 8495 8494 93172 3 2 2 28 147535 147536 8502 8501 93173 3 2 2 28 147539 147540 8506 8505 -93174 3 2 2 28 147543 8509 8508 147542 +93174 3 2 2 28 147542 147543 8509 8508 93175 3 2 2 28 147547 147548 8514 8513 93176 3 2 2 28 147553 147554 8520 8519 93177 3 2 2 28 147564 8530 8529 147563 93178 3 2 2 28 147566 147567 8533 8532 93179 3 2 2 28 147570 147571 8537 8536 -93180 3 2 2 28 147577 147578 8544 8543 +93180 3 2 2 28 147578 8544 8543 147577 93181 3 2 2 28 147579 8545 8544 147578 93182 3 2 2 28 147582 8548 8547 147581 93183 3 2 2 28 147584 147585 8551 8550 @@ -254655,12 +254655,12 @@ $Elements 93294 3 2 2 28 147530 147531 8497 8496 93295 3 2 2 28 8614 8613 147647 147648 93296 3 2 2 28 147515 147516 8482 8481 -93297 3 2 2 28 147572 147573 8539 8538 +93297 3 2 2 28 147573 8539 8538 147572 93298 3 2 2 28 147518 8484 8483 147517 93299 3 2 2 28 8527 8526 147560 147561 93300 3 2 2 28 147559 147560 8526 8525 93301 3 2 2 28 147516 147517 8483 8482 -93302 3 2 2 28 147573 147574 8540 8539 +93302 3 2 2 28 147574 8540 8539 147573 93303 3 2 2 28 8624 147658 147659 8625 93304 3 2 2 28 149198 149199 15894 15895 93305 3 2 2 28 15893 15894 149199 149200 @@ -254840,7 +254840,7 @@ $Elements 93479 3 2 2 28 146405 7371 7370 146404 93480 3 2 2 28 146323 146324 7290 7289 93481 3 2 2 28 146337 146338 7304 7303 -93482 3 2 2 28 146355 7321 7320 146354 +93482 3 2 2 28 146354 146355 7321 7320 93483 3 2 2 28 146357 146358 7324 7323 93484 3 2 2 28 146377 146378 7344 7343 93485 3 2 2 28 146405 146406 7372 7371 @@ -254927,7 +254927,7 @@ $Elements 93566 3 2 2 28 7319 7318 146352 146353 93567 3 2 2 28 7379 146413 146414 7380 93568 3 2 2 28 7297 146331 146332 7298 -93569 3 2 2 28 7316 7315 146349 146350 +93569 3 2 2 28 7315 146349 146350 7316 93570 3 2 2 28 146330 7296 7295 146329 93571 3 2 2 28 7316 146350 146351 7317 93572 3 2 2 28 146362 7328 7327 146361 @@ -255360,7 +255360,7 @@ $Elements 93999 3 2 2 28 148749 148750 16343 16344 94000 3 2 2 28 16338 148755 148756 16337 94001 3 2 2 28 16337 148756 148757 16336 -94002 3 2 2 28 148759 16334 16335 148758 +94002 3 2 2 28 148758 148759 16334 16335 94003 3 2 2 28 16336 148757 148758 16335 94004 3 2 2 28 16330 148763 808 58 94005 3 2 2 28 148760 16333 16334 148759 @@ -255451,7 +255451,7 @@ $Elements 94090 3 2 2 28 16569 148524 148525 16568 94091 3 2 2 28 148543 16550 16551 148542 94092 3 2 2 28 148532 16561 16562 148531 -94093 3 2 2 28 148537 148538 16555 16556 +94093 3 2 2 28 148538 16555 16556 148537 94094 3 2 2 28 16602 148491 148492 16601 94095 3 2 2 28 16553 148540 148541 16552 94096 3 2 2 28 16556 16557 148536 148537 @@ -255468,7 +255468,7 @@ $Elements 94107 3 2 2 28 148540 16553 16554 148539 94108 3 2 2 28 16604 148489 148490 16603 94109 3 2 2 28 16557 16558 148535 148536 -94110 3 2 2 28 148546 16547 16548 148545 +94110 3 2 2 28 148545 148546 16547 16548 94111 3 2 2 28 16584 148509 148510 16583 94112 3 2 2 28 148506 16587 16588 148505 94113 3 2 2 28 148502 148503 16590 16591 @@ -259270,7 +259270,7 @@ $Elements 97909 3 2 2 30 11427 11426 152990 152991 97910 3 2 2 30 11260 152824 152825 11261 97911 3 2 2 30 11382 11381 152945 152946 -97912 3 2 2 30 11325 11324 152888 152889 +97912 3 2 2 30 11324 152888 152889 11325 97913 3 2 2 30 11432 152996 152997 11433 97914 3 2 2 30 152955 11391 11390 152954 97915 3 2 2 30 11467 11466 153030 153031 @@ -259330,7 +259330,7 @@ $Elements 97969 3 2 2 30 11275 11274 152838 152839 97970 3 2 2 30 11275 152839 152840 11276 97971 3 2 2 30 11277 11276 152840 152841 -97972 3 2 2 30 11283 11282 152846 152847 +97972 3 2 2 30 11282 152846 152847 11283 97973 3 2 2 30 11292 11291 152855 152856 97974 3 2 2 30 11293 11292 152856 152857 97975 3 2 2 30 11293 152857 152858 11294 @@ -259396,7 +259396,7 @@ $Elements 98035 3 2 2 30 11291 11290 152854 152855 98036 3 2 2 30 11295 11294 152858 152859 98037 3 2 2 30 11277 152841 152842 11278 -98038 3 2 2 30 11308 11307 152871 152872 +98038 3 2 2 30 11307 152871 152872 11308 98039 3 2 2 30 11399 11398 152962 152963 98040 3 2 2 30 152809 152810 11246 11245 98041 3 2 2 30 152903 152904 11340 11339 @@ -259408,7 +259408,7 @@ $Elements 98047 3 2 2 30 11333 11332 152896 152897 98048 3 2 2 30 11374 11373 152937 152938 98049 3 2 2 30 153003 11439 11438 153002 -98050 3 2 2 30 11318 11317 152881 152882 +98050 3 2 2 30 11317 152881 152882 11318 98051 3 2 2 30 11268 11267 152831 152832 98052 3 2 2 30 152849 11285 11284 152848 98053 3 2 2 30 152864 152865 11301 11300 @@ -259417,17 +259417,17 @@ $Elements 98056 3 2 2 30 11267 11266 152830 152831 98057 3 2 2 30 11318 152882 152883 11319 98058 3 2 2 30 11241 11240 152804 152805 -98059 3 2 2 30 152837 11273 11272 152836 -98060 3 2 2 30 152854 11290 11289 152853 +98059 3 2 2 30 152836 152837 11273 11272 +98060 3 2 2 30 152853 152854 11290 11289 98061 3 2 2 30 11307 11306 152870 152871 -98062 3 2 2 30 152903 11339 11338 152902 +98062 3 2 2 30 152902 152903 11339 11338 98063 3 2 2 30 152920 11356 11355 152919 98064 3 2 2 30 152842 152843 11279 11278 98065 3 2 2 30 152909 11345 11344 152908 98066 3 2 2 30 152925 152926 11362 11361 98067 3 2 2 30 153037 838 27 11473 98068 3 2 2 30 11246 152810 152811 11247 -98069 3 2 2 30 11296 11295 152859 152860 +98069 3 2 2 30 11295 152859 152860 11296 98070 3 2 2 30 11312 152876 152877 11313 98071 3 2 2 30 11333 152897 152898 11334 98072 3 2 2 30 11351 11350 152914 152915 @@ -259737,7 +259737,7 @@ $Elements 98376 3 2 2 30 155728 23697 23698 155727 98377 3 2 2 30 155727 23698 23699 155726 98378 3 2 2 30 23675 23676 155749 155750 -98379 3 2 2 30 155726 23699 23700 155725 +98379 3 2 2 30 155725 155726 23699 23700 98380 3 2 2 30 23885 23886 155539 155540 98381 3 2 2 30 155762 23663 23664 155761 98382 3 2 2 30 155750 155751 23674 23675 @@ -260172,7 +260172,7 @@ $Elements 98811 3 2 2 30 23190 156235 156236 23189 98812 3 2 2 30 154217 12653 12652 154216 98813 3 2 2 30 11766 11765 153329 153330 -98814 3 2 2 30 153295 153296 11732 11731 +98814 3 2 2 30 153296 11732 11731 153295 98815 3 2 2 30 11800 11799 153363 153364 98816 3 2 2 30 153302 153303 11739 11738 98817 3 2 2 30 11773 11772 153336 153337 @@ -260228,7 +260228,7 @@ $Elements 98867 3 2 2 30 11737 11736 153300 153301 98868 3 2 2 30 11729 11728 153292 153293 98869 3 2 2 30 11733 153297 153298 11734 -98870 3 2 2 30 11735 11734 153298 153299 +98870 3 2 2 30 11734 153298 153299 11735 98871 3 2 2 30 11740 153304 153305 11741 98872 3 2 2 30 11746 153310 153311 11747 98873 3 2 2 30 11754 11753 153317 153318 @@ -260473,7 +260473,7 @@ $Elements 99112 3 2 2 30 152720 152721 11157 11156 99113 3 2 2 30 10958 10957 152521 152522 99114 3 2 2 30 11187 11186 152750 152751 -99115 3 2 2 30 11174 152738 152739 11175 +99115 3 2 2 30 11175 11174 152738 152739 99116 3 2 2 30 11155 152719 152720 11156 99117 3 2 2 30 152717 152718 11154 11153 99118 3 2 2 30 152718 152719 11155 11154 @@ -260682,7 +260682,7 @@ $Elements 99321 3 2 2 30 156200 156201 23224 23225 99322 3 2 2 30 156214 156215 23210 23211 99323 3 2 2 30 156202 156203 23222 23223 -99324 3 2 2 30 156218 156219 23206 23207 +99324 3 2 2 30 156219 23206 23207 156218 99325 3 2 2 30 156201 156202 23223 23224 99326 3 2 2 30 156198 156199 23226 23227 99327 3 2 2 30 156208 156209 23216 23217 @@ -260723,7 +260723,7 @@ $Elements 99362 3 2 2 30 155836 155837 23588 23589 99363 3 2 2 30 155835 155836 23589 23590 99364 3 2 2 30 155835 23590 23591 155834 -99365 3 2 2 30 155833 155834 23591 23592 +99365 3 2 2 30 155834 23591 23592 155833 99366 3 2 2 30 155832 23593 23594 155831 99367 3 2 2 30 155829 23596 23597 155828 99368 3 2 2 30 23594 23595 155830 155831 @@ -260740,7 +260740,7 @@ $Elements 99379 3 2 2 30 155822 23603 23604 155821 99380 3 2 2 30 155821 23604 23605 155820 99381 3 2 2 30 155819 155820 23605 23606 -99382 3 2 2 30 155817 155818 23607 23608 +99382 3 2 2 30 155818 23607 23608 155817 99383 3 2 2 30 155816 155817 23608 23609 99384 3 2 2 30 23606 23607 155818 155819 99385 3 2 2 30 23609 23610 155815 155816 @@ -260840,13 +260840,13 @@ $Elements 99479 3 2 2 30 155879 155880 23545 23546 99480 3 2 2 30 155882 155883 23542 23543 99481 3 2 2 30 23527 155898 155899 23526 -99482 3 2 2 30 155882 23543 23544 155881 +99482 3 2 2 30 155881 155882 23543 23544 99483 3 2 2 30 155880 155881 23544 23545 99484 3 2 2 30 23568 23569 155856 155857 99485 3 2 2 30 155905 155906 23519 23520 99486 3 2 2 30 23563 23564 155861 155862 99487 3 2 2 30 155863 155864 23561 23562 -99488 3 2 2 30 155862 155863 23562 23563 +99488 3 2 2 30 155863 23562 23563 155862 99489 3 2 2 30 155861 23564 23565 155860 99490 3 2 2 30 155858 155859 23566 23567 99491 3 2 2 30 155877 155878 23547 23548 @@ -260905,7 +260905,7 @@ $Elements 99544 3 2 2 30 156095 156096 23329 23330 99545 3 2 2 30 23310 23311 156114 156115 99546 3 2 2 30 156115 156116 23309 23310 -99547 3 2 2 30 156114 23311 23312 156113 +99547 3 2 2 30 156113 156114 23311 23312 99548 3 2 2 30 156112 156113 23312 23313 99549 3 2 2 30 23314 156111 156112 23313 99550 3 2 2 30 23315 156110 156111 23314 @@ -260953,13 +260953,13 @@ $Elements 99592 3 2 2 30 23506 155919 155920 23505 99593 3 2 2 30 155928 23497 23498 155927 99594 3 2 2 30 155923 23502 23503 155922 -99595 3 2 2 30 155922 23503 23504 155921 +99595 3 2 2 30 155921 155922 23503 23504 99596 3 2 2 30 156087 156088 23337 23338 -99597 3 2 2 30 156083 23342 23343 156082 +99597 3 2 2 30 156082 156083 23342 23343 99598 3 2 2 30 156080 156081 23344 23345 99599 3 2 2 30 23343 23344 156081 156082 99600 3 2 2 30 156061 156062 23363 23364 -99601 3 2 2 30 23364 23365 156060 156061 +99601 3 2 2 30 23365 156060 156061 23364 99602 3 2 2 30 156083 156084 23341 23342 99603 3 2 2 30 156060 23365 23366 156059 99604 3 2 2 30 156062 156063 23362 23363 @@ -261161,7 +261161,7 @@ $Elements 99800 3 2 2 30 23948 155477 155478 23947 99801 3 2 2 30 24166 24167 155258 155259 99802 3 2 2 30 24111 155314 155315 24110 -99803 3 2 2 30 23970 23971 155454 155455 +99803 3 2 2 30 23971 155454 155455 23970 99804 3 2 2 30 23975 23976 155449 155450 99805 3 2 2 30 23986 155439 155440 23985 99806 3 2 2 30 23992 23993 155432 155433 @@ -261178,7 +261178,7 @@ $Elements 99817 3 2 2 30 24100 155325 155326 24099 99818 3 2 2 30 24115 24116 155309 155310 99819 3 2 2 30 24128 24129 155296 155297 -99820 3 2 2 30 24143 24144 155281 155282 +99820 3 2 2 30 24144 155281 155282 24143 99821 3 2 2 30 23949 23950 155475 155476 99822 3 2 2 30 23972 23973 155452 155453 99823 3 2 2 30 23977 23978 155447 155448 @@ -261253,14 +261253,14 @@ $Elements 99892 3 2 2 30 155420 155421 24004 24005 99893 3 2 2 30 155400 155401 24024 24025 99894 3 2 2 30 155336 24089 24090 155335 -99895 3 2 2 30 23996 23997 155428 155429 +99895 3 2 2 30 23997 155428 155429 23996 99896 3 2 2 30 155418 155419 24006 24007 99897 3 2 2 30 155332 24093 24094 155331 99898 3 2 2 30 155318 24107 24108 155317 99899 3 2 2 30 155293 155294 24131 24132 99900 3 2 2 30 155279 155280 24145 24146 99901 3 2 2 30 23978 23979 155446 155447 -99902 3 2 2 30 24117 24118 155307 155308 +99902 3 2 2 30 24118 155307 155308 24117 99903 3 2 2 30 155457 23968 23969 155456 99904 3 2 2 30 155442 155443 23982 23983 99905 3 2 2 30 155404 155405 24020 24021 @@ -261968,8 +261968,8 @@ $Elements 100607 3 2 2 30 24378 155047 155048 24377 100608 3 2 2 30 24363 24364 155061 155062 100609 3 2 2 30 24364 24365 155060 155061 -100610 3 2 2 30 24366 155059 155060 24365 -100611 3 2 2 30 24376 155049 155050 24375 +100610 3 2 2 30 24365 24366 155059 155060 +100611 3 2 2 30 24375 24376 155049 155050 100612 3 2 2 30 24376 24377 155048 155049 100613 3 2 2 30 24380 155045 155046 24379 100614 3 2 2 30 24380 24381 155044 155045 @@ -262015,14 +262015,14 @@ $Elements 100654 3 2 2 30 24630 154795 154796 24629 100655 3 2 2 30 155016 24409 24410 155015 100656 3 2 2 30 24405 155020 155021 24404 -100657 3 2 2 30 24599 24600 154825 154826 +100657 3 2 2 30 24600 154825 154826 24599 100658 3 2 2 30 24389 24390 155035 155036 100659 3 2 2 30 24594 24595 154830 154831 100660 3 2 2 30 155007 24418 24419 155006 100661 3 2 2 30 154840 24585 24586 154839 100662 3 2 2 30 155026 155027 24398 24399 100663 3 2 2 30 155022 155023 24402 24403 -100664 3 2 2 30 154824 24601 24602 154823 +100664 3 2 2 30 154823 154824 24601 24602 100665 3 2 2 30 154820 24605 24606 154819 100666 3 2 2 30 24397 24398 155027 155028 100667 3 2 2 30 24383 24384 155041 155042 @@ -262057,14 +262057,14 @@ $Elements 100696 3 2 2 30 155041 24384 24385 155040 100697 3 2 2 30 154806 24619 24620 154805 100698 3 2 2 30 24370 155055 155056 24369 -100699 3 2 2 30 24634 24635 154790 154791 +100699 3 2 2 30 24635 154790 154791 24634 100700 3 2 2 30 155011 155012 24413 24414 100701 3 2 2 30 154837 24588 24589 154836 100702 3 2 2 30 24416 155009 155010 24415 100703 3 2 2 30 24591 24592 154833 154834 100704 3 2 2 30 24414 24415 155010 155011 100705 3 2 2 30 24417 155008 155009 24416 -100706 3 2 2 30 24589 24590 154835 154836 +100706 3 2 2 30 24590 154835 154836 24589 100707 3 2 2 30 24590 24591 154834 154835 100708 3 2 2 30 24603 154822 154823 24602 100709 3 2 2 30 24402 155023 155024 24401 @@ -262282,23 +262282,23 @@ $Elements 100921 3 2 2 30 12591 12590 154154 154155 100922 3 2 2 30 12516 12515 154079 154080 100923 3 2 2 30 12480 12479 154043 154044 -100924 3 2 2 30 12626 154190 154191 12627 +100924 3 2 2 30 12627 12626 154190 154191 100925 3 2 2 30 154042 154043 12479 12478 -100926 3 2 2 30 12517 154081 154082 12518 -100927 3 2 2 30 12627 154191 154192 12628 +100926 3 2 2 30 12518 12517 154081 154082 +100927 3 2 2 30 12628 12627 154191 154192 100928 3 2 2 30 12589 12588 154152 154153 100929 3 2 2 30 154081 12517 12516 154080 100930 3 2 2 30 12518 154082 154083 12519 100931 3 2 2 30 12589 154153 154154 12590 100932 3 2 2 30 12592 154156 154157 12593 -100933 3 2 2 30 12587 154151 154152 12588 +100933 3 2 2 30 12588 12587 154151 154152 100934 3 2 2 30 12515 12514 154078 154079 100935 3 2 2 30 12520 154084 154085 12521 100936 3 2 2 30 154047 154048 12484 12483 -100937 3 2 2 30 12622 154186 154187 12623 +100937 3 2 2 30 12623 12622 154186 154187 100938 3 2 2 30 12478 12477 154041 154042 100939 3 2 2 30 154192 154193 12629 12628 -100940 3 2 2 30 154120 154121 12557 12556 +100940 3 2 2 30 154121 12557 12556 154120 100941 3 2 2 30 154113 154114 12550 12549 100942 3 2 2 30 154158 12594 12593 154157 100943 3 2 2 30 154150 154151 12587 12586 @@ -262307,7 +262307,7 @@ $Elements 100946 3 2 2 30 154041 12477 12476 154040 100947 3 2 2 30 12629 154193 154194 12630 100948 3 2 2 30 154048 154049 12485 12484 -100949 3 2 2 30 12621 154185 154186 12622 +100949 3 2 2 30 12622 12621 154185 154186 100950 3 2 2 30 154113 12549 12548 154112 100951 3 2 2 30 154121 154122 12558 12557 100952 3 2 2 30 12586 12585 154149 154150 @@ -262315,14 +262315,14 @@ $Elements 100954 3 2 2 30 154133 154134 12570 12569 100955 3 2 2 30 12529 154093 154094 12530 100956 3 2 2 30 154124 154125 12561 12560 -100957 3 2 2 30 12537 154101 154102 12538 -100958 3 2 2 30 12568 154132 154133 12569 +100957 3 2 2 30 12538 12537 154101 154102 +100958 3 2 2 30 12569 12568 154132 154133 100959 3 2 2 30 12546 12545 154109 154110 100960 3 2 2 30 12577 12576 154140 154141 100961 3 2 2 30 12538 154102 154103 12539 100962 3 2 2 30 12567 154131 154132 12568 -100963 3 2 2 30 154158 154159 12595 12594 -100964 3 2 2 30 154108 154109 12545 12544 +100963 3 2 2 30 154159 12595 12594 154158 +100964 3 2 2 30 154109 12545 12544 154108 100965 3 2 2 30 154125 154126 12562 12561 100966 3 2 2 30 12535 154099 154100 12536 100967 3 2 2 30 12571 12570 154134 154135 @@ -262348,8 +262348,8 @@ $Elements 100987 3 2 2 30 12572 154136 154137 12573 100988 3 2 2 30 12533 12532 154096 154097 100989 3 2 2 30 12533 154097 154098 12534 -100990 3 2 2 30 12541 154105 154106 12542 -100991 3 2 2 30 12542 154106 154107 12543 +100990 3 2 2 30 12542 12541 154105 154106 +100991 3 2 2 30 12543 12542 154106 154107 100992 3 2 2 30 12563 154127 154128 12564 100993 3 2 2 30 12565 12564 154128 154129 100994 3 2 2 30 154092 12528 12527 154091 @@ -262357,13 +262357,13 @@ $Elements 100996 3 2 2 30 12465 154029 154030 12466 100997 3 2 2 30 154172 12608 12607 154171 100998 3 2 2 30 154030 154031 12467 12466 -100999 3 2 2 30 154053 154054 12490 12489 +100999 3 2 2 30 154054 12490 12489 154053 101000 3 2 2 30 154062 12498 12497 154061 101001 3 2 2 30 154070 12506 12505 154069 -101002 3 2 2 30 12512 154076 154077 12513 +101002 3 2 2 30 12513 12512 154076 154077 101003 3 2 2 30 12523 12522 154086 154087 -101004 3 2 2 30 12583 154147 154148 12584 -101005 3 2 2 30 12600 154164 154165 12601 +101004 3 2 2 30 12584 12583 154147 154148 +101005 3 2 2 30 12601 12600 154164 154165 101006 3 2 2 30 12608 154172 154173 12609 101007 3 2 2 30 12617 12616 154180 154181 101008 3 2 2 30 12640 12639 154203 154204 @@ -262375,14 +262375,14 @@ $Elements 101014 3 2 2 30 12610 12609 154173 154174 101015 3 2 2 30 12632 12631 154195 154196 101016 3 2 2 30 12468 12467 154031 154032 -101017 3 2 2 30 154196 154197 12633 12632 +101017 3 2 2 30 154197 12633 12632 154196 101018 3 2 2 30 12639 12638 154202 154203 101019 3 2 2 30 12473 154037 154038 12474 -101020 3 2 2 30 154054 154055 12491 12490 +101020 3 2 2 30 154055 12491 12490 154054 101021 3 2 2 30 154068 154069 12505 12504 101022 3 2 2 30 12511 154075 154076 12512 -101023 3 2 2 30 12601 154165 154166 12602 -101024 3 2 2 30 12615 154179 154180 12616 +101023 3 2 2 30 12602 12601 154165 154166 +101024 3 2 2 30 12616 12615 154179 154180 101025 3 2 2 30 12641 154205 154206 12642 101026 3 2 2 30 154033 12469 12468 154032 101027 3 2 2 30 154036 154037 12473 12472 @@ -262396,7 +262396,7 @@ $Elements 101035 3 2 2 30 154029 12465 12464 154028 101036 3 2 2 30 12580 12579 154143 154144 101037 3 2 2 30 154040 12476 12475 154039 -101038 3 2 2 30 154052 154053 12489 12488 +101038 3 2 2 30 154053 12489 12488 154052 101039 3 2 2 30 154055 154056 12492 12491 101040 3 2 2 30 154060 12496 12495 154059 101041 3 2 2 30 154064 12500 12499 154063 @@ -262405,17 +262405,17 @@ $Elements 101044 3 2 2 30 12617 154181 154182 12618 101045 3 2 2 30 12630 154194 154195 12631 101046 3 2 2 30 154091 12527 12526 154090 -101047 3 2 2 30 154067 154068 12504 12503 +101047 3 2 2 30 154068 12504 12503 154067 101048 3 2 2 30 154206 154207 12643 12642 101049 3 2 2 30 154052 12488 12487 154051 101050 3 2 2 30 154028 12464 12463 154027 101051 3 2 2 30 154065 12501 12500 154064 101052 3 2 2 30 154072 12508 12507 154071 101053 3 2 2 30 12511 12510 154074 154075 -101054 3 2 2 30 12524 154088 154089 12525 +101054 3 2 2 30 12525 12524 154088 154089 101055 3 2 2 30 12596 12595 154159 154160 101056 3 2 2 30 12598 154162 154163 12599 -101057 3 2 2 30 12602 154166 154167 12603 +101057 3 2 2 30 12603 12602 154166 154167 101058 3 2 2 30 12606 12605 154169 154170 101059 3 2 2 30 12618 154182 154183 12619 101060 3 2 2 30 12581 154145 154146 12582 @@ -262431,18 +262431,18 @@ $Elements 101070 3 2 2 30 12471 12470 154034 154035 101071 3 2 2 30 12486 12485 154049 154050 101072 3 2 2 30 33 12643 154207 844 -101073 3 2 2 30 154056 154057 12493 12492 +101073 3 2 2 30 154057 12493 12492 154056 101074 3 2 2 30 154066 154067 12503 12502 101075 3 2 2 30 12598 12597 154161 154162 -101076 3 2 2 30 12603 154167 154168 12604 +101076 3 2 2 30 12604 12603 154167 154168 101077 3 2 2 30 12614 12613 154177 154178 101078 3 2 2 30 154051 12487 12486 154050 101079 3 2 2 30 154036 12472 12471 154035 -101080 3 2 2 30 154065 154066 12502 12501 +101080 3 2 2 30 154066 12502 12501 154065 101081 3 2 2 30 154073 154074 12510 12509 -101082 3 2 2 30 12596 154160 154161 12597 +101082 3 2 2 30 12597 12596 154160 154161 101083 3 2 2 30 12605 12604 154168 154169 -101084 3 2 2 30 12612 154176 154177 12613 +101084 3 2 2 30 12613 12612 154176 154177 101085 3 2 2 30 12620 12619 154183 154184 101086 3 2 2 30 12635 12634 154198 154199 101087 3 2 2 30 12637 12636 154200 154201 @@ -262724,14 +262724,14 @@ $Elements 101363 3 2 2 30 835 24 10600 152278 101364 3 2 2 30 23175 156250 156251 23174 101365 3 2 2 30 12221 12220 153784 153785 -101366 3 2 2 30 12103 153667 153668 12104 +101366 3 2 2 30 12104 12103 153667 153668 101367 3 2 2 30 12137 153701 153702 12138 101368 3 2 2 30 12160 153724 153725 12161 101369 3 2 2 30 12163 12162 153726 153727 101370 3 2 2 30 12196 153760 153761 12197 101371 3 2 2 30 12204 12203 153767 153768 101372 3 2 2 30 12219 153783 153784 12220 -101373 3 2 2 30 12102 153666 153667 12103 +101373 3 2 2 30 12103 12102 153666 153667 101374 3 2 2 30 12139 12138 153702 153703 101375 3 2 2 30 12161 153725 153726 12162 101376 3 2 2 30 12195 153759 153760 12196 @@ -262855,8 +262855,8 @@ $Elements 101494 3 2 2 30 153655 12091 12090 153654 101495 3 2 2 30 153657 12093 12092 153656 101496 3 2 2 30 153658 153659 12095 12094 -101497 3 2 2 30 153660 153661 12097 12096 -101498 3 2 2 30 153662 153663 12099 12098 +101497 3 2 2 30 153661 12097 12096 153660 +101498 3 2 2 30 153663 12099 12098 153662 101499 3 2 2 30 153670 153671 12107 12106 101500 3 2 2 30 153677 153678 12114 12113 101501 3 2 2 30 153683 153684 12120 12119 @@ -266578,7 +266578,7 @@ $Elements 105217 3 2 1 32 100096 100097 8337 8338 105218 3 2 1 32 8209 8210 100224 100225 105219 3 2 1 32 8205 100229 100230 8204 -105220 3 2 1 32 8210 8211 100223 100224 +105220 3 2 1 32 8211 100223 100224 8210 105221 3 2 1 32 8212 100222 100223 8211 105222 3 2 1 32 8339 100095 100096 8338 105223 3 2 1 32 8335 100099 100100 8334 @@ -266726,13 +266726,13 @@ $Elements 105365 3 2 1 32 8068 100366 100367 8067 105366 3 2 1 32 7823 100611 100612 7822 105367 3 2 1 32 100372 8062 8063 100371 -105368 3 2 1 32 100366 8068 8069 100365 +105368 3 2 1 32 100365 100366 8068 8069 105369 3 2 1 32 8062 100372 100373 8061 105370 3 2 1 32 100610 100611 7823 7824 105371 3 2 1 32 8061 100373 100374 8060 105372 3 2 1 32 100363 8071 8072 100362 105373 3 2 1 32 8070 100364 100365 8069 -105374 3 2 1 32 100364 8070 8071 100363 +105374 3 2 1 32 100363 100364 8070 8071 105375 3 2 1 32 100374 100375 8059 8060 105376 3 2 1 32 100609 100610 7824 7825 105377 3 2 1 32 8058 8059 100375 100376 @@ -266753,7 +266753,7 @@ $Elements 105392 3 2 1 32 7834 100600 100601 7833 105393 3 2 1 32 100378 8056 8057 100377 105394 3 2 1 32 7835 100599 100600 7834 -105395 3 2 1 32 7827 100607 100608 7826 +105395 3 2 1 32 7826 7827 100607 100608 105396 3 2 1 32 7828 7829 100605 100606 105397 3 2 1 32 100387 8047 8048 100386 105398 3 2 1 32 7827 7828 100606 100607 @@ -266781,7 +266781,7 @@ $Elements 105420 3 2 1 32 8043 8044 100390 100391 105421 3 2 1 32 100589 100590 7844 7845 105422 3 2 1 32 8045 100389 100390 8044 -105423 3 2 1 32 100589 7845 7846 100588 +105423 3 2 1 32 100588 100589 7845 7846 105424 3 2 1 32 7846 7847 100587 100588 105425 3 2 1 32 8032 8033 100401 100402 105426 3 2 1 32 7848 100586 100587 7847 @@ -266803,12 +266803,12 @@ $Elements 105442 3 2 1 32 100411 100412 8022 8023 105443 3 2 1 32 100572 100573 7861 7862 105444 3 2 1 32 100410 100411 8023 8024 -105445 3 2 1 32 100409 100410 8024 8025 -105446 3 2 1 32 7853 7854 100580 100581 +105445 3 2 1 32 100410 8024 8025 100409 +105446 3 2 1 32 7854 100580 100581 7853 105447 3 2 1 32 8022 100412 100413 8021 105448 3 2 1 32 8026 100408 100409 8025 105449 3 2 1 32 8027 100407 100408 8026 -105450 3 2 1 32 100406 100407 8027 8028 +105450 3 2 1 32 100407 8027 8028 100406 105451 3 2 1 32 7854 7855 100579 100580 105452 3 2 1 32 7862 7863 100571 100572 105453 3 2 1 32 100413 100414 8020 8021 @@ -266888,7 +266888,7 @@ $Elements 105527 3 2 1 32 7908 7909 100525 100526 105528 3 2 1 32 100525 7909 7910 100524 105529 3 2 1 32 100524 7910 7911 100523 -105530 3 2 1 32 7912 100522 100523 7911 +105530 3 2 1 32 7911 7912 100522 100523 105531 3 2 1 32 100521 100522 7912 7913 105532 3 2 1 32 100442 100443 7991 7992 105533 3 2 1 32 7914 100520 100521 7913 @@ -266908,7 +266908,7 @@ $Elements 105547 3 2 1 32 7985 7986 100448 100449 105548 3 2 1 32 7923 100511 100512 7922 105549 3 2 1 32 7987 100447 100448 7986 -105550 3 2 1 32 100450 100451 7983 7984 +105550 3 2 1 32 100451 7983 7984 100450 105551 3 2 1 32 7983 100451 100452 7982 105552 3 2 1 32 100511 7923 7924 100510 105553 3 2 1 32 7981 7982 100452 100453 @@ -266935,7 +266935,7 @@ $Elements 105574 3 2 1 32 100461 7973 7974 100460 105575 3 2 1 32 7977 100457 100458 7976 105576 3 2 1 32 7965 100469 100470 7964 -105577 3 2 1 32 7933 100501 100502 7932 +105577 3 2 1 32 7932 7933 100501 100502 105578 3 2 1 32 7975 100459 100460 7974 105579 3 2 1 32 100458 100459 7975 7976 105580 3 2 1 32 100470 100471 7963 7964 @@ -266943,7 +266943,7 @@ $Elements 105582 3 2 1 32 7934 100500 100501 7933 105583 3 2 1 32 100472 100473 7961 7962 105584 3 2 1 32 7934 7935 100499 100500 -105585 3 2 1 32 7961 100473 100474 7960 +105585 3 2 1 32 7960 7961 100473 100474 105586 3 2 1 32 7960 100474 100475 7959 105587 3 2 1 32 7959 100475 100476 7958 105588 3 2 1 32 7936 100498 100499 7935 @@ -266961,7 +266961,7 @@ $Elements 105600 3 2 1 32 7953 100481 100482 7952 105601 3 2 1 32 7943 100491 100492 7942 105602 3 2 1 32 7943 7944 100490 100491 -105603 3 2 1 32 7951 7952 100482 100483 +105603 3 2 1 32 7952 100482 100483 7951 105604 3 2 1 32 7945 100489 100490 7944 105605 3 2 1 32 100483 100484 7950 7951 105606 3 2 1 32 7946 100488 100489 7945 diff --git a/src/pyopmspe11/templates/co2/spe11a.mako b/src/pyopmspe11/templates/co2/spe11a.mako index bb93be8..c9acbdb 100644 --- a/src/pyopmspe11/templates/co2/spe11a.mako +++ b/src/pyopmspe11/templates/co2/spe11a.mako @@ -1,4 +1,5 @@ -- Copyright (C) 2023 NORCE +-- This deck was generated by pyopmspe11 https://github.com/OPM/pyopmspe11 ---------------------------------------------------------------------------- RUNSPEC ---------------------------------------------------------------------------- @@ -117,7 +118,7 @@ DIFFCGAS ${dic["diffusion"][1]} ${dic["diffusion"][1]} / % else: DIFFC -1 1 ${dic["diffusion"][1]} ${dic["diffusion"][1]} ${dic["diffusion"][0]} ${dic["diffusion"][0]} / --The molecular weights are set to 1 since the diffusion coefficients are given for mass fractions +18.01528E-3 44.018E-3 ${dic["diffusion"][1]} ${dic["diffusion"][1]} ${dic["diffusion"][0]} ${dic["diffusion"][0]} / % endif % endif ---------------------------------------------------------------------------- @@ -158,12 +159,25 @@ PERFORMA FGIP FGIR FGIT +RGCDI +/ +RGCDM +/ +RGIP +/ +RWCD +/ WBHP / WGIR / WGIT / +BGPR +% for sensor in dic["sensorijk"]: +${sensor[0]+1} ${sensor[1]+1} ${sensor[2]+1} / +% endfor +/ ---------------------------------------------------------------------------- SCHEDULE ---------------------------------------------------------------------------- diff --git a/src/pyopmspe11/templates/co2/spe11b.mako b/src/pyopmspe11/templates/co2/spe11b.mako index 92b2988..c75862d 100644 --- a/src/pyopmspe11/templates/co2/spe11b.mako +++ b/src/pyopmspe11/templates/co2/spe11b.mako @@ -1,4 +1,5 @@ -- Copyright (C) 2023 NORCE +-- This deck was generated by pyopmspe11 https://github.com/OPM/pyopmspe11 ---------------------------------------------------------------------------- RUNSPEC ---------------------------------------------------------------------------- @@ -116,7 +117,7 @@ ${dic["diffusion"][1]} ${dic["diffusion"][1]} / % else: % if (dic["diffusion"][0] + dic["diffusion"][1]) > 0: DIFFC -1 1 ${dic["diffusion"][1]} ${dic["diffusion"][1]} ${dic["diffusion"][0]} ${dic["diffusion"][0]} / --The molecular weights are set to 1 since the diffusion coefficients are given for mass fractions +18.01528E-3 44.018E-3 ${dic["diffusion"][1]} ${dic["diffusion"][1]} ${dic["diffusion"][0]} ${dic["diffusion"][0]} / % endif % endif @@ -168,12 +169,25 @@ PERFORMA FGIP FGIR FGIT +RGCDI +/ +RGCDM +/ +RGIP +/ +RWCD +/ WBHP / WGIR / WGIT / +BGPR +% for sensor in dic["sensorijk"]: +${sensor[0]+1} ${sensor[1]+1} ${sensor[2]+1} / +% endfor +/ ---------------------------------------------------------------------------- SCHEDULE ---------------------------------------------------------------------------- @@ -204,10 +218,10 @@ WCONINJE % for i in range(len(dic['wellijk'])): % if dic['inj'][j][3+3*i] > 0: 'INJ${i}' 'GAS' ${'OPEN' if dic['inj'][j][4+3*i] > 0 else 'SHUT'} -'RATE' ${f"{dic['inj'][j][4+3*i] * 86400 / 1.86843 : E}"} 1* 400/ +'RATE' ${f"{dic['inj'][j][4+3*i] * 86400 / 1.86843:E}"} 1* 400/ % else: 'INJ${i}' ${'WATER' if dic['co2store'] == 'gaswater' else 'OIL'} ${'OPEN' if dic['inj'][j][4+3*i] > 0 else 'SHUT'} -'RATE' ${f"{dic['inj'][j][4+3*i] * 86400 / 998.108 : E}"} 1* 400/ +'RATE' ${f"{dic['inj'][j][4+3*i] * 86400 / 998.108:E}"} 1* 400/ %endif % endfor / diff --git a/src/pyopmspe11/templates/co2/spe11c.mako b/src/pyopmspe11/templates/co2/spe11c.mako index 0ad3a8c..fc14161 100644 --- a/src/pyopmspe11/templates/co2/spe11c.mako +++ b/src/pyopmspe11/templates/co2/spe11c.mako @@ -1,4 +1,5 @@ -- Copyright (C) 2023 NORCE +-- This deck was generated by pyopmspe11 https://github.com/OPM/pyopmspe11 ---------------------------------------------------------------------------- RUNSPEC ---------------------------------------------------------------------------- @@ -97,7 +98,7 @@ ${dic["diffusion"][1]} ${dic["diffusion"][1]} / % else: % if (dic["diffusion"][0] + dic["diffusion"][1]) > 0: DIFFC -1 1 ${dic["diffusion"][1]} ${dic["diffusion"][1]} ${dic["diffusion"][0]} ${dic["diffusion"][0]} / --The molecular weights are set to 1 since the diffusion coefficients are given for mass fractions +18.01528E-3 44.018E-3 ${dic["diffusion"][1]} ${dic["diffusion"][1]} ${dic["diffusion"][0]} ${dic["diffusion"][0]} / % endif % endif @@ -149,12 +150,25 @@ PERFORMA FGIP FGIR FGIT +RGCDI +/ +RGCDM +/ +RGIP +/ +RWCD +/ WBHP / WGIR / WGIT / +BGPR +% for sensor in dic["sensorijk"]: +${sensor[0]+1} ${sensor[1]+1} ${sensor[2]+1} / +% endfor +/ ---------------------------------------------------------------------------- SCHEDULE ---------------------------------------------------------------------------- @@ -173,7 +187,7 @@ WELSPECS COMPDAT % for i in range(len(dic['wellijk'])): % for j in range(1+dic['wellijkf'][i][1]-dic['wellijk'][i][1]): -% if i==0: +% if i==1: 'INJ${i}' ${dic['wellijk'][i][0]} ${dic['wellijk'][i][1]+j} ${dic['wellijk'][i][2]} ${dic['wellijk'][i][2]} 'OPEN' 1* 1* ${2.*dic['radius'][i]} / % else: 'INJ${i}' ${dic['wellijk'][i][0]} ${dic['wellijk'][i][1]+j} ${dic['wellkh'][j]} ${dic['wellkh'][j]} 'OPEN' 1* 1* ${2.*dic['radius'][i]} / diff --git a/src/pyopmspe11/templates/common/deck_initial.mako b/src/pyopmspe11/templates/common/deck_initial.mako index 2677e2f..93c5158 100644 --- a/src/pyopmspe11/templates/common/deck_initial.mako +++ b/src/pyopmspe11/templates/common/deck_initial.mako @@ -1,5 +1,5 @@ -- Copyright (C) 2023 NORCE - +-- This deck was generated by pyopmspe11 https://github.com/OPM/pyopmspe11 ---------------------------------------------------------------------------- RUNSPEC ---------------------------------------------------------------------------- diff --git a/src/pyopmspe11/templates/common/grid_corner.mako b/src/pyopmspe11/templates/common/grid_corner.mako index 0ef1896..684ad06 100644 --- a/src/pyopmspe11/templates/common/grid_corner.mako +++ b/src/pyopmspe11/templates/common/grid_corner.mako @@ -1,5 +1,5 @@ -- Copyright (C) 2023 NORCE - +-- This file was generated by pyopmspe11 https://github.com/OPM/pyopmspe11 COORD % for j in range(dic['noCells'][1] + 1): % for i in range(dic['noCells'][0] + 1): diff --git a/src/pyopmspe11/templates/common/grid_initial.mako b/src/pyopmspe11/templates/common/grid_initial.mako index 699f885..cd1b2ac 100644 --- a/src/pyopmspe11/templates/common/grid_initial.mako +++ b/src/pyopmspe11/templates/common/grid_initial.mako @@ -1,5 +1,5 @@ -- Copyright (C) 2023 NORCE - +-- This file was generated by pyopmspe11 https://github.com/OPM/pyopmspe11 COORD % for i in range(dic['noCells'][0] + 1): ${f"{dic['xcor'][i * (dic['noCells'][2] + 1)] : E}"} 0 ${f"{dic['zcor'][i*(dic['noCells'][2]+1)] : E}"} diff --git a/src/pyopmspe11/templates/common/grid_tensor.mako b/src/pyopmspe11/templates/common/grid_tensor.mako index 50c8f8c..66592f8 100644 --- a/src/pyopmspe11/templates/common/grid_tensor.mako +++ b/src/pyopmspe11/templates/common/grid_tensor.mako @@ -1,5 +1,5 @@ -- Copyright (C) 2023 NORCE - +-- This file was generated by pyopmspe11 https://github.com/OPM/pyopmspe11 COORD % for j in range(dic['noCells'][1] + 1): % for i in range(dic['noCells'][0] + 1): diff --git a/src/pyopmspe11/templates/common/saturation_functions.mako b/src/pyopmspe11/templates/common/saturation_functions.mako index 1fc6afc..939cbc1 100644 --- a/src/pyopmspe11/templates/common/saturation_functions.mako +++ b/src/pyopmspe11/templates/common/saturation_functions.mako @@ -61,6 +61,8 @@ def safu_evaluation(): "w", encoding="utf8", ) as file: + file.write("-- Copyright (C) 2023 NORCE\n") + file.write("-- This file was generated by pyopmspe11 https://github.com/OPM/pyopmspe11\n") % if dic["co2store"] == "gaswater": file.write("SGWFN\n") % else: @@ -73,13 +75,13 @@ def safu_evaluation(): file.write( f"{value:E} {krn(1.0 - value, para[1]) :E}" f" {krw(1.0 - value, para[0]) :E}" - f" {pcap(1.0 - value, para[0], para[2], para[3])/1.e5 : E} \n" + f" {pcap(1.0 - value, para[0], para[2], para[3])/1.e5 :E} \n" ) else: file.write( f"{value:E} {krn(1.0 - value, para[1]) :E}" f" {krw(1.0 - value, para[0]) :E}" - f" {para[3]/1.e5 : E} \n" + f" {para[3]/1.e5 :E} \n" ) file.write("/\n") diff --git a/src/pyopmspe11/utils/inputvalues.py b/src/pyopmspe11/utils/inputvalues.py index 0b28121..cd44458 100644 --- a/src/pyopmspe11/utils/inputvalues.py +++ b/src/pyopmspe11/utils/inputvalues.py @@ -40,7 +40,11 @@ def process_input(dic, in_file): dic["boxc"] = [[3300.0, 0.0, 100.0], [7800.0, 1.0, 400.0]] dic["time"] = 31536000.0 # year to seconds else: - dic["sensors"] = [[4500.0, 2500.0, 655.0], [5100.0, 2500.0, 1255.0]] + corr = dic["elevation"] + 0.5 * dic["backElevation"] + dic["sensors"] = [ + [4500.0, 2500.0, 655.0 - corr], + [5100.0, 2500.0, 1255.0 - corr], + ] dic["boxa"] = [[3300.0, 0.0, 0.0], [8300.0, 5000.0, 750.0]] dic["boxb"] = [[100.0, 0.0, 750.0], [3300.0, 5000.0, 1350.0]] dic["boxc"] = [[3300.0, 0.0, 250.0], [7800.0, 5000.0, 550.0]] diff --git a/src/pyopmspe11/utils/mapproperties.py b/src/pyopmspe11/utils/mapproperties.py index 197cac2..270dd5f 100644 --- a/src/pyopmspe11/utils/mapproperties.py +++ b/src/pyopmspe11/utils/mapproperties.py @@ -95,8 +95,10 @@ def structured_handling_spe11a(dic): (dic["xmx_center"][i] - dic["sensors"][1][0]) ** 2 + (dic["zmz_center"][k] + dic["sensors"][1][2] - dic["dims"][2]) ** 2 ) - dic = boxes(dic, dic["xmx_center"][i], dic["zmz_center"][k], i) dic["satnum"].append(dic["ids_gmsh"][fgl][0]) + dic = boxes( + dic, dic["xmx_center"][i], dic["zmz_center"][k], i, dic["satnum"][-1] + ) dic["permx"].append(dic["rock"][int(dic["ids_gmsh"][fgl][0]) - 1][0]) dic["poro"].append(dic["rock"][int(dic["ids_gmsh"][fgl][0]) - 1][1]) centers.append( @@ -104,8 +106,11 @@ def structured_handling_spe11a(dic): 1:-1 ] ) - dic["fipnum"][pd.Series(sensor1).argmin()] = "5" - dic["fipnum"][pd.Series(sensor2).argmin()] = "6" + dic["pop1"] = pd.Series(sensor1).argmin() + dic["pop2"] = pd.Series(sensor2).argmin() + dic["fipnum"][dic["pop1"]] = "8" + dic["fipnum"][dic["pop2"]] = "9" + dic = sensors(dic) dic = wells(dic) with open( f"{dic['exe']}/{dic['fol']}/deck/centers.txt", @@ -148,9 +153,9 @@ def structured_handling_spe11bc(dic): ) z_c = dic["zmz_center"][k] if dic["spe11"] == "spe11c": - z_c += map_z(dic, 0) - dic = boxes(dic, dic["xmx_center"][i], z_c, i) + z_c -= map_zn(dic, 0) dic["satnum"].append(dic["ids_gmsh"][fgl][0]) + dic = boxes(dic, dic["xmx_center"][i], z_c, i, dic["satnum"][-1]) dic["permx"].append(dic["rock"][int(dic["ids_gmsh"][fgl][0]) - 1][0]) dic["thconr"].append( f"{dic['rockCond'][int(dic['ids_gmsh'][fgl][0])-1][0]}" @@ -184,13 +189,22 @@ def structured_handling_spe11bc(dic): ) z_c = dic["zmz_center"][k] if dic["spe11"] == "spe11c": - z_c += map_z(dic, j + 1) - dic = boxes(dic, dic["xmx_center"][i_i], z_c, i_i) + z_c -= map_zn(dic, j + 1) + dic = boxes( + dic, + dic["xmx_center"][i_i], + z_c, + i_i, + dic["satnum"][-dic["noCells"][0] + i_i], + ) centers.append( str([dic["xmx_center"][i_i], dic["ymy_center"][j + 1], z_c])[1:-1] ) - dic["fipnum"][pd.Series(sensor1).argmin()] = "5" - dic["fipnum"][pd.Series(sensor2).argmin()] = "6" + dic["pop1"] = pd.Series(sensor1).argmin() + dic["pop2"] = pd.Series(sensor2).argmin() + dic["fipnum"][dic["pop1"]] = "8" + dic["fipnum"][dic["pop2"]] = "9" + dic = sensors(dic) dic = wells(dic) with open( f"{dic['exe']}/{dic['fol']}/deck/centers.txt", @@ -235,21 +249,27 @@ def corner_point_handling_spe11a(dic): (dic["xyz"][0] - dic["sensors"][1][0]) ** 2 + (dic["xyz"][2] + dic["sensors"][1][2] - dic["dims"][2]) ** 2 ) - dic = boxes(dic, dic["xyz"][0], dic["xyz"][2], dic["ijk"][0]) dic["satnum"].append(dic["ids_gmsh"][fgl][0]) + dic = boxes(dic, dic["xyz"][0], dic["xyz"][2], dic["ijk"][0], dic["satnum"][-1]) dic["permx"].append(dic["rock"][int(dic["ids_gmsh"][fgl][0]) - 1][0]) dic["poro"].append(dic["rock"][int(dic["ids_gmsh"][fgl][0]) - 1][1]) centers.append(str([dic["xyz"][0], dic["ymy_center"][0], dic["xyz"][2]])[1:-1]) + dic["pop1"] = pd.Series(sensor1).argmin() + dic["pop2"] = pd.Series(sensor2).argmin() + dic["fipnum"][dic["pop1"]] = "8" + dic["fipnum"][dic["pop2"]] = "9" idwell1 = pd.Series(well1).argmin() idwell2 = pd.Series(well2).argmin() if dic["use"] == "opm": well1ijk = dic["gridf"].ijk_from_global_index(idwell1) well2ijk = dic["gridf"].ijk_from_global_index(idwell2) + dic["sensorijk"][0] = dic["gridf"].ijk_from_global_index(dic["pop1"]) + dic["sensorijk"][1] = dic["gridf"].ijk_from_global_index(dic["pop2"]) else: well1ijk = dic["gridf"].get_ijk(global_index=idwell1) well2ijk = dic["gridf"].get_ijk(global_index=idwell2) - dic["fipnum"][pd.Series(sensor1).argmin()] = "5" - dic["fipnum"][pd.Series(sensor2).argmin()] = "6" + dic["sensorijk"][0] = dic["gridf"].get_ijk(global_index=dic["pop1"]) + dic["sensorijk"][1] = dic["gridf"].get_ijk(global_index=dic["pop2"]) dic["wellijk"][0] = [well1ijk[0] + 1, 1, well1ijk[2] + 1] dic["wellijk"][1] = [well2ijk[0] + 1, 1, well2ijk[2] + 1] with open( @@ -322,19 +342,17 @@ def corner_point_handling_spe11bc(dic): ) sensor1.append( (dic["xyz"][0] - dic["sensors"][0][0]) ** 2 - + (dic["ymy_center"][0] - dic["sensors"][0][1]) ** 2 + (dic["xyz"][2] + dic["sensors"][0][2] - dic["dims"][2]) ** 2 ) sensor2.append( (dic["xyz"][0] - dic["sensors"][1][0]) ** 2 - + (dic["ymy_center"][0] - dic["sensors"][1][1]) ** 2 + (dic["xyz"][2] + dic["sensors"][1][2] - dic["dims"][2]) ** 2 ) z_c = dic["xyz"][2] if dic["spe11"] == "spe11c": - z_c += map_z(dic, dic["ijk"][1]) - dic = boxes(dic, dic["xyz"][0], z_c, dic["ijk"][0]) + z_c -= map_zn(dic, dic["ijk"][1]) dic["satnum"].append(dic["ids_gmsh"][fgl][0]) + dic = boxes(dic, dic["xyz"][0], z_c, dic["ijk"][0], dic["satnum"][-1]) dic["permx"].append(dic["rock"][int(dic["ids_gmsh"][fgl][0]) - 1][0]) dic["thconr"].append(f"{dic['rockCond'][int(dic['ids_gmsh'][fgl][0])-1][0]}") if dic["ijk"][0] == 0 and ( @@ -353,29 +371,25 @@ def corner_point_handling_spe11bc(dic): for names in ["satnum", "poro", "permx", "thconr"]: dic[f"{names}"].extend(dic[f"{names}"][-dic["noCells"][0] :]) for i_i in range(dic["noCells"][0]): - sensor1.append( - (xtemp[i_i] - dic["sensors"][0][0]) ** 2 - + (dic["ymy_center"][j + 1] - dic["sensors"][0][1]) ** 2 - + (dic["xyz"][2] + dic["sensors"][0][2] - dic["dims"][2]) ** 2 - ) - sensor2.append( - (xtemp[i_i] - dic["sensors"][1][0]) ** 2 - + (dic["ymy_center"][j + 1] - dic["sensors"][1][1]) ** 2 - + (dic["xyz"][2] + dic["sensors"][1][2] - dic["dims"][2]) ** 2 - ) z_c = dic["xyz"][2] if dic["spe11"] == "spe11c": - z_c += map_z(dic, j + 1) - dic = boxes(dic, xtemp[i_i], z_c, i_i) + z_c -= map_zn(dic, j + 1) + dic = boxes( + dic, + xtemp[i_i], + z_c, + i_i, + dic["satnum"][-dic["noCells"][0] + i_i], + ) centers.append( str([xtemp[i_i], dic["ymy_center"][j + 1], z_c])[1:-1] ) xtemp = [] - dic["fipnum"][pd.Series(sensor1).argmin()] = "5" - dic["fipnum"][pd.Series(sensor2).argmin()] = "6" + dic["pop1"] = pd.Series(sensor1).argmin() + dic["pop2"] = pd.Series(sensor2).argmin() dic["well1"] = pd.Series(well1).argmin() dic["well2"] = pd.Series(well2).argmin() - dic = locate_wells(dic) + dic = locate_wells_sensors(dic) with open( f"{dic['exe']}/{dic['fol']}/deck/centers.txt", "w", @@ -385,14 +399,18 @@ def corner_point_handling_spe11bc(dic): return dic -def locate_wells(dic): - """Find the wells positions""" +def locate_wells_sensors(dic): + """Find the wells and sensors positions""" if dic["use"] == "opm": well1ijk = dic["gridf"].ijk_from_global_index(dic["well1"]) well2ijk = dic["gridf"].ijk_from_global_index(dic["well2"]) + dic["sensorijk"][0] = list(dic["gridf"].ijk_from_global_index(dic["pop1"])) + dic["sensorijk"][1] = list(dic["gridf"].ijk_from_global_index(dic["pop2"])) else: well1ijk = dic["gridf"].get_ijk(global_index=dic["well1"]) well2ijk = dic["gridf"].get_ijk(global_index=dic["well2"]) + dic["sensorijk"][0] = list(dic["gridf"].get_ijk(global_index=dic["pop1"])) + dic["sensorijk"][1] = list(dic["gridf"].get_ijk(global_index=dic["pop2"])) dic["wellijk"][0] = [well1ijk[0] + 1, 1, well1ijk[2] + 1] dic["wellijk"][1] = [well2ijk[0] + 1, 1, well2ijk[2] + 1] # Work in process to implement properly this for the corner-point grid in spe11c @@ -403,18 +421,32 @@ def locate_wells(dic): dic["ymy_center"] = (np.array(dic["ymy"][1:]) + np.array(dic["ymy"][:-1])) / 2.0 wji = pd.Series(abs(dic["wellCoord"][0][1] - dic["ymy_center"])).argmin() + 1 wjf = pd.Series(abs(dic["wellCoordf"][0][1] - dic["ymy_center"])).argmin() + 1 + sj1 = pd.Series(abs(dic["sensors"][0][1] - dic["ymy_center"])).argmin() + sj2 = pd.Series(abs(dic["sensors"][1][1] - dic["ymy_center"])).argmin() + dic["sensorijk"][0][1] = sj1 + dic["sensorijk"][1][1] = sj2 dic["wellijk"][0][1] = wji dic["wellijk"][1][1] = wji dic["wellijkf"][0][1] = wjf dic["wellijkf"][1][1] = wjf dic["wellkh"] = [ - dic["wellijk"][1][2] - for _ in range(dic["wellijk"][1][1], dic["wellijkf"][1][1] + 1) + dic["wellijk"][0][2] + for _ in range(dic["wellijk"][0][1], dic["wellijkf"][0][1] + 1) ] + dic["fipnum"][ + dic["sensorijk"][0][0] + + dic["sensorijk"][0][1] * dic["noCells"][0] + + dic["sensorijk"][0][2] * dic["noCells"][0] * dic["noCells"][1] + ] = "8" + dic["fipnum"][ + dic["sensorijk"][1][0] + + dic["sensorijk"][1][1] * dic["noCells"][0] + + dic["sensorijk"][1][2] * dic["noCells"][0] * dic["noCells"][1] + ] = "9" return dic -def boxes(dic, x_c, z_c, idx): +def boxes(dic, x_c, z_c, idx, satnum): """Find the box positions""" if ( (dic["dims"][2] - z_c >= dic["boxb"][0][2]) @@ -422,7 +454,10 @@ def boxes(dic, x_c, z_c, idx): & (x_c >= dic["boxb"][0][0]) & (x_c <= dic["boxb"][1][0]) ): - dic["fipnum"].append("3") + if satnum == "1": + dic["fipnum"].append("6") + else: + dic["fipnum"].append("3") elif ( (dic["dims"][2] - z_c >= dic["boxc"][0][2]) & (dic["dims"][2] - z_c <= dic["boxc"][1][2]) @@ -436,8 +471,16 @@ def boxes(dic, x_c, z_c, idx): & (x_c >= dic["boxa"][0][0]) & (x_c <= dic["boxa"][1][0]) ): - dic["fipnum"].append("2") + if satnum == "1": + dic["fipnum"].append("5") + else: + dic["fipnum"].append("2") elif dic["spe11"] != "spe11a" and idx in (0, dic["noCells"][0] - 1): + if satnum == "1": + dic["fipnum"].append("10") + else: + dic["fipnum"].append("11") + elif satnum == "1": dic["fipnum"].append("7") else: dic["fipnum"].append("1") @@ -455,6 +498,7 @@ def positions(dic): dic (dict): Global dictionary with new added parameters """ + dic["sensorijk"] = [[] for _ in range(len(dic["sensors"]))] dic = getfacies(dic) for names in ["satnum", "poro", "permx", "thconr", "fipnum"]: dic[f"{names}"] = [] @@ -495,6 +539,23 @@ def positions(dic): return dic +def sensors(dic): + """Find the i,j,k sensor indices""" + for j, _ in enumerate(dic["sensors"]): + for sensor_coord, axis in zip(dic["sensors"][j], ["xmx", "ymy", "zmz"]): + if axis == "zmz": + dic["sensorijk"][j].append( + pd.Series( + abs(dic["dims"][2] - sensor_coord - dic[f"{axis}_center"]) + ).argmin() + ) + else: + dic["sensorijk"][j].append( + pd.Series(abs(sensor_coord - dic[f"{axis}_center"])).argmin() + ) + return dic + + def wells(dic): """ Function to find the wells index @@ -528,28 +589,27 @@ def wells(dic): ).argmin() + 1 ) - well_coord = dic["wellCoord"][j][2] - midpoints = dic["zmz_center"] + map_z(dic, dic["wellijk"][j][1]) - dic["wellijk"][j].append( - pd.Series( - abs( - well_coord - + dic["elevation"] - + 0.5 * dic["backElevation"] - - midpoints - ) - ).argmin() - + 1 - ) + if j == 0: + well_coord = dic["wellCoord"][j][2] + midpoints = dic["zmz_center"] - map_z(dic, dic["wellijk"][j][1]) + dic["wellijk"][j].append( + pd.Series(abs(well_coord - midpoints)).argmin() + 1 + ) + else: + well_coord = dic["wellCoord"][j][2] + midpoints = dic["zmz_center"] + dic["wellijk"][j].append( + pd.Series(abs(well_coord - midpoints)).argmin() + 1 + ) if dic["spe11"] == "spe11c": dic["wellkh"] = [] - for j in range(dic["wellijk"][1][1], dic["wellijkf"][1][1] + 1): - midpoints = dic["zmz_center"] + map_z(dic, j) + for j in range(dic["wellijk"][0][1], dic["wellijkf"][0][1] + 1): + midpoints = dic["zmz_center"] - map_z(dic, j) dic["wellkh"].append( pd.Series( abs( - dic["wellCoord"][1][2] - + map_z(dic, dic["wellijk"][1][1]) + dic["wellCoord"][0][2] + - map_z(dic, dic["wellijk"][0][1]) - midpoints ) ).argmin() @@ -560,7 +620,7 @@ def wells(dic): def map_z(dic, j): """ - Function to return the z position of the parabola + Function to return the z position of the parabola for the wells Args: dic (dict): Global dictionary with required parameters @@ -571,14 +631,35 @@ def map_z(dic, j): """ z_pos = ( - dic["elevation"] - - dic["elevation"] + -dic["elevation"] + + dic["elevation"] * (1.0 - (dic["ymy_center"][j - 1] / (0.5 * dic["dims"][1]) - 1) ** 2.0) - dic["ymy_center"][j - 1] * dic["backElevation"] / dic["dims"][1] ) return z_pos +def map_zn(dic, j): + """ + Function to return the z position of the parabola for the boxes + + Args: + dic (dict): Global dictionary with required parameters + j : cell id along the y axis + + Returns: + z: Position + + """ + z_pos = ( + dic["elevation"] + + dic["elevation"] + * (1.0 - (dic["ymy_center"][j] / (0.5 * dic["dims"][1]) - 1) ** 2.0) + + dic["ymy_center"][j] * dic["backElevation"] / dic["dims"][1] + ) + return z_pos + + def getfacies(dic): """ Function to read the reference gmsh file diff --git a/src/pyopmspe11/utils/runs.py b/src/pyopmspe11/utils/runs.py index 8d9691c..9df5329 100644 --- a/src/pyopmspe11/utils/runs.py +++ b/src/pyopmspe11/utils/runs.py @@ -65,6 +65,8 @@ def data(dic): "-g " + f"{dic['generate']}", "-r " + f"{dic['resolution']}", "-t " + f"{dic['time_data']}", + "-w " + f"{dic['dt_data']}", + "-l " + f"{dic['load']}", "-u " + f"{dic['use']}", ] print(" ".join(data_exe)) diff --git a/src/pyopmspe11/utils/writefile.py b/src/pyopmspe11/utils/writefile.py index 0f62ce4..2e04e4d 100644 --- a/src/pyopmspe11/utils/writefile.py +++ b/src/pyopmspe11/utils/writefile.py @@ -70,8 +70,11 @@ def write_keywords(dic): dic["dx"].extend(dic["dx"][-dic["noCells"][0] :]) else: keywords = ["satnum", "fipnum", "poro", "permx", "thconr"] + git = "-- This deck was generated by pyopmspe11 https://github.com/OPM/pyopmspe11" for names in keywords: dic[f"{names}"].insert(0, f"{names.upper()}") + dic[f"{names}"].insert(0, git) + dic[f"{names}"].insert(0, "-- Copyright (C) 2023 NORCE") dic[f"{names}"].append("/") with open( f"{dic['exe']}/{dic['fol']}/deck/{names.upper()}.INC", @@ -136,11 +139,20 @@ def opm_files(dic): if prosc.returncode != 0: raise ValueError(f"Invalid result: { prosc.returncode }") os.system(f"rm -rf {dic['exe']}/{dic['fol']}/deck/saturation_functions.py") - # Way around to the time step the solutions are written (use in data.py) - if dic["use"] == "opm" and dic["spe11"] != "spe11a": - with open( - f"{dic['exe']}/{dic['fol']}/deck/dt.txt", - "w", - encoding="utf8", - ) as file: - file.write(f"{dic['inj'][-1][1]}") + inj_t = 0.0 + skip_unrst = 0 + for inj in dic["inj"]: + if inj[4] + inj[7] == 0.0: + inj_t += inj[0] + skip_unrst += int(inj[0] / inj[1]) + else: + d_t = inj[1] + break + with open( + f"{dic['exe']}/{dic['fol']}/deck/dt.txt", + "w", + encoding="utf8", + ) as file: + file.write(f"{d_t}\n") + file.write(f"{inj_t}\n") + file.write(f"{skip_unrst}") diff --git a/src/pyopmspe11/visualization/data.py b/src/pyopmspe11/visualization/data.py index c9bc1c3..f4e2e4b 100644 --- a/src/pyopmspe11/visualization/data.py +++ b/src/pyopmspe11/visualization/data.py @@ -11,6 +11,7 @@ from io import StringIO import numpy as np import pandas as pd +from scipy.interpolate import interp1d try: from opm.io.ecl import EclFile as OpmFile @@ -29,6 +30,7 @@ GAS_DEN_REF = 1.86843 WAT_DEN_REF = 998.108 SECONDS_IN_YEAR = 31536000 +KMOL_TO_KG = 1e3 * 0.044 def main(): @@ -38,13 +40,13 @@ def main(): "-p", "--path", default="output", - help="The name of the output folder.", + help="The name of the output folder ('output' by default).", ) parser.add_argument( "-d", "--deck", default="spe11b", - help="The simulated case.", + help="The simulated case ('spe11b' by default).", ) parser.add_argument( "-r", @@ -58,6 +60,20 @@ def main(): default="25", help="Time interval for the spatial maps (spe11a [h]; spe11b/c [y]) ('24' by default).", ) + parser.add_argument( + "-w", + "--write", + default="0.1", + help="Time interval for the sparse and performance data (spe11a [h]; spe11b/c [y])" + " ('0.1' by default).", + ) + parser.add_argument( + "-l", + "--load", + default="summary", + help="Use the summary or restart for the interpolation in the sparse data" + " ('summary' by default).", + ) parser.add_argument( "-g", "--generate", @@ -75,6 +91,7 @@ def main(): dic = {"path": cmdargs["path"].strip()} dic["case"] = cmdargs["deck"].strip() dic["mode"] = cmdargs["generate"].strip() + dic["load"] = cmdargs["load"].strip() dic["exe"] = os.getcwd() dic["where"] = f"{dic['exe']}/{dic['path']}/data" dic["use"] = cmdargs["use"].strip() @@ -83,15 +100,18 @@ def main(): ) if dic["case"] == "spe11a": dic["spatial_t"] = float(cmdargs["time"].strip()) * 3600 + dic["sparse_t"] = 1.0 * round(float(cmdargs["write"].strip()) * 3600) dic["dims"] = [2.8, 1.0, 1.2] - dic["dof"], dic["t0_rst"], dic["t1_rst"], dic["nxyz"][1] = 2, 0, 0, 1 + dic["dof"], dic["nxyz"][1] = 2, 1 else: dic["spatial_t"] = float(cmdargs["time"].strip()) * SECONDS_IN_YEAR + dic["sparse_t"] = float(cmdargs["write"].strip()) * SECONDS_IN_YEAR dic["dims"] = [8400.0, 1.0, 1200.0] - dic["dof"], dic["t0_rst"], dic["t1_rst"], dic["nxyz"][1] = 3, 1, 2, 1 + dic["dof"], dic["nxyz"][1] = 3, 1 if dic["case"] == "spe11c": dic["dims"][1] = 5000.0 dic["nocellsr"] = dic["nxyz"][0] * dic["nxyz"][1] * dic["nxyz"][2] + dic = read_times(dic) if dic["use"] == "opm": dic = read_opm(dic) else: @@ -104,6 +124,23 @@ def main(): dense_data(dic) +def read_times(dic): + """Get the time for injection and restart number""" + with open(f"{dic['path']}/deck/dt.txt", "r", encoding="utf8") as file: + for i, value in enumerate(csv.reader(file)): + if i == 0: + dic["d_t"] = float(value[0]) + elif i == 1: + dic["initial_t"] = float(value[0]) + else: + dic["t1_rst"] = int(value[0]) + if dic["t1_rst"] > 0: + dic["t0_rst"] = 1 + else: + dic["t0_rst"] = 0 + return dic + + def read_resdata(dic): """Using resdata""" case = "./" + dic["path"] + "/flow/" + f"{dic['path'].upper()}" @@ -126,17 +163,9 @@ def read_resdata(dic): dic["porva"] = [porv for (porv, act) in zip(dic["porv"], dic["actnum"]) if act == 1] dic["nocellst"], dic["nocellsa"] = len(dic["actnum"]), sum(dic["actnum"]) dic["norst"] = dic["unrst"].num_report_steps() - dic["d_t"] = ( - dic["smspec"].end_time - dic["unrst"].dates[dic["t0_rst"]] - ).total_seconds() / (len(dic["unrst"].dates) - 1 - dic["t0_rst"]) - dic["times"] = [dic["d_t"] * j for j in range(1, dic["norst"] - 1 - dic["t0_rst"])] + dic["times_ts"] = list(86400.0 * dic["smspec"]["TIME"].values - dic["initial_t"]) + dic["times"] = [dic["d_t"] * j for j in range(1, dic["norst"] - dic["t1_rst"])] dic["notimes"] = len(dic["times"]) - dic["t_0"] = ( - dic["unrst"].dates[dic["t0_rst"]] - dic["unrst"].dates[0] - ).total_seconds() - dic["rsteps"] = [ - rstep for rstep in dic["smspec"].get_report_step() if rstep > dic["t0_rst"] - ] dic["map_rsteps"] = [ sum((1 if (rstep < i) else 0 for rstep in dic["smspec"].get_report_step())) for i in range(dic["t1_rst"] + 1, dic["norst"] + 1) @@ -165,31 +194,8 @@ def read_opm(dic): dic["porva"] = list(porv for porv in dic["porv"] if porv > 0) dic["nocellst"], dic["nocellsa"] = len(dic["porv"]), dic["egrid"].active_cells dic["norst"] = len(dic["unrst"].report_steps) - dic["infoiter"] = [] - with open( - f"{dic['path']}/flow/{dic['path'].upper()}.INFOITER", "r", encoding="utf8" - ) as file: - for j, row in enumerate(csv.reader(file)): - if j > 0: - dic["infoiter"].append( - [float(column) for column in (row[0].strip()).split()[:8]] - ) - if dic["norst"] > 2 and dic["case"] != "spe11a": - # whr1 = sum(row[0] < dic["norst"] - 2 for row in dic["infoiter"]) - # whr2 = sum(row[0] < dic["norst"] - 3 for row in dic["infoiter"]) - # dic["d_t"] = 1.0 * round( - # 86400 * (dic["infoiter"][whr1][2] - dic["infoiter"][whr2][2]) - # ) - with open(f"{dic['path']}/deck/dt.txt", "r", encoding="utf8") as file: - for value in csv.reader(file): - dic["d_t"] = float(value[0]) - else: - dic["d_t"] = 1.0 * round( - (dic["smspec"].end_date - dic["smspec"].start_date).total_seconds() - / (dic["norst"] - 1) - ) - whr0 = sum(row[0] < 1 for row in dic["infoiter"]) dic["times"] = [dic["d_t"] * j for j in range(1, dic["norst"] - dic["t1_rst"])] + dic["times_ts"] = list(86400.0 * dic["smspec"]["TIME"] - dic["initial_t"]) dic["notimes"] = len(dic["times"]) dic["smsp_seconds"] = 86400 * dic["smspec"]["TIME"] if dic["case"] == "spe11a": @@ -202,17 +208,6 @@ def read_opm(dic): dic["smsp_rst"] = [ pd.Series(abs(dic["smsp_seconds"] - time)).argmin() + 1 for time in temp ] - dic["t_0"] = 1.0 * round(86400 * dic["infoiter"][whr0][2]) - dic["rsteps"] = [1 + dic["t0_rst"]] * ( - dic["smsp_rst"][1] - dic["smsp_rst"][0] + 1 - dic["t0_rst"] - ) - for i in range(dic["norst"] - dic["t1_rst"] - 3 + dic["t0_rst"]): - dic["rsteps"] += [2 + dic["t0_rst"] + i] * ( - dic["smsp_rst"][2 + i] - dic["smsp_rst"][1 + i] - ) - dic["rsteps"] += [dic["norst"] - 1] * ( - len(dic["smsp_seconds"]) - dic["smsp_rst"][-1] - ) dic["map_rsteps"] = dic["smsp_rst"][1:] dic["map_rsteps"].append(len(dic["smsp_seconds"])) dic["gxyz"] = [ @@ -259,33 +254,49 @@ def load_centers(dic): def performance(dic): - """Write the performance within the benchmark format""" + """Write the performance within the benchmark format SECONDS_IN_YEAR""" + dic["times_s"] = np.linspace( + 0, dic["times"][-1], round(dic["times"][-1] / dic["sparse_t"]) + 1 + ) dic["infosteps"] = [] with open( f"{dic['path']}/flow/{dic['path'].upper()}.INFOSTEP", "r", encoding="utf8" ) as file: for j, row in enumerate(csv.reader(file)): if j > 0: - if float((row[0].strip()).split()[0]) >= (dic["t_0"] / 86400.0): + if float((row[0].strip()).split()[0]) >= ( + (dic["initial_t"] - dic["sparse_t"]) / 86400.0 + ): dic["infosteps"].append( [float(column) for column in (row[0].strip()).split()] ) - infotimes = [infostep[0] * 86400 - dic["t_0"] for infostep in dic["infosteps"]] - dic["map_info"] = [round(infotime / dic["d_t"]) for infotime in infotimes] - fsteps = [infostep[11] for infostep in dic["infosteps"]] + infotimes = [ + infostep[0] * 86400 - dic["initial_t"] for infostep in dic["infosteps"] + ] + dic["map_info"] = [ + dic["t0_rst"] + int(np.floor(infotime / dic["sparse_t"])) + for infotime in infotimes + ] + fsteps = [1.0 * (infostep[11] == 0) for infostep in dic["infosteps"]] nress = [infostep[8] for infostep in dic["infosteps"]] tlinsols = [infostep[4] for infostep in dic["infosteps"]] - runtimes = [sum(infostep[2:7]) for infostep in dic["infosteps"]] + runtimes = [sum(infostep[i] for i in [2, 4, 5, 6]) for infostep in dic["infosteps"]] + liniters = [infostep[10] for infostep in dic["infosteps"]] + nliters = [infostep[9] for infostep in dic["infosteps"]] + dic["tsteps"] = [ + 86400 * infostep[1] * infostep[11] for infostep in dic["infosteps"] + ] if dic["use"] == "opm": fgip = dic["smspec"]["FGIP"] - tsteps = dic["smspec"]["TIMESTEP"] - nliters = dic["smspec"]["NEWTON"] - liniters = dic["smspec"]["MLINEARS"] + times = 86400.0 * dic["smspec"]["TIME"] - dic["initial_t"] else: fgip = dic["smspec"]["FGIP"].values - tsteps = dic["smspec"]["TIMESTEP"].values - nliters = dic["smspec"]["NEWTON"].values - liniters = dic["smspec"]["MLINEARS"].values + times = 86400.0 * dic["smspec"]["TIME"].values - dic["initial_t"] + interp_fgip = interp1d( + times, + GAS_DEN_REF * fgip, + fill_value="extrapolate", + ) dic["text"] = [] dic["text"].append( "# t [s], tstep [s], fsteps [-], mass [kg], dof [-], nliter [-], " @@ -296,41 +307,28 @@ def performance(dic): "0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, " + "0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00" ) - else: - dic["times"].insert(0, 0.0) - for j, time in enumerate(dic["times"]): - dic["tstep"] = sum( - ( - tsteps[i] - for i, rstep in enumerate(dic["rsteps"]) - if rstep == (j + 1 + dic["t0_rst"]) - ) - ) / dic["rsteps"].count(j + 1 + dic["t0_rst"]) - dic["nliters"] = sum( - ( - nliters[i] - for i, rstep in enumerate(dic["rsteps"]) - if rstep == (j + 1 + dic["t0_rst"]) - ) - ) - dic["liniters"] = sum( - ( - liniters[i] - for i, rstep in enumerate(dic["rsteps"]) - if rstep == (j + 1 + dic["t0_rst"]) - ) - ) + dic["times_s"] = np.delete(dic["times_s"], 0) + for j, time in enumerate(dic["times_s"]): + dic["tstep"] = [ + dic["tsteps"][k] + for k, i in enumerate(dic["map_info"]) + if i == j and dic["tsteps"][k] > 0 + ] + if dic["tstep"]: + dic["tstep"] = sum(dic["tstep"]) / len(dic["tstep"]) + else: + dic["tstep"] = dic["sparse_t"] dic["text"].append( f"{time:.3e}, " + f"{dic['tstep']:.3e}, " - + f"{sum(fsteps[i] for i in dic['map_info'] if i==j):.3e}, " - + f"{GAS_DEN_REF*fgip[dic['map_rsteps'][j]-1]:.3e}, " + + f"{sum(fsteps[k] for k, i in enumerate(dic['map_info']) if i==j):.3e}, " + + f"{interp_fgip(time):.3e}, " + f"{dic['dof'] * dic['nocellsa']:.3e}, " - + f"{dic['nliters']:.3e}, " - + f"{sum(nress[i] for i in dic['map_info'] if i==j):.3e}, " - + f"{dic['liniters']:.3e}, " - + f"{sum(runtimes[i] for i in dic['map_info'] if i==j):.3e}, " - + f"{sum(tlinsols[i] for i in dic['map_info'] if i==j):.3e}" + + f"{sum(nliters[k] for k, i in enumerate(dic['map_info']) if i==j):.3e}, " + + f"{sum(nress[k] for k, i in enumerate(dic['map_info']) if i==j):.3e}, " + + f"{sum(liniters[k] for k, i in enumerate(dic['map_info']) if i==j):.3e}, " + + f"{sum(runtimes[k] for k, i in enumerate(dic['map_info']) if i==j):.3e}, " + + f"{sum(tlinsols[k] for k, i in enumerate(dic['map_info']) if i==j):.3e}" ) with open( f"{dic['where']}/{dic['case']}_performance_time_series.csv", @@ -340,11 +338,224 @@ def performance(dic): file.write("\n".join(dic["text"])) +def create_from_summary(dic): + """Use the summary arrays for the sparse data interpolation""" + if dic["use"] == "opm": + for key in dic["smspec"].keys(): + if key[0:4] == "BGPR": + if len(dic["pop1"]) == 0: + dic["pop1"] = [ + dic["pressure"][0][dic["fipnum"].index(8)] * 1.0e5 + ] + list( + dic["smspec"][key] * 1.0e5 + ) # Pa + else: + dic["pop2"] = [ + dic["pressure"][0][dic["fipnum"].index(9)] * 1.0e5 + ] + list( + dic["smspec"][key] * 1.0e5 + ) # Pa + break + dic["moba"] = ( + dic["smspec"]["RGCDM:2"] + + dic["smspec"]["RGCDM:4"] + + dic["smspec"]["RGCDM:5"] + + dic["smspec"]["RGCDM:8"] + ) * KMOL_TO_KG + dic["imma"] = ( + dic["smspec"]["RGCDI:2"] + + dic["smspec"]["RGCDI:4"] + + dic["smspec"]["RGCDI:5"] + + dic["smspec"]["RGCDI:8"] + ) * KMOL_TO_KG + dic["dissa"] = ( + dic["smspec"]["RWCD:2"] + + dic["smspec"]["RWCD:4"] + + dic["smspec"]["RWCD:5"] + + dic["smspec"]["RWCD:8"] + ) * KMOL_TO_KG + dic["seala"] = ( + dic["smspec"]["RWCD:5"] + + dic["smspec"]["RGCDM:5"] + + dic["smspec"]["RGCDI:5"] + + dic["smspec"]["RWCD:8"] + + dic["smspec"]["RGCDM:8"] + + dic["smspec"]["RGCDI:8"] + ) * KMOL_TO_KG + dic["mobb"] = (dic["smspec"]["RGCDM:3"] + dic["smspec"]["RGCDM:6"]) * KMOL_TO_KG + dic["immb"] = (dic["smspec"]["RGCDI:3"] + dic["smspec"]["RGCDI:6"]) * KMOL_TO_KG + dic["dissb"] = (dic["smspec"]["RWCD:3"] + dic["smspec"]["RWCD:6"]) * KMOL_TO_KG + dic["sealb"] = ( + dic["smspec"]["RWCD:6"] + + dic["smspec"]["RGCDM:6"] + + dic["smspec"]["RGCDI:6"] + ) * KMOL_TO_KG + dic["sealt"] = ( + dic["seala"] + + dic["sealb"] + + ( + dic["smspec"]["RWCD:7"] + + dic["smspec"]["RGCDM:7"] + + dic["smspec"]["RGCDI:7"] + + dic["smspec"]["RWCD:8"] + + dic["smspec"]["RGCDM:8"] + + dic["smspec"]["RGCDI:8"] + ) + * KMOL_TO_KG + ) + if dic["case"] != "spe11a": + sealbound = ( + dic["smspec"]["RWCD:10"] + + dic["smspec"]["RGCDM:10"] + + dic["smspec"]["RGCDI:10"] + ) * KMOL_TO_KG + dic["sealt"] += sealbound + dic["boundtot"] = ( + sealbound + + ( + dic["smspec"]["RWCD:11"] + + dic["smspec"]["RGCDM:11"] + + dic["smspec"]["RGCDI:11"] + ) + * KMOL_TO_KG + ) + else: + for key in dic["smspec"].keys(): + if key[0:4] == "BGPR": + if len(dic["pop1"]) == 0: + dic["pop1"] = [ + dic["pressure"][0][dic["fipnum"].index(8)] * 1.0e5 + ] + list( + dic["smspec"][key].values * 1.0e5 + ) # Pa + else: + dic["pop2"] = [ + dic["pressure"][0][dic["fipnum"].index(9)] * 1.0e5 + ] + list( + dic["smspec"][key].values * 1.0e5 + ) # Pa + break + dic["moba"] = ( + dic["smspec"]["RGCDM:2"].values + + dic["smspec"]["RGCDM:4"].values + + dic["smspec"]["RGCDM:5"].values + + dic["smspec"]["RGCDM:8"].values + ) * KMOL_TO_KG + dic["imma"] = ( + dic["smspec"]["RGCDI:2"].values + + dic["smspec"]["RGCDI:4"].values + + dic["smspec"]["RGCDI:5"].values + + dic["smspec"]["RGCDI:8"].values + ) * KMOL_TO_KG + dic["dissa"] = ( + dic["smspec"]["RWCD:2"].values + + dic["smspec"]["RWCD:4"].values + + dic["smspec"]["RWCD:5"].values + + dic["smspec"]["RWCD:8"].values + ) * KMOL_TO_KG + dic["seala"] = ( + dic["smspec"]["RWCD:5"].values + + dic["smspec"]["RGCDM:5"].values + + dic["smspec"]["RGCDI:5"].values + + dic["smspec"]["RWCD:8"].values + + dic["smspec"]["RGCDM:8"].values + + dic["smspec"]["RGCDI:8"].values + ) * KMOL_TO_KG + dic["mobb"] = ( + dic["smspec"]["RGCDM:3"].values + dic["smspec"]["RGCDM:6"].values + ) * KMOL_TO_KG + dic["immb"] = ( + dic["smspec"]["RGCDI:3"].values + dic["smspec"]["RGCDI:6"].values + ) * KMOL_TO_KG + dic["dissb"] = ( + dic["smspec"]["RWCD:3"].values + dic["smspec"]["RWCD:6"].values + ) * KMOL_TO_KG + dic["sealb"] = ( + dic["smspec"]["RWCD:6"].values + + dic["smspec"]["RGCDM:6"].values + + dic["smspec"]["RGCDI:6"].values + ) * KMOL_TO_KG + dic["sealt"] = ( + dic["seala"] + + dic["sealb"] + + ( + dic["smspec"]["RWCD:7"].values + + dic["smspec"]["RGCDM:7"].values + + dic["smspec"]["RGCDI:7"].values + + dic["smspec"]["RWCD:9"].values + + dic["smspec"]["RGCDM:9"].values + + dic["smspec"]["RGCDI:9"].values + ) + * KMOL_TO_KG + ) + if dic["case"] != "spe11a": + sealbound = ( + dic["smspec"]["RWCD:10"].values + + dic["smspec"]["RGCDM:10"].values + + dic["smspec"]["RGCDI:10"].values + ) * KMOL_TO_KG + dic["sealt"] += sealbound + dic["boundtot"] = ( + sealbound + + ( + dic["smspec"]["RWCD:11"].values + + dic["smspec"]["RGCDM:11"].values + + dic["smspec"]["RGCDI:11"].values + ) + * KMOL_TO_KG + ) + return dic + + +def create_from_restart(dic): + """Use the restart file for the sparse data interpolation""" + dic["boxa"] = [i for i, fip in enumerate(dic["fipnum"]) if fip in (2, 4, 5, 8)] + dic["boxb"] = [i for i, fip in enumerate(dic["fipnum"]) if fip in (3, 6)] + dic["sensor1"] = dic["fipnum"].index(8) + dic["sensor2"] = dic["fipnum"].index(9) + dic["facie1"] = [sat == 1 for sat in dic["satnum"]] + dic["facie1ind"] = [i for i, sat in enumerate(dic["satnum"]) if sat == 1] + dic["boundariesind"] = [i for i, fip in enumerate(dic["fipnum"]) if fip in (10, 11)] + for j in range(dic["t1_rst"], dic["norst"]): + sgas = list(dic["sgas"][j]) + rhog = list(dic["gas_den"][j]) + k_r = list(dic["gaskr"][j]) + rhow = list(dic[f"{dic['watDen']}"][j]) + r_s = list(dic[f"{dic['r_s']}"][j]) + krp = [k_rr > 0 for k_rr in k_r] + krm = [k_rr <= 0 for k_rr in k_r] + co2_g = [sga * rho * por for (sga, rho, por) in zip(sgas, rhog, dic["porva"])] + co2_d = [ + rss * rho * (1.0 - sga) * por * GAS_DEN_REF / WAT_DEN_REF + for (rss, rho, sga, por) in zip(r_s, rhow, sgas, dic["porva"]) + ] + dic["pop1"].append(dic["pressure"][j][dic["sensor1"]] * 1e5) # Pa + dic["pop2"].append(dic["pressure"][j][dic["sensor2"]] * 1e5) + dic["moba"].append(sum(co2_g[i] * krp[i] for i in dic["boxa"])) + dic["imma"].append(sum(co2_g[i] * krm[i] for i in dic["boxa"])) + dic["dissa"].append(sum(co2_d[i] for i in dic["boxa"])) + dic["seala"].append( + sum((co2_g[i] + co2_d[i]) * dic["facie1"][i] for i in dic["boxa"]) + ) + dic["mobb"].append(sum(co2_g[i] * krp[i] for i in dic["boxb"])) + dic["immb"].append(sum(co2_g[i] * krm[i] for i in dic["boxb"])) + dic["dissb"].append(sum(co2_d[i] for i in dic["boxb"])) + dic["sealb"].append( + sum((co2_g[i] + co2_d[i]) * dic["facie1"][i] for i in dic["boxb"]) + ) + dic["sealt"].append(sum((co2_g[i] + co2_d[i]) for i in dic["facie1ind"])) + if dic["case"] != "spe11a": + dic["boundtot"].append( + sum((co2_g[i] + co2_d[i]) for i in dic["boundariesind"]) + ) + return dic + + def sparse_data(dic): """Compute the quantities in boxes A, B, and C""" - for ent in [ - "ip1c", - "ip2c", + dic["names"] = [ + "pop1", + "pop2", "moba", "imma", "dissa", @@ -354,33 +565,37 @@ def sparse_data(dic): "dissb", "sealb", "m_c", - "sealtot", - ]: - dic[ent] = [] + "sealt", + ] if dic["case"] != "spe11a": - dic["boundtot"] = [] - dic["boxa"] = [i for i, fip in enumerate(dic["fipnum"]) if fip in (2, 4, 5)] - dic["boxb"] = [i for i, fip in enumerate(dic["fipnum"]) if fip == 3] + dic["names"] += ["boundtot"] + for ent in dic["names"]: + dic[ent] = [] + dic["times_s"] = np.linspace( + 0, dic["times"][-1], round(dic["times"][-1] / dic["sparse_t"]) + 1 + ) + if dic["load"] == "summary": + dic = create_from_summary(dic) + else: + dic = create_from_restart(dic) + dic = compute_m_c( + dic + ) # Using the restart data until implemented in OPM Flow summary + write_sparse_data(dic) + + +def compute_m_c(dic): + """Normalized total variation of the concentration field within Box C""" dic["boxc"] = np.array([fip == 4 for fip in dic["fipnum"]]) dic["boxc_x"] = list(np.roll(dic["boxc"], 1)) dic["boxc_y"] = list(np.roll(dic["boxc"], -dic["gxyz"][0])) dic["boxc_z"] = list(np.roll(dic["boxc"], -dic["gxyz"][0] * dic["gxyz"][1])) dic["boxc"] = [i for i, fip in enumerate(dic["fipnum"]) if fip == 4] - dic["boxc_z"] = [i for i, fip in enumerate(dic["boxc_z"]) if fip == 1] - dic["boxc_y"] = [i for i, fip in enumerate(dic["boxc_y"]) if fip == 1] - dic["boxc_x"] = [i for i, fip in enumerate(dic["boxc_x"]) if fip == 1] - dic["sensor1"] = dic["fipnum"].index(5) - dic["sensor2"] = dic["fipnum"].index(6) - dic["facie1"] = [sat == 1 for sat in dic["satnum"]] - dic["facie1ind"] = [i for i, sat in enumerate(dic["satnum"]) if sat == 1] - dic["boundariesind"] = [i for i, fip in enumerate(dic["fipnum"]) if fip == 7] - write_sparse_data(dic) - - -def max_xcw(dic): - """Get the maximum CO2 mass fraction in the liquid phase""" - dic["xcw_max"] = 0 - for j in range(dic["t1_rst"], dic["norst"]): + dic["boxc_z"] = [i for i, val in enumerate(dic["boxc_z"]) if val == 1] + dic["boxc_y"] = [i for i, val in enumerate(dic["boxc_y"]) if val == 1] + dic["boxc_x"] = [i for i, val in enumerate(dic["boxc_x"]) if val == 1] + dic = max_xcw(dic) + for j in range(dic["t1_rst"] + 1, dic["norst"]): sgas = list(dic["sgas"][j]) rhow = list(dic[f"{dic['watDen']}"][j]) r_s = list(dic[f"{dic['r_s']}"][j]) @@ -391,34 +606,100 @@ def max_xcw(dic): h2o_l = [ (1 - sga) * rho * por for (sga, rho, por) in zip(sgas, rhow, dic["porva"]) ] - xcw = [co2 / (co2 + h2o) for (co2, h2o) in zip(co2_d, h2o_l)] - xcw_max = max(xcw[i] for i in dic["boxc"]) - dic["xcw_max"] = max(xcw_max, dic["xcw_max"]) + dic["xcw"] = [co2 / (co2 + h2o) for (co2, h2o) in zip(co2_d, h2o_l)] + if dic["xcw_max"] != 0: + dic["xcw"] = [xcw / dic["xcw_max"] for xcw in dic["xcw"]] + if dic["case"] != "spe11c": + dic["m_c"].append( + sum( + abs((dic["xcw"][i_x] - dic["xcw"][i]) * dic["dz"][i]) + + abs((dic["xcw"][i_z] - dic["xcw"][i]) * dic["dx"][i]) + for (i, i_x, i_z) in zip(dic["boxc"], dic["boxc_x"], dic["boxc_z"]) + ) + ) + else: + dic["m_c"].append( + sum( + abs((dic["xcw"][i_x] - dic["xcw"][i]) * dic["dy"][i] * dic["dz"][i]) + + abs( + (dic["xcw"][i_y] - dic["xcw"][i]) * dic["dx"][i] * dic["dz"][i] + ) + + abs( + (dic["xcw"][i_z] - dic["xcw"][i]) * dic["dx"][i] * dic["dy"][i] + ) + for (i, i_x, i_y, i_z) in zip( + dic["boxc"], dic["boxc_x"], dic["boxc_y"], dic["boxc_z"] + ) + ) + ) return dic def write_sparse_data(dic): - """Map the quantities to the locations""" - dic = max_xcw(dic) + """Routine to write the sparse data""" + for name in dic["names"]: + if dic["load"] == "summary": + if name == "m_c": + interp = interp1d( + [0.0] + dic["times"], + [0.0] + dic[f"{name}"], + fill_value="extrapolate", + ) + elif "pop" in name: + interp = interp1d( + [0.0] + dic["times_ts"], + dic[f"{name}"], + fill_value="extrapolate", + ) + else: + interp = interp1d( + [0.0] + dic["times_ts"], + [0.0] + list(dic[f"{name}"]), + fill_value="extrapolate", + ) + else: + if name == "m_c": + interp = interp1d( + [0.0] + dic["times"], + [0.0] + dic[f"{name}"], + fill_value="extrapolate", + ) + else: + interp = interp1d( + [0.0] + dic["times"], + dic[f"{name}"], + fill_value="extrapolate", + ) + dic[f"{name}"] = interp(dic["times_s"]) text = [ "# t [s], p1 [Pa], p2 [Pa], mobA [kg], immA [kg], dissA [kg], sealA [kg], " + ", MC [m^2], sealTot [kg]" ] if dic["case"] != "spe11a": text[-1] += ", boundTot [kg]" - for tim, j in enumerate(range(dic["t1_rst"], dic["norst"])): - print( - f"Processing sparse data {j+1-dic['t1_rst']} out " - + f"of {dic['norst']-dic['t1_rst']}" + for j, time in enumerate(dic["times_s"]): + text.append( + f"{time:.3e},{dic['pop1'][j]:.3e},{dic['pop2'][j]:.3e}" + f",{dic['moba'][j]:.3e},{dic['imma'][j]:.3e},{dic['dissb'][j]:.3e}" + f",{dic['seala'][j]:.3e},{dic['mobb'][j]:.3e},{dic['immb'][j]:.3e}" + f",{dic['dissb'][j]:.3e},{dic['sealb'][j]:.3e},{dic['m_c'][j]:.3e}" + f",{dic['sealt'][j]:.3e}" ) + if dic["case"] != "spe11a": + text[-1] += f",{dic['boundtot'][j]:.3e}" + with open( + f"{dic['where']}/{dic['case']}_time_series.csv", "w", encoding="utf8" + ) as file: + file.write("\n".join(text)) + + +def max_xcw(dic): + """Get the maximum CO2 mass fraction in the liquid phase""" + dic["xcw_max"] = 0 + for j in range(dic["t1_rst"], dic["norst"]): sgas = list(dic["sgas"][j]) - rhog = list(dic["gas_den"][j]) - k_r = list(dic["gaskr"][j]) rhow = list(dic[f"{dic['watDen']}"][j]) r_s = list(dic[f"{dic['r_s']}"][j]) - krp = [k_rr > 0 for k_rr in k_r] - krm = [k_rr <= 0 for k_rr in k_r] - co2_g = [sga * rho * por for (sga, rho, por) in zip(sgas, rhog, dic["porva"])] co2_d = [ rss * rho * (1.0 - sga) * por * GAS_DEN_REF / WAT_DEN_REF for (rss, rho, sga, por) in zip(r_s, rhow, sgas, dic["porva"]) @@ -426,60 +707,18 @@ def write_sparse_data(dic): h2o_l = [ (1 - sga) * rho * por for (sga, rho, por) in zip(sgas, rhow, dic["porva"]) ] - dic["xcw"] = [co2 / (co2 + h2o) for (co2, h2o) in zip(co2_d, h2o_l)] - if dic["xcw_max"] != 0: - dic["xcw"] = [xcw / dic["xcw_max"] for xcw in dic["xcw"]] - dic["ip1c"] = dic["pressure"][j][dic["sensor1"]] * 1e5 # Pa - dic["ip2c"] = dic["pressure"][j][dic["sensor2"]] * 1e5 - dic["moba"] = sum(co2_g[i] * krp[i] for i in dic["boxa"]) - dic["imma"] = sum(co2_g[i] * krm[i] for i in dic["boxa"]) - dic["dissa"] = sum(co2_d[i] for i in dic["boxa"]) - dic["seala"] = sum( - (co2_g[i] + co2_d[i]) * dic["facie1"][i] for i in dic["boxa"] - ) - dic["mobb"] = sum(co2_g[i] * krp[i] for i in dic["boxb"]) - dic["immb"] = sum(co2_g[i] * krm[i] for i in dic["boxb"]) - dic["dissb"] = sum(co2_d[i] for i in dic["boxb"]) - dic["sealb"] = sum( - (co2_g[i] + co2_d[i]) * dic["facie1"][i] for i in dic["boxb"] - ) - dic["sealtot"] = sum((co2_g[i] + co2_d[i]) for i in dic["facie1ind"]) - if dic["case"] != "spe11c": - dic["m_c"] = sum( - abs((dic["xcw"][i_x] - dic["xcw"][i]) * dic["dz"][i]) - + abs((dic["xcw"][i_z] - dic["xcw"][i]) * dic["dx"][i]) - for (i, i_x, i_z) in zip(dic["boxc"], dic["boxc_x"], dic["boxc_z"]) - ) - else: - dic["m_c"] = sum( - abs((dic["xcw"][i_x] - dic["xcw"][i]) * dic["dy"][i] * dic["dz"][i]) - + abs((dic["xcw"][i_y] - dic["xcw"][i]) * dic["dx"][i] * dic["dz"][i]) - + abs((dic["xcw"][i_z] - dic["xcw"][i]) * dic["dx"][i] * dic["dy"][i]) - for (i, i_x, i_y, i_z) in zip( - dic["boxc"], dic["boxc_x"], dic["boxc_y"], dic["boxc_z"] - ) - ) - text.append( - f"{dic['d_t']*tim:.3e},{dic['ip1c']:.3e},{dic['ip2c']:.3e}" - f",{dic['moba']:.3e},{dic['imma']:.3e},{dic['dissa']:.3e}" - f",{dic['seala']:.3e},{dic['mobb']:.3e},{dic['immb']:.3e}" - f",{dic['dissb']:.3e},{dic['sealb']:.3e},{dic['m_c']:.3e}" - f",{dic['sealtot']:.3e}" - ) - if dic["case"] != "spe11a": - dic["boundtot"] = sum((co2_g[i] + co2_d[i]) for i in dic["boundariesind"]) - text[-1] += f",{dic['boundtot']:.3e}" - - with open( - f"{dic['where']}/{dic['case']}_time_series.csv", "w", encoding="utf8" - ) as file: - file.write("\n".join(text)) + xcw = [co2 / (co2 + h2o) for (co2, h2o) in zip(co2_d, h2o_l)] + xcw_max = max(xcw[i] for i in dic["boxc"]) + dic["xcw_max"] = max(xcw_max, dic["xcw_max"]) + return dic def dense_data(dic): """Write the quantities with the benchmark format""" d_s = round(dic["spatial_t"] / dic["d_t"]) - n_t = round((dic["times"][-1 - dic["t0_rst"]] + dic["d_t"]) / dic["spatial_t"]) + n_t = int( + np.floor((dic["times"][-1 - dic["t0_rst"]] + dic["d_t"]) / dic["spatial_t"]) + ) for i, j, k in zip(["x", "y", "z"], dic["dims"], dic["nxyz"]): temp = np.linspace(0, j, k + 1) dic[f"ref{i}cent"] = 0.5 * (temp[1:] + temp[:-1]) diff --git a/src/pyopmspe11/visualization/plotting.py b/src/pyopmspe11/visualization/plotting.py index 7f33cef..83a9184 100644 --- a/src/pyopmspe11/visualization/plotting.py +++ b/src/pyopmspe11/visualization/plotting.py @@ -13,7 +13,7 @@ import matplotlib.pyplot as plt from mpl_toolkits.axes_grid1 import make_axes_locatable -font = {"family": "normal", "weight": "normal", "size": 15} +font = {"family": "normal", "weight": "normal", "size": 20} matplotlib.rc("font", **font) plt.rcParams.update( { @@ -23,7 +23,7 @@ "legend.handlelength": 3.5, "legend.fontsize": 15, "lines.linewidth": 4, - "axes.titlesize": 15, + "axes.titlesize": 20, "axes.grid": True, "figure.figsize": (10, 5), } @@ -120,8 +120,6 @@ def plot_results(dic): if "compare" not in dic["folders"]: os.system(f"mkdir {dic['exe']}/compare") else: - os.system(f"rm -rf {dic['exe']}/compare") - os.system(f"mkdir {dic['exe']}/compare") dic["folders"].remove("compare") else: dic["where"] = f"{dic['exe']}/{dic['folders'][0]}/figures" @@ -193,7 +191,7 @@ def performance(dic): ] times = [csv[i][0] / dic["tscale"] for i in range(csv.shape[0])] labels[k] += f" ({fol})" - axis.plot( + axis.step( times, [csv[i][k + 1] for i in range(csv.shape[0])], lw=2, diff --git a/tests/configs/input.txt b/tests/configs/input.txt index daa1596..fd43cb6 100644 --- a/tests/configs/input.txt +++ b/tests/configs/input.txt @@ -1,5 +1,5 @@ """Set the full path to the flow executable and flags""" -flow --linear-solver=cprw --enable-tuning=true --enable-opm-rst-file=true --output-extra-convergence-info=steps,iterations --enable-well-operability-check=false --min-time-step-before-shutting-problematic-wells-in-days=1e-99 +flow --linear-solver=cprw --newton-min-iterations=1 --enable-tuning=true --enable-opm-rst-file=true --output-extra-convergence-info=steps,iterations --enable-well-operability-check=false --min-time-step-before-shutting-problematic-wells-in-days=1e-99 """Set the model parameters""" spe11b release #Name of the spe case (spe11a, spe11b, or spe11c) and OPM Flow version (master or release) @@ -24,13 +24,13 @@ penmax * math.erf(pen * ((s_w-swi) / (1.-swi)) ** (-(1.0 / 1.5)) * math.pi**0.5 """Properties sat functions""" """swi [-], sni [-], pen [Pa], penmax [Pa], npoints [-]""" -SWI1 0.32 SNI1 0.1 PEN1 193531.39 PENMAX1 3e7 NPOINTS1 200000 -SWI2 0.14 SNI2 0.1 PEN2 8654.99 PENMAX2 3e7 NPOINTS2 200000 -SWI3 0.12 SNI3 0.1 PEN3 6120.00 PENMAX3 3e7 NPOINTS3 200000 -SWI4 0.12 SNI4 0.1 PEN4 3870.63 PENMAX4 3e7 NPOINTS4 200000 -SWI5 0.12 SNI5 0.1 PEN5 3060.00 PENMAX5 3e7 NPOINTS5 200000 -SWI6 0.10 SNI6 0.1 PEN6 2560.18 PENMAX6 3e7 NPOINTS6 200000 -SWI7 0 SNI7 0 PEN7 0 PENMAX7 3e7 NPOINTS7 2 +SWI1 0.32 SNI1 0.1 PEN1 193531.39 PENMAX1 3e7 NPOINTS1 500 +SWI2 0.14 SNI2 0.1 PEN2 8654.99 PENMAX2 3e7 NPOINTS2 500 +SWI3 0.12 SNI3 0.1 PEN3 6120.00 PENMAX3 3e7 NPOINTS3 500 +SWI4 0.12 SNI4 0.1 PEN4 3870.63 PENMAX4 3e7 NPOINTS4 500 +SWI5 0.12 SNI5 0.1 PEN5 3060.00 PENMAX5 3e7 NPOINTS5 500 +SWI6 0.10 SNI6 0.1 PEN6 2560.18 PENMAX6 3e7 NPOINTS6 500 +SWI7 0 SNI7 0 PEN7 0 PENMAX7 3e7 NPOINTS7 2 """Properties rock""" """K [mD], phi [-], thconr [W m-1 K-1]""" @@ -49,6 +49,4 @@ PERM7 0 PORO7 0 THCONR7 2.00 """Define the injection values ([hours] for spe11a; [years] for spe11b/c)""" """injection time, time step size to write results, maximum solver time step, injected fluid (0 water, 1 co2) (well1), injection rate [kg/s] (well1), temperature [C] (well1), injected fluid (0 water, 1 co2) (well2), ...""" -15 15 1 0 0 10 0 0 10 - 5 5 1 0 0 10 0 0 10 -25 5 1 1 0.035 10 1 0.035 10 +25 5 1 1 0.035 10 1 0.035 10 diff --git a/tests/configs/spe11a.txt b/tests/configs/spe11a.txt index 9eb35ff..6881908 100644 --- a/tests/configs/spe11a.txt +++ b/tests/configs/spe11a.txt @@ -1,5 +1,5 @@ """Set the full path to the flow executable and flags""" -flow --linear-solver=cprw --enable-tuning=true --enable-opm-rst-file=true --output-extra-convergence-info=steps,iterations --enable-well-operability-check=false --min-time-step-before-shutting-problematic-wells-in-days=1e-99 +flow --linear-solver=cprw --newton-min-iterations=1 --enable-tuning=true --enable-opm-rst-file=true --output-extra-convergence-info=steps,iterations --enable-well-operability-check=false --min-time-step-before-shutting-problematic-wells-in-days=1e-99 """Set the model parameters""" spe11a release #Name of the spe case (spe11a, spe11b, or spe11c) and OPM Flow version (master or release) diff --git a/tests/configs/spe11c.txt b/tests/configs/spe11c.txt index ca3c0e6..dee9fed 100644 --- a/tests/configs/spe11c.txt +++ b/tests/configs/spe11c.txt @@ -1,5 +1,5 @@ """Set the full path to the flow executable and flags""" -flow --enable-tuning=true --enable-opm-rst-file=true --output-extra-convergence-info=steps,iterations --enable-well-operability-check=false --min-time-step-before-shutting-problematic-wells-in-days=1e-99 +flow --enable-tuning=true --newton-min-iterations=1 --enable-opm-rst-file=true --output-extra-convergence-info=steps,iterations --enable-well-operability-check=false --min-time-step-before-shutting-problematic-wells-in-days=1e-99 """Set the model parameters""" spe11c release #Name of the spe case (spe11a, spe11b, or spe11c) and OPM Flow version (master or release) @@ -24,13 +24,13 @@ penmax * math.erf(pen * ((s_w-swi) / (1.-swi)) ** (-(1.0 / 1.5)) * math.pi**0.5 """Properties sat functions""" """swi [-], sni [-], pen [Pa], penmax [Pa], npoints [-]""" -SWI1 0.32 SNI1 0.1 PEN1 193531.39 PENMAX1 3e7 NPOINTS1 200000 -SWI2 0.14 SNI2 0.1 PEN2 8654.99 PENMAX2 3e7 NPOINTS2 200000 -SWI3 0.12 SNI3 0.1 PEN3 6120.00 PENMAX3 3e7 NPOINTS3 200000 -SWI4 0.12 SNI4 0.1 PEN4 3870.63 PENMAX4 3e7 NPOINTS4 200000 -SWI5 0.12 SNI5 0.1 PEN5 3060.00 PENMAX5 3e7 NPOINTS5 200000 -SWI6 0.10 SNI6 0.1 PEN6 2560.18 PENMAX6 3e7 NPOINTS6 200000 -SWI7 0 SNI7 0 PEN7 0 PENMAX7 3e7 NPOINTS7 2 +SWI1 0.32 SNI1 0.1 PEN1 193531.39 PENMAX1 3e7 NPOINTS1 2000 +SWI2 0.14 SNI2 0.1 PEN2 8654.99 PENMAX2 3e7 NPOINTS2 2000 +SWI3 0.12 SNI3 0.1 PEN3 6120.00 PENMAX3 3e7 NPOINTS3 2000 +SWI4 0.12 SNI4 0.1 PEN4 3870.63 PENMAX4 3e7 NPOINTS4 2000 +SWI5 0.12 SNI5 0.1 PEN5 3060.00 PENMAX5 3e7 NPOINTS5 2000 +SWI6 0.10 SNI6 0.1 PEN6 2560.18 PENMAX6 3e7 NPOINTS6 2000 +SWI7 0 SNI7 0 PEN7 0 PENMAX7 3e7 NPOINTS7 2 """Properties rock""" """K [mD], phi [-], thconr [W m-1 K-1]""" @@ -49,6 +49,5 @@ PERM7 0 PORO7 0 THCONR7 2.00 """Define the injection values ([hours] for spe11a; [years] for spe11b/c)""" """injection time, time step size to write results, maximum solver time step, injected fluid (0 water, 1 co2) (well1), injection rate [kg/s] (well1), temperature [C] (well1), injected fluid (0 water, 1 co2) (well2), ...""" -15 15 1 0 0 10 0 0 10 5 5 1 0 0 10 0 0 10 25 5 1 1 50 10 1 50 10