From 797fac608012f7281f35da62a10ead123e0bfda6 Mon Sep 17 00:00:00 2001
From: Andreas Lauser <and@poware.org>
Date: Tue, 10 Jan 2012 10:34:04 +0000
Subject: [PATCH] remove patches direcory, rename 'util' to 'bin', update
richards reference solution
no patches are required anymore, DUNE uses 'bin' for executable files
and the richards model has been fixed yesterday
git-svn-id: svn://svn.iws.uni-stuttgart.de/DUMUX/dumux/trunk@7321 2fb0f335-1f38-0410-981e-8018bf24f1b0
---
CMakeLists.txt | 36 +++---
{util => bin}/runTest.sh | 0
patches/README | 14 ---
patches/README.patches | 24 ----
patches/dune-istl-2.0.patch | 26 ----
patches/dune-istl-dune-trunk-r6271.patch | 38 ------
patches/patch_data_inputfile.checkout-dumux | 9 --
.../richards/richardslens-reference.vtu | 116 +++++++++---------
8 files changed, 76 insertions(+), 187 deletions(-)
rename {util => bin}/runTest.sh (100%)
delete mode 100644 patches/README
delete mode 100644 patches/README.patches
delete mode 100644 patches/dune-istl-2.0.patch
delete mode 100644 patches/dune-istl-dune-trunk-r6271.patch
delete mode 100644 patches/patch_data_inputfile.checkout-dumux
diff --git a/CMakeLists.txt b/CMakeLists.txt
index fec403c88a..2a8388c153 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -182,8 +182,8 @@ add_subdirectory("tutorial")
##############
# copy the testing script
-make_directory(util)
-file(COPY util/runTest.sh DESTINATION util)
+make_directory(bin)
+file(COPY bin/runTest.sh DESTINATION bin)
file(COPY test/boxmodels/1p/1ptest-reference.vtu DESTINATION test/boxmodels/1p)
file(COPY test/boxmodels/1p2c/tissue-reference.vtu DESTINATION test/boxmodels/1p2c)
file(COPY test/boxmodels/2p/lens-reference.vtu DESTINATION test/boxmodels/2p)
@@ -204,28 +204,28 @@ file(COPY test/common/generalproblem/generallens_decoupled-reference.vtu DESTINA
ENABLE_TESTING()
INCLUDE(CTest)
add_test(test_propertysystem test/common/propertysystem/test_propertysystem)
-add_test(test_general_box util/runTest.sh test/common/generalproblem/generallens_box-reference.vtu generallens_box-00003.vtu test/common/generalproblem/test_generalproblem_2p --box 1e2 2e1)
-add_test(test_general_dec util/runTest.sh test/common/generalproblem/generallens_decoupled-reference.vtu generallens_decoupled-00003.vtu test/common/generalproblem/test_generalproblem_2p --decoupled 1e2 2e1)
+add_test(test_general_box bin/runTest.sh test/common/generalproblem/generallens_box-reference.vtu generallens_box-00003.vtu test/common/generalproblem/test_generalproblem_2p --box 1e2 2e1)
+add_test(test_general_dec bin/runTest.sh test/common/generalproblem/generallens_decoupled-reference.vtu generallens_decoupled-00003.vtu test/common/generalproblem/test_generalproblem_2p --decoupled 1e2 2e1)
add_test(test_spline test/common/spline/test_spline)
add_test(test_fluidsystems test/material/fluidsystems/test_fluidsystems)
add_test(test_ncpflash test/material/ncpflash/test_ncpflash)
add_test(test_tabulation test/material/tabulation/test_tabulation)
-add_test(test_1p util/runTest.sh test/boxmodels/1p/1ptest-reference.vtu 1ptest-00002.vtu test/boxmodels/1p/test_1p test/boxmodels/1p/grids/test_1p_2d.dgf 1 1)
-add_test(test_1p2c util/runTest.sh test/boxmodels/1p2c/tissue-reference.vtu tissue-00003.vtu test/boxmodels/1p2c/test_1p2c test/boxmodels/1p2c/grids/test_1p2c.dgf 2e3 1e3)
-add_test(test_2p util/runTest.sh test/boxmodels/2p/lens-reference.vtu lens-00010.vtu test/boxmodels/2p/test_2p 3000 250)
-add_test(test_2pni util/runTest.sh test/boxmodels/2pni/injection2pni-reference.vtu injection2pni-00009.vtu test/boxmodels/2pni/test_2pni test/boxmodels/2pni/grids/test_2pni.dgf 1e4 250)
-add_test(test_2p2c util/runTest.sh test/boxmodels/2p2c/injection-reference.vtu injection-00009.vtu test/boxmodels/2p2c/test_2p2c test/boxmodels/2p2c/grids/test_2p2c.dgf 1e4 250)
-add_test(test_2p2cni util/runTest.sh test/boxmodels/2p2cni/waterair-reference.vtu waterair-00010.vtu test/boxmodels/2p2cni/test_2p2cni test/boxmodels/2p2cni/grids/test_2p2cni.dgf 1e4 250)
-add_test(test_MpNc util/runTest.sh test/boxmodels/MpNc/obstacle-reference.vtu obstacle-00010.vtu test/boxmodels/MpNc/test_MpNc test/boxmodels/MpNc/grids/obstacle_24x16.dgf 1e4 250)
-add_test(test_richards util/runTest.sh test/boxmodels/richards/richardslens-reference.vtu richardslens-00018.vtu test/boxmodels/richards/test_richards test/boxmodels/richards/grids/richardslens-24x16.dgf 3000 100)
-
-#add_test(test_diffusion util/runTest.sh test/decoupled/1p/diffusion-reference.vtu mimeticdiffusion-00001.vtu test/decoupled/1p/test_diffusion 3)
-#add_test(test_dec1p util/runTest.sh test/decoupled/1p/test_1p-reference.vtu test_1p-00001.vtu test/decoupled/1p/test_dec1p 3)
-#add_test(test_transport util/runTest.sh test/decoupled/2p/test_transport-reference.vtu test_transport-00006.vtu test/decoupled/2p/test_transport test/decoupled/2p/grids/test_transport.dgf 1e4)
-#add_test(test_impes util/runTest.sh test/decoupled/2p/test_impes-reference.vtu test_impes-00013.vtu test/decoupled/2p/test_impes 1e7)
-#add_test(test_dec2p2c util/runTest.sh test/decoupled/2p2c/test_dec2p2c-reference.vtu test_dec2p2c-00021.vtu test/decoupled/2p2c/test_dec2p2c)
+add_test(test_1p bin/runTest.sh test/boxmodels/1p/1ptest-reference.vtu 1ptest-00002.vtu test/boxmodels/1p/test_1p test/boxmodels/1p/grids/test_1p_2d.dgf 1 1)
+add_test(test_1p2c bin/runTest.sh test/boxmodels/1p2c/tissue-reference.vtu tissue-00003.vtu test/boxmodels/1p2c/test_1p2c test/boxmodels/1p2c/grids/test_1p2c.dgf 2e3 1e3)
+add_test(test_2p bin/runTest.sh test/boxmodels/2p/lens-reference.vtu lens-00010.vtu test/boxmodels/2p/test_2p 3000 250)
+add_test(test_2pni bin/runTest.sh test/boxmodels/2pni/injection2pni-reference.vtu injection2pni-00009.vtu test/boxmodels/2pni/test_2pni test/boxmodels/2pni/grids/test_2pni.dgf 1e4 250)
+add_test(test_2p2c bin/runTest.sh test/boxmodels/2p2c/injection-reference.vtu injection-00009.vtu test/boxmodels/2p2c/test_2p2c test/boxmodels/2p2c/grids/test_2p2c.dgf 1e4 250)
+add_test(test_2p2cni bin/runTest.sh test/boxmodels/2p2cni/waterair-reference.vtu waterair-00010.vtu test/boxmodels/2p2cni/test_2p2cni test/boxmodels/2p2cni/grids/test_2p2cni.dgf 1e4 250)
+add_test(test_MpNc bin/runTest.sh test/boxmodels/MpNc/obstacle-reference.vtu obstacle-00010.vtu test/boxmodels/MpNc/test_MpNc test/boxmodels/MpNc/grids/obstacle_24x16.dgf 1e4 250)
+add_test(test_richards bin/runTest.sh test/boxmodels/richards/richardslens-reference.vtu richardslens-00008.vtu test/boxmodels/richards/test_richards test/boxmodels/richards/grids/richardslens-24x16.dgf 3000 100)
+
+#add_test(test_diffusion bin/runTest.sh test/decoupled/1p/diffusion-reference.vtu mimeticdiffusion-00001.vtu test/decoupled/1p/test_diffusion 3)
+#add_test(test_dec1p bin/runTest.sh test/decoupled/1p/test_1p-reference.vtu test_1p-00001.vtu test/decoupled/1p/test_dec1p 3)
+#add_test(test_transport bin/runTest.sh test/decoupled/2p/test_transport-reference.vtu test_transport-00006.vtu test/decoupled/2p/test_transport test/decoupled/2p/grids/test_transport.dgf 1e4)
+#add_test(test_impes bin/runTest.sh test/decoupled/2p/test_impes-reference.vtu test_impes-00013.vtu test/decoupled/2p/test_impes 1e7)
+#add_test(test_dec2p2c bin/runTest.sh test/decoupled/2p2c/test_dec2p2c-reference.vtu test_dec2p2c-00021.vtu test/decoupled/2p2c/test_dec2p2c)
add_test(tutorial_coupled tutorial/tutorial_coupled 1 1)
add_test(tutorial_decoupled tutorial/tutorial_decoupled 1)
diff --git a/util/runTest.sh b/bin/runTest.sh
similarity index 100%
rename from util/runTest.sh
rename to bin/runTest.sh
diff --git a/patches/README b/patches/README
deleted file mode 100644
index 2b7ac5c998..0000000000
--- a/patches/README
+++ /dev/null
@@ -1,14 +0,0 @@
-On purpose of this patch directory
-----------------------------------
-DuMuX is based on a certain release of DUNE
-and some of its components or models can make use of
-external libraries and modules.
-
-Sometimes software like a compiler or a standard library
-changes, so it can be useful to adapt these releases in a certain way
-that components will seamless work together.
-It can also be necessary to fix serious bugs in them, but it makes
-not always sense to use a developer version or a more recent release if available.
-
-For fixing such things this directory is made. Files created here contain patches
-against some DUNE release or some other component. Their application should be documented here too.
diff --git a/patches/README.patches b/patches/README.patches
deleted file mode 100644
index edd01d4f45..0000000000
--- a/patches/README.patches
+++ /dev/null
@@ -1,24 +0,0 @@
---------------------------------------
-|Compilation problem with 'dune-istl'|
---------------------------------------
-
-If you use DUNE 2.0 stable release use
-
- dune-istl-2.0.patch
-
-For completeness we contain also a patch against a trunk version of dune-istl
-which an average DUMUX developer will not need, it could be useful in further releases.
-But hopefully it will be obsoleted.
-
- dune-istl-dune-trunk-r6271.patch
-
-Application:
-
- cd $PATH_TO_DUNE_ISTL_2.0
- patch -p1 < $PATH_TO_THIS_PATCHES_FOLDER/dune-istl-2.0.patch
-
- cd $PATH_TO_DUNE_ISTL_TRUNK
- patch -p1 < $PATH_TO_THE_DOWNLOADS_FOLDER/dune-istl-dune-trunk-r6271.patch
-
-The checkout-dumux script applies dune-istl-2.0.patch automatically, if patch application is not switched off.
-
diff --git a/patches/dune-istl-2.0.patch b/patches/dune-istl-2.0.patch
deleted file mode 100644
index 199a662d8d..0000000000
--- a/patches/dune-istl-2.0.patch
+++ /dev/null
@@ -1,26 +0,0 @@
---- dune-istl-2.0/dune/istl/remoteindices.hh.orig 2010-11-26 16:18:39.703876061 +0100
-+++ dune-istl-2.0/dune/istl/remoteindices.hh 2010-11-26 16:20:53.242998985 +0100
-@@ -1412,20 +1412,14 @@
- }
-
- template<typename T, typename A>
-- inline typename std::map<int, std::pair<SLList<typename RemoteIndices<T,A>::RemoteIndex,
-- typename RemoteIndices<T,A>::Allocator >*,
-- SLList<typename RemoteIndices<T,A>::RemoteIndex,
-- typename RemoteIndices<T,A>::Allocator >*> >::const_iterator
-+ inline typename RemoteIndices<T,A>::const_iterator
- RemoteIndices<T,A>::begin() const
- {
- return remoteIndices_.begin();
- }
--
-+
- template<typename T, typename A>
-- inline typename std::map<int, std::pair<SLList<typename RemoteIndices<T,A>::RemoteIndex,
-- typename RemoteIndices<T,A>::Allocator >*,
-- SLList<typename RemoteIndices<T,A>::RemoteIndex,
-- typename RemoteIndices<T,A>::Allocator >*> >::const_iterator
-+ inline typename RemoteIndices<T,A>::const_iterator
- RemoteIndices<T,A>::end() const
- {
- return remoteIndices_.end();
diff --git a/patches/dune-istl-dune-trunk-r6271.patch b/patches/dune-istl-dune-trunk-r6271.patch
deleted file mode 100644
index 8d21b02d6d..0000000000
--- a/patches/dune-istl-dune-trunk-r6271.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-diff --git a/dune/common/parallel/remoteindices.hh b/dune/common/parallel/remoteindices.hh
-index bfb6d43..bb7b0cf 100644
---- a/dune/common/parallel/remoteindices.hh
-+++ b/dune/common/parallel/remoteindices.hh
-@@ -1508,30 +1508,21 @@ namespace Dune{
- }
-
- template<typename T, typename A>
-- inline typename std::map<int, std::pair<SLList<typename RemoteIndices<T,A>::RemoteIndex,
-- typename RemoteIndices<T,A>::Allocator >*,
-- SLList<typename RemoteIndices<T,A>::RemoteIndex,
-- typename RemoteIndices<T,A>::Allocator >*> >::const_iterator
-+ inline typename RemoteIndices<T,A>::const_iterator
- RemoteIndices<T,A>::find(int proc) const
- {
- return remoteIndices_.find(proc);
- }
-
- template<typename T, typename A>
-- inline typename std::map<int, std::pair<SLList<typename RemoteIndices<T,A>::RemoteIndex,
-- typename RemoteIndices<T,A>::Allocator >*,
-- SLList<typename RemoteIndices<T,A>::RemoteIndex,
-- typename RemoteIndices<T,A>::Allocator >*> >::const_iterator
-+ inline typename RemoteIndices<T,A>::const_iterator
- RemoteIndices<T,A>::begin() const
- {
- return remoteIndices_.begin();
- }
-
- template<typename T, typename A>
-- inline typename std::map<int, std::pair<SLList<typename RemoteIndices<T,A>::RemoteIndex,
-- typename RemoteIndices<T,A>::Allocator >*,
-- SLList<typename RemoteIndices<T,A>::RemoteIndex,
-- typename RemoteIndices<T,A>::Allocator >*> >::const_iterator
-+ inline typename RemoteIndices<T,A>::const_iterator
- RemoteIndices<T,A>::end() const
- {
- return remoteIndices_.end();
diff --git a/patches/patch_data_inputfile.checkout-dumux b/patches/patch_data_inputfile.checkout-dumux
deleted file mode 100644
index 540c99e111..0000000000
--- a/patches/patch_data_inputfile.checkout-dumux
+++ /dev/null
@@ -1,9 +0,0 @@
-# This file is made for selection and application of patches by checkout-dumux script
-# it's format is is of four or more fields per line
-# fill in data here only if you are knowing what you do
-#
-# please make sure to work with compatible checkout dumux script
-#
-# <target_directory_relative_to-DUNEROOT> <options_for_patch_command> <name_inputfile_for_patch> <dune_version_number> <comment rows which are displayed to the user>
-dune-istl -p1 dune-istl-2.0.patch 2.0 DUNE ISTL patch
-dune-istl -p1 dune-istl-2.0.patch 2.0.1 DUNE ISTL patch
diff --git a/test/boxmodels/richards/richardslens-reference.vtu b/test/boxmodels/richards/richardslens-reference.vtu
index b0917abfbd..c5b9b7fe79 100644
--- a/test/boxmodels/richards/richardslens-reference.vtu
+++ b/test/boxmodels/richards/richardslens-reference.vtu
@@ -25,20 +25,20 @@
1 1 1 1 1 1 1 1 1 1 1 1
1 1 1 1 1 1 1 1 1 1 1 1
1 1 1 1 1 1 1 1 1 1 1 1
- 1 0.995688 1 0.93831 0.901978 0.911329 0.957072 1 1 1 1 1
1 1 1 1 1 1 1 1 1 1 1 1
- 1 0.986145 0.947985 0.837616 0.818371 0.818375 0.818471 0.818719 0.844096 0.955903 1 1
1 1 1 1 1 1 1 1 1 1 1 1
- 1 0.990456 0.947729 0.947283 0.818472 0.818359 0.818288 0.818281 0.818361 0.818552 0.818875 0.896131
- 0.997355 1 1 1 1 1 1 1 1 1 1 1
- 1 1 0.98928 0.948139 0.947612 0.947256 0.946953 0.9467 0.94654 0.946536 0.946752 0.947178
- 0.947783 0.94867 1 1 1 1 1 1 1 1 1 1
- 1 1 1 1 0.976941 0.948129 0.947648 0.947259 0.946877 0.946543 0.946343 0.946417
- 0.94676 0.947309 0.948189 1 1 1 1 1 1 1 1 1
- 1 1 1 1 1 1 0.974179 0.948248 0.947798 0.947307 0.94677 0.946272
- 0.946131 0.946354 0.946795 0.947725 1 1 1 1 1 1 1 1
- 1 1 1 1 1 1 1 1 0.996485 0.948804 0.948264 0.947509
- 0.946425 0.945932 0.946001 0.946224 0.947142 1 1 1 1 1 1 1
+ 1 1 1 1 1 1 1 1 1 1 1 1
+ 1 1 1 1 1 1 1 1 1 1 1 1
+ 1 1 1 1 1 1 1 1 1 1 1 1
+ 1 1 1 1 1 1 1 1 1 1 1 1
+ 1 1 1 1 1 1 1 1 1 1 0.999976 0.999964
+ 0.999976 1 1 1 1 1 1 1 1 1 1 1
+ 1 1 1 1 1 1 1 1 1 1 0.997534 0.909917
+ 0.905361 0.909917 0.997534 1 1 1 1 1 1 1 1 1
+ 1 1 1 1 1 1 1 1 1 1 0.999 0.771847
+ 0.384776 0.36421 0.384776 0.771847 0.999 1 1 1 1 1 1 1
+ 1 1 1 1 1 1 1 1 1 1 0.999996 0.918527
+ 0.286966 0.0671314 0.0634913 0.0671314 0.286966 0.918527 0.999996 1 1 1 1 1
1 1 1 1 1
</DataArray>
<DataArray type="Float32" Name="Sw" NumberOfComponents="1" format="ascii">
@@ -63,20 +63,20 @@
-5.55112e-17 9.02056e-17 9.02056e-17 9.02056e-17 9.02056e-17 9.02056e-17 9.02056e-17 9.02056e-17 9.02056e-17 9.02056e-17 9.02056e-17 9.02056e-17
9.02056e-17 -5.55112e-17 -5.55112e-17 -5.55112e-17 -5.55112e-17 -5.55112e-17 -5.55112e-17 -5.55112e-17 -5.55112e-17 -5.55112e-17 -5.55112e-17 -5.55112e-17
-5.55112e-17 -5.55112e-17 9.02056e-17 9.02056e-17 9.02056e-17 9.02056e-17 9.02056e-17 9.02056e-17 9.02056e-17 9.02056e-17 9.02056e-17 9.02056e-17
- 9.02056e-17 0.00431171 -5.55112e-17 0.0616897 0.0980221 0.0886708 0.0429282 -5.55112e-17 -5.55112e-17 -5.55112e-17 -5.55112e-17 -5.55112e-17
+ 9.02056e-17 9.02056e-17 -5.55112e-17 -5.55112e-17 -5.55112e-17 -5.55112e-17 -5.55112e-17 -5.55112e-17 -5.55112e-17 -5.55112e-17 -5.55112e-17 -5.55112e-17
-5.55112e-17 -5.55112e-17 -5.55112e-17 9.02056e-17 9.02056e-17 9.02056e-17 9.02056e-17 9.02056e-17 9.02056e-17 9.02056e-17 9.02056e-17 9.02056e-17
- 9.02056e-17 0.0138554 0.0520151 0.162384 0.181629 0.181625 0.181529 0.181281 0.155904 0.0440971 -5.55112e-17 -5.55112e-17
+ 9.02056e-17 9.02056e-17 9.02056e-17 -5.55112e-17 -5.55112e-17 -5.55112e-17 -5.55112e-17 -5.55112e-17 -5.55112e-17 -5.55112e-17 -5.55112e-17 -5.55112e-17
-5.55112e-17 -5.55112e-17 -5.55112e-17 -5.55112e-17 9.02056e-17 9.02056e-17 9.02056e-17 9.02056e-17 9.02056e-17 9.02056e-17 9.02056e-17 9.02056e-17
- 9.02056e-17 0.00954373 0.0522706 0.052717 0.181528 0.181641 0.181712 0.181719 0.181639 0.181448 0.181125 0.103869
- 0.00264543 -5.55112e-17 -5.55112e-17 -5.55112e-17 -5.55112e-17 9.02056e-17 9.02056e-17 9.02056e-17 9.02056e-17 9.02056e-17 9.02056e-17 9.02056e-17
- 9.02056e-17 9.02056e-17 0.0107196 0.0518609 0.0523884 0.052744 0.0530467 0.0533003 0.0534604 0.0534643 0.0532476 0.0528223
- 0.052217 0.0513298 9.02056e-17 9.02056e-17 9.02056e-17 9.02056e-17 9.02056e-17 9.02056e-17 9.02056e-17 9.02056e-17 9.02056e-17 9.02056e-17
- 9.02056e-17 9.02056e-17 9.02056e-17 9.02056e-17 0.023059 0.051871 0.0523519 0.0527409 0.0531226 0.0534567 0.0536566 0.0535826
- 0.0532403 0.0526914 0.0518114 9.02056e-17 9.02056e-17 9.02056e-17 9.02056e-17 9.02056e-17 9.02056e-17 9.02056e-17 9.02056e-17 9.02056e-17
- 9.02056e-17 9.02056e-17 9.02056e-17 9.02056e-17 9.02056e-17 9.02056e-17 0.0258206 0.0517518 0.0522017 0.0526934 0.0532299 0.0537276
- 0.0538686 0.0536459 0.0532046 0.0522752 9.02056e-17 9.02056e-17 9.02056e-17 9.02056e-17 9.02056e-17 9.02056e-17 9.02056e-17 9.02056e-17
- 9.02056e-17 9.02056e-17 9.02056e-17 9.02056e-17 9.02056e-17 9.02056e-17 9.02056e-17 9.02056e-17 0.00351533 0.051196 0.0517355 0.0524908
- 0.0535748 0.0540678 0.0539989 0.0537761 0.0528578 9.02056e-17 9.02056e-17 9.02056e-17 9.02056e-17 9.02056e-17 9.02056e-17 9.02056e-17
+ 9.02056e-17 9.02056e-17 9.02056e-17 9.02056e-17 -5.55112e-17 -5.55112e-17 -5.55112e-17 -5.55112e-17 -5.55112e-17 -5.55112e-17 -5.55112e-17 -5.55112e-17
+ -5.55112e-17 -5.55112e-17 -5.55112e-17 -5.55112e-17 -5.55112e-17 9.02056e-17 9.02056e-17 9.02056e-17 9.02056e-17 9.02056e-17 9.02056e-17 9.02056e-17
+ 9.02056e-17 9.02056e-17 9.02056e-17 9.02056e-17 9.02056e-17 9.02056e-17 9.02056e-17 9.02056e-17 9.02056e-17 9.02056e-17 2.42731e-05 3.56558e-05
+ 2.42731e-05 9.02056e-17 9.02056e-17 9.02056e-17 9.02056e-17 9.02056e-17 9.02056e-17 9.02056e-17 9.02056e-17 9.02056e-17 9.02056e-17 9.02056e-17
+ 9.02056e-17 9.02056e-17 9.02056e-17 9.02056e-17 9.02056e-17 9.02056e-17 9.02056e-17 9.02056e-17 9.02056e-17 9.02056e-17 0.0024663 0.0900827
+ 0.0946392 0.0900827 0.0024663 9.02056e-17 9.02056e-17 9.02056e-17 9.02056e-17 9.02056e-17 9.02056e-17 9.02056e-17 9.02056e-17 9.02056e-17
+ 9.02056e-17 9.02056e-17 9.02056e-17 9.02056e-17 9.02056e-17 9.02056e-17 9.02056e-17 9.02056e-17 9.02056e-17 9.02056e-17 0.00099992 0.228153
+ 0.615224 0.63579 0.615224 0.228153 0.00099992 9.02056e-17 9.02056e-17 9.02056e-17 9.02056e-17 9.02056e-17 9.02056e-17 9.02056e-17
+ 9.02056e-17 9.02056e-17 9.02056e-17 9.02056e-17 9.02056e-17 9.02056e-17 9.02056e-17 9.02056e-17 9.02056e-17 9.02056e-17 3.93768e-06 0.0814728
+ 0.713034 0.932869 0.936509 0.932869 0.713034 0.0814728 3.93768e-06 9.02056e-17 9.02056e-17 9.02056e-17 9.02056e-17 9.02056e-17
9.02056e-17 9.02056e-17 9.02056e-17 9.02056e-17 9.02056e-17
</DataArray>
<DataArray type="Float32" Name="pn" NumberOfComponents="1" format="ascii">
@@ -139,20 +139,20 @@
78501.4 97470.4 97470.4 97470.4 97470.4 97470.4 97470.4 97470.4 97470.4 97470.4 97470.4 97470.4
97470.4 78501.4 78501.4 78501.4 78501.4 78501.4 78501.4 78501.4 78501.4 78501.4 78501.4 78501.4
78501.4 78501.4 97470.4 97470.4 97470.4 97470.4 97470.4 97470.4 97470.4 97470.4 97470.4 97470.4
- 97470.4 97585.7 78501.4 84036.4 87296.2 86457.2 82353.1 78501.4 78501.4 78501.4 78501.4 78501.4
+ 97470.4 97470.4 78501.4 78501.4 78501.4 78501.4 78501.4 78501.4 78501.4 78501.4 78501.4 78501.4
78501.4 78501.4 78501.4 97470.4 97470.4 97470.4 97470.4 97470.4 97470.4 97470.4 97470.4 97470.4
- 97470.4 97841.1 98862 93070.9 94797.6 94797.3 94788.7 94766.5 92489.5 82457.9 78501.4 78501.4
+ 97470.4 97470.4 97470.4 78501.4 78501.4 78501.4 78501.4 78501.4 78501.4 78501.4 78501.4 78501.4
78501.4 78501.4 78501.4 78501.4 97470.4 97470.4 97470.4 97470.4 97470.4 97470.4 97470.4 97470.4
- 97470.4 97725.7 98868.9 98880.8 94788.6 94798.7 94805.1 94805.8 94798.5 94781.4 94752.5 87820.9
- 78738.8 78501.4 78501.4 78501.4 78501.4 97470.4 97470.4 97470.4 97470.4 97470.4 97470.4 97470.4
- 97470.4 97470.4 97757.2 98857.9 98872 98881.5 98889.6 98896.4 98900.7 98900.8 98895 98883.6
- 98867.4 98843.7 97470.4 97470.4 97470.4 97470.4 97470.4 97470.4 97470.4 97470.4 97470.4 97470.4
- 97470.4 97470.4 97470.4 97470.4 98087.3 98858.2 98871 98881.4 98891.7 98900.6 98905.9 98904
- 98894.8 98880.1 98856.6 97470.4 97470.4 97470.4 97470.4 97470.4 97470.4 97470.4 97470.4 97470.4
- 97470.4 97470.4 97470.4 97470.4 97470.4 97470.4 98161.2 98855 98867 98880.2 98894.5 98907.8
- 98911.6 98905.7 98893.9 98869 97470.4 97470.4 97470.4 97470.4 97470.4 97470.4 97470.4 97470.4
- 97470.4 97470.4 97470.4 97470.4 97470.4 97470.4 97470.4 97470.4 97564.4 98840.1 98854.5 98874.8
- 98903.8 98916.9 98915.1 98909.1 98884.6 97470.4 97470.4 97470.4 97470.4 97470.4 97470.4 97470.4
+ 97470.4 97470.4 97470.4 97470.4 78501.4 78501.4 78501.4 78501.4 78501.4 78501.4 78501.4 78501.4
+ 78501.4 78501.4 78501.4 78501.4 78501.4 97470.4 97470.4 97470.4 97470.4 97470.4 97470.4 97470.4
+ 97470.4 97470.4 97470.4 97470.4 97470.4 97470.4 97470.4 97470.4 97470.4 97470.4 97471 97471.3
+ 97471 97470.4 97470.4 97470.4 97470.4 97470.4 97470.4 97470.4 97470.4 97470.4 97470.4 97470.4
+ 97470.4 97470.4 97470.4 97470.4 97470.4 97470.4 97470.4 97470.4 97470.4 97470.4 97536.4 99366.6
+ 99385.1 99366.6 97536.4 97470.4 97470.4 97470.4 97470.4 97470.4 97470.4 97470.4 97470.4 97470.4
+ 97470.4 97470.4 97470.4 97470.4 97470.4 97470.4 97470.4 97470.4 97470.4 97470.4 97497.1 99586.5
+ 99733.6 99739 99733.6 99586.5 97497.1 97470.4 97470.4 97470.4 97470.4 97470.4 97470.4 97470.4
+ 97470.4 97470.4 97470.4 97470.4 97470.4 97470.4 97470.4 97470.4 97470.4 97470.4 97470.5 99323.1
+ 99759.4 99835.3 99837.4 99835.3 99759.4 99323.1 97470.5 97470.4 97470.4 97470.4 97470.4 97470.4
97470.4 97470.4 97470.4 97470.4 97470.4
</DataArray>
<DataArray type="Float32" Name="pc" NumberOfComponents="1" format="ascii">
@@ -177,20 +177,20 @@
21498.6 2529.62 2529.62 2529.62 2529.62 2529.62 2529.62 2529.62 2529.62 2529.62 2529.62 2529.62
2529.62 21498.6 21498.6 21498.6 21498.6 21498.6 21498.6 21498.6 21498.6 21498.6 21498.6 21498.6
21498.6 21498.6 2529.62 2529.62 2529.62 2529.62 2529.62 2529.62 2529.62 2529.62 2529.62 2529.62
- 2529.62 2414.26 21498.6 15963.6 12703.8 13542.8 17646.9 21498.6 21498.6 21498.6 21498.6 21498.6
+ 2529.62 2529.62 21498.6 21498.6 21498.6 21498.6 21498.6 21498.6 21498.6 21498.6 21498.6 21498.6
21498.6 21498.6 21498.6 2529.62 2529.62 2529.62 2529.62 2529.62 2529.62 2529.62 2529.62 2529.62
- 2529.62 2158.92 1137.97 6929.08 5202.36 5202.69 5211.33 5233.55 7510.48 17542.1 21498.6 21498.6
+ 2529.62 2529.62 2529.62 21498.6 21498.6 21498.6 21498.6 21498.6 21498.6 21498.6 21498.6 21498.6
21498.6 21498.6 21498.6 21498.6 2529.62 2529.62 2529.62 2529.62 2529.62 2529.62 2529.62 2529.62
- 2529.62 2274.28 1131.14 1119.2 5211.43 5201.26 5194.88 5194.21 5201.46 5218.6 5247.52 12179.1
- 21261.2 21498.6 21498.6 21498.6 21498.6 2529.62 2529.62 2529.62 2529.62 2529.62 2529.62 2529.62
- 2529.62 2529.62 2242.82 1142.1 1127.99 1118.47 1110.37 1103.59 1099.3 1099.2 1105 1116.38
- 1132.57 1156.31 2529.62 2529.62 2529.62 2529.62 2529.62 2529.62 2529.62 2529.62 2529.62 2529.62
- 2529.62 2529.62 2529.62 2529.62 1912.69 1141.83 1128.96 1118.56 1108.34 1099.41 1094.06 1096.04
- 1105.19 1119.88 1143.42 2529.62 2529.62 2529.62 2529.62 2529.62 2529.62 2529.62 2529.62 2529.62
- 2529.62 2529.62 2529.62 2529.62 2529.62 2529.62 1838.8 1145.02 1132.98 1119.83 1105.47 1092.16
- 1088.38 1094.34 1106.15 1131.01 2529.62 2529.62 2529.62 2529.62 2529.62 2529.62 2529.62 2529.62
- 2529.62 2529.62 2529.62 2529.62 2529.62 2529.62 2529.62 2529.62 2435.57 1159.89 1145.45 1125.25
- 1096.25 1083.05 1084.9 1090.86 1115.43 2529.62 2529.62 2529.62 2529.62 2529.62 2529.62 2529.62
+ 2529.62 2529.62 2529.62 2529.62 21498.6 21498.6 21498.6 21498.6 21498.6 21498.6 21498.6 21498.6
+ 21498.6 21498.6 21498.6 21498.6 21498.6 2529.62 2529.62 2529.62 2529.62 2529.62 2529.62 2529.62
+ 2529.62 2529.62 2529.62 2529.62 2529.62 2529.62 2529.62 2529.62 2529.62 2529.62 2528.97 2528.67
+ 2528.97 2529.62 2529.62 2529.62 2529.62 2529.62 2529.62 2529.62 2529.62 2529.62 2529.62 2529.62
+ 2529.62 2529.62 2529.62 2529.62 2529.62 2529.62 2529.62 2529.62 2529.62 2529.62 2463.64 633.409
+ 614.893 633.409 2463.64 2529.62 2529.62 2529.62 2529.62 2529.62 2529.62 2529.62 2529.62 2529.62
+ 2529.62 2529.62 2529.62 2529.62 2529.62 2529.62 2529.62 2529.62 2529.62 2529.62 2502.87 413.55
+ 266.37 260.962 266.37 413.55 2502.87 2529.62 2529.62 2529.62 2529.62 2529.62 2529.62 2529.62
+ 2529.62 2529.62 2529.62 2529.62 2529.62 2529.62 2529.62 2529.62 2529.62 2529.62 2529.52 676.884
+ 240.611 164.722 162.618 164.722 240.611 676.884 2529.52 2529.62 2529.62 2529.62 2529.62 2529.62
2529.62 2529.62 2529.62 2529.62 2529.62
</DataArray>
<DataArray type="Float32" Name="rhoW" NumberOfComponents="1" format="ascii">
@@ -293,18 +293,18 @@
0 0 0 0 0 0 0 0 0 0 0 0
0 0 0 0 0 0 0 0 0 0 0 0
0 0 0 0 0 0 0 0 0 0 0 0
- 0 0 4.60876e-06 0 1.81672e-05 1.80516e-05 1.51993e-05 9.23713e-06 0 0 0 0
0 0 0 0 0 0 0 0 0 0 0 0
- 0 0 6.6256e-06 1.14346e-05 1.51684e-05 1.85557e-05 2.09136e-05 2.11712e-05 1.84864e-05 1.30375e-05 6.41221e-06 0
0 0 0 0 0 0 0 0 0 0 0 0
- 0 0 0 3.61796e-06 7.72671e-06 1.17848e-05 1.61992e-05 2.06575e-05 2.38584e-05 2.39394e-05 1.967e-05 1.28367e-05
- 6.16163e-06 1.30242e-06 0 0 0 0 0 0 0 0 0 0
- 0 0 0 0 0 3.67819e-06 7.37397e-06 1.17432e-05 1.74576e-05 2.37792e-05 2.82124e-05 2.65123e-05
- 1.9537e-05 1.11111e-05 3.33333e-06 0 0 0 0 0 0 0 0 0
- 0 0 0 0 0 0 0 3.01088e-06 6.03306e-06 1.11361e-05 1.93458e-05 2.99126e-05
- 3.34877e-05 2.7963e-05 1.88889e-05 6.66667e-06 0 0 0 0 0 0 0 0
- 0 0 0 0 0 0 0 0 0 9.43448e-07 2.92638e-06 8.77915e-06
- 2.63374e-05 3.90123e-05 3.7037e-05 3.11111e-05 1.33333e-05 0 0 0 0 0 0 0
+ 0 0 0 0 0 0 0 0 0 0 0 0
+ 0 0 0 0 0 0 0 0 0 0 0 0
+ 0 0 0 0 0 0 0 0 0 0 0 0
+ 0 0 0 0 0 0 0 0 0 0 0 0
+ 0 0 0 0 0 0 0 0 0 0 0 0.0411001
+ 0.0570506 0.0411001 0 0 0 0 0 0 0 0 0 0
+ 0 0 0 0 0 0 0 0 0 0 0 3.92159
+ 146.749 164.984 146.749 3.92159 0 0 0 0 0 0 0 0
+ 0 0 0 0 0 0 0 0 0 0 0 0.0196823
+ 249.082 733.751 753.199 733.751 249.082 0.0196823 0 0 0 0 0 0
0 0 0 0 0
</DataArray>
<DataArray type="Float32" Name="mobN" NumberOfComponents="1" format="ascii">
--
GitLab