Commit 38b2a64a authored by Kirill Terekhov's avatar Kirill Terekhov

few fixes in ecl grid reader

parent 71cb3b50
Pipeline #197 failed with stages
in 10 minutes and 13 seconds
...@@ -1212,7 +1212,9 @@ namespace INMOST ...@@ -1212,7 +1212,9 @@ namespace INMOST
{ {
if (file_options[k].first == "ECL_SPLIT_GLUED") if (file_options[k].first == "ECL_SPLIT_GLUED")
{ {
if (file_options[k].second == "TRUE") if (file_options[k].second == "ALL")
perform_splitting = 2;
else if (file_options[k].second == "TRUE")
perform_splitting = 1; perform_splitting = 1;
else else
perform_splitting = 0; perform_splitting = 0;
...@@ -4369,9 +4371,10 @@ namespace INMOST ...@@ -4369,9 +4371,10 @@ namespace INMOST
//TODO4: crack up the mesh along degenerate active cells //TODO4: crack up the mesh along degenerate active cells
//compute cell centers that lay inside //compute cell centers that lay inside
if (false) //TODO16 if (true) //TODO16
{
if( true )
{ {
if (verbosity > 0) if (verbosity > 0)
{ {
ttt = Timer(); ttt = Timer();
...@@ -4418,7 +4421,7 @@ namespace INMOST ...@@ -4418,7 +4421,7 @@ namespace INMOST
} }
if (verbosity) if (verbosity)
std::cout << "Finished rewriting cell centers time " << Timer() - ttt << std::endl; std::cout << "Finished rewriting cell centers time " << Timer() - ttt << std::endl;
}
if (verbosity > 0) if (verbosity > 0)
{ {
...@@ -4678,8 +4681,34 @@ namespace INMOST ...@@ -4678,8 +4681,34 @@ namespace INMOST
K(1, 1) = perm[3 * q + 1]; K(1, 1) = perm[3 * q + 1];
K(2, 2) = perm[3 * q + 2]; K(2, 2) = perm[3 * q + 2];
//double norm1 = K.FrobeniusNorm();
K = V*Sinv*U.Transpose()*K*U*Sinv*V.Transpose(); K = V*Sinv*U.Transpose()*K*U*Sinv*V.Transpose();
//double norm2 = K.FrobeniusNorm();
/*
if( norm2/norm1 > 100 )
{
std::cout << "#####" << std::endl;
std::cout << "norm1 " << norm1 << " norm2 " << norm2 << std::endl;
std::cout << "K:" << std::endl;
K.Print();
std::cout << "axis: " << std::endl;
block_axis(c, 3, 3).Print();
std::cout << "Sinv: " << std::endl;
Sinv.Print();
std::cout << "U: " << std::endl;
U.Print();
std::cout << "V: " << std::endl;
V.Print();
K.SVD(U,S,V);
std::cout << "KS:" << std::endl;
S.Print();
std::cout << "kx ky kz: " << std::endl;
std::cout << perm[3*q+0] << " " << perm[3*q+1] << " " << perm[3*q+2] << std::endl;
}
*/
arr_perm[0] = K(0, 0); arr_perm[0] = K(0, 0);
arr_perm[1] = K(0, 1); arr_perm[1] = K(0, 1);
arr_perm[2] = K(0, 2); arr_perm[2] = K(0, 2);
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
#include "../Misc/utils.h" #include "../Misc/utils.h"
#include "solver_prototypes.hpp" #include "solver_prototypes.hpp"
#include "solver_bcgsl.hpp" #include "solver_bcgsl.hpp"
#define KSOLVER BCGSL_solver #define KSOLVER BCGS_solver
namespace INMOST { namespace INMOST {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment