added output of matrix in separate directory

CMakeLists.txt

@@ -163,6 +163,14 @@ opm_add_test(flow_blackoil_dunecpr
   DEPENDS "opmsimulators"
   LIBRARIES "opmsimulators")
 
+opm_add_test(flow_blackoil_dunecpr_noflex
+  ONLY_COMPILE
+  DEFAULT_ENABLE_IF ${FLOW_DEFAULT_ENABLE_IF}
+  SOURCES flow/flow_blackoil_dunecpr_noflex.cpp
+  EXE_NAME flow_blackoil_dunecpr_noflex
+  CONDITION NOT MPI_FOUND
+  DEPENDS "opmsimulators"
+  LIBRARIES "opmsimulators")
 
 
 if (BUILD_FLOW)

flow/flow_blackoil_dunecpr_noflex.cpp

@@ -0,0 +1,95 @@
+/*
+  Copyright 2013, 2014, 2015, 2019 SINTEF Digital, Mathematics and Cybernetics.
+  Copyright 2014 Dr. Blatt - HPC-Simulation-Software & Services
+  Copyright 2015, 2017 IRIS AS
+
+  This file is part of the Open Porous Media project (OPM).
+
+  OPM is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+
+  OPM is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with OPM.  If not, see <http://www.gnu.org/licenses/>.
+*/
+#include "config.h"
+#include "flow/flow_tag.hpp"
+#include  <opm/simulators/linalg/ISTLSolverEbosCpr.hpp>
+
+
+BEGIN_PROPERTIES
+NEW_TYPE_TAG(EclFlowProblemSimple, INHERITS_FROM(EclFlowProblem));
+NEW_PROP_TAG(FluidState);
+//SET_TYPE_PROP(EclBaseProblem, Problem, Ewoms::EclProblem<TypeTag>);
+SET_PROP(EclFlowProblemSimple, FluidState)
+    {
+    private:
+      typedef typename GET_PROP_TYPE(TypeTag, FluidSystem) FluidSystem;
+      typedef typename GET_PROP_TYPE(TypeTag, Indices) Indices;
+      enum { enableTemperature = GET_PROP_VALUE(TypeTag, EnableTemperature) };
+      enum { enableSolvent = GET_PROP_VALUE(TypeTag, EnableSolvent) };
+      enum { enableEnergy = GET_PROP_VALUE(TypeTag, EnableEnergy) };
+      enum { numPhases = GET_PROP_VALUE(TypeTag, NumPhases) };
+      typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
+      typedef typename GET_PROP_TYPE(TypeTag, Evaluation) Evaluation;
+      static const bool compositionSwitchEnabled = Indices::gasEnabled;
+ 
+    public:
+//typedef Opm::BlackOilFluidSystemSimple<Scalar> type;
+       typedef Opm::BlackOilFluidState<Evaluation, FluidSystem, enableTemperature, enableEnergy, compositionSwitchEnabled,  Indices::numPhases > type;
+};
+
+SET_BOOL_PROP(EclFlowProblemSimple, MatrixAddWellContributions, true);
+SET_INT_PROP(EclFlowProblemSimple, LinearSolverVerbosity,0);
+SET_SCALAR_PROP(EclFlowProblemSimple, LinearSolverReduction, 1e-2);
+SET_INT_PROP(EclFlowProblemSimple, LinearSolverMaxIter, 100);
+SET_BOOL_PROP(EclFlowProblemSimple, UseAmg, true);//probably not used
+SET_BOOL_PROP(EclFlowProblemSimple, UseCpr, true);
+SET_INT_PROP(EclFlowProblemSimple, CprMaxEllIter, 1);
+SET_INT_PROP(EclFlowProblemSimple, CprEllSolvetype, 3);
+SET_INT_PROP(EclFlowProblemSimple, CprReuseSetup, 3);
+SET_INT_PROP(EclFlowProblemSimple, CprSolverVerbose, 0);
+SET_STRING_PROP(EclFlowProblemSimple, SystemStrategy, "quasiimpes");
+END_PROPERTIES
+
+namespace Ewoms {
+  namespace Properties {
+
+    SET_PROP(EclFlowProblemSimple, FluidSystem)
+    {
+    private:
+      //typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
+      typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
+      typedef typename GET_PROP_TYPE(TypeTag, Evaluation) Evaluation;
+
+    public:
+        typedef Opm::BlackOilFluidSystem<Scalar> type;
+    };
+    //NEW_TYPE_TAG(EclFlowProblem, INHERITS_FROM(BlackOilModel, EclBaseProblem));
+    SET_TYPE_PROP(EclFlowProblemSimple, IntensiveQuantities, Ewoms::BlackOilIntensiveQuantities<TypeTag>);
+    //SET_TYPE_PROP(EclFlowProblemSimple, LinearSolverBackend, Opm::ISTLSolverEbos<TypeTag>);
+    //SET_TAG_PROP(EclFlowProblemSimple, LinearSolverSplice, ParallelBiCGStabLinearSolver);
+    //SET_TYPE_PROP(EclFlowProblemSimple, LinearSolverBackend, Ewoms::Linear::ParallelBiCGStabSolverBackend<TypeTag>);//not work
+    //SET_TYPE_PROP(EclFlowProblemSimple, LinearSolverBackend, Ewoms::Linear::SuperLUBackend<TypeTag>)//not work
+    //SET_TAG_PROP(EclFlowProblem, FluidState, Opm::BlackOilFluidState);
+    SET_TYPE_PROP(EclFlowProblemSimple, LinearSolverBackend, Opm::ISTLSolverEbosCpr<TypeTag>);
+    SET_BOOL_PROP(EclFlowProblemSimple, EnableStorageCache, true);
+    SET_BOOL_PROP(EclFlowProblemSimple, EnableIntensiveQuantityCache, true);
+    
+    //SET_INT_PROP(EclFlowProblemSimple, NumWellAdjoint, 1);
+    //SET_BOOL_PROP(EclFlowProblem, EnableStorageCache, true);
+    //SET_BOOL_PROP(EclFlowProblem, EnableIntensiveQuantityCache, true);
+  }
+}
+
+int main(int argc, char** argv)
+{
+  typedef TTAG(EclFlowProblemSimple) TypeTag;
+  return mainFlow<TypeTag>(argc, argv);
+}

opm/simulators/linalg/ISTLSolverEbosCpr.hpp

@@ -24,7 +24,7 @@
 #include <opm/simulators/linalg/BlackoilAmgCpr.hpp>
 #include <utility>
 #include <memory>
-
+#include "WriteSystemMatrixHelper.hpp"
 namespace Opm
 {
 //=====================================================================
@@ -296,6 +296,15 @@ namespace Opm
             if (this->parameters_.scale_linear_system_) {
                 this->scaleSolution(x);
             }
+	    if(this->parameters_.linear_solver_verbosity_ > 10){
+		if(this->iterations() > (this->parameters_.linear_solver_verbosity_ - 10)){
+		    Opm::Helper::writeSystem(this->simulator_,
+					     *this->matrix_,
+					     *this->rhs_);
+		}
+	    }
+	    
+	    
 	    return this->converged_;
         }
 

opm/simulators/linalg/WriteSystemMatrixHelper.hpp

@@ -0,0 +1,66 @@
+/*
+  Copyright 2019 SINTEF AS
+
+  This file is part of the Open Porous Media project (OPM).
+
+  OPM is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+
+  OPM is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with OPM.  If not, see <http://www.gnu.org/licenses/>.
+*/
+#ifndef OPM_WRITESYSTEMMATRIXHELPER_HEADER_INCLUDED
+#define OPM_WRITESYSTEMMATRIXHELPER_HEADER_INCLUDED
+//#include <dune/istl/matrixmarket.hh>
+//#include <ewoms/linear/matrixblock.hh>
+#include <ewoms/linear/matrixmarket_ewoms.hh>
+namespace Opm{
+    namespace Helper {
+	template<class SimulatorType,
+		 class MatrixType,
+		 class VectorType>
+	void writeSystem(const SimulatorType& simulator,
+			 const MatrixType& matrix,
+			 const VectorType& rhs){
+	    std::string dir = simulator.problem().outputDir();
+	    if (dir == ".")
+		dir = "";
+	    else if (!dir.empty() && dir.back() != '/')
+		dir += "/";
+	    namespace fs = boost::filesystem;
+	    fs::path output_dir(dir);
+	    fs::path subdir("reports");
+	    output_dir = output_dir / subdir;
+	    if(!(fs::exists(output_dir))){
+		fs::create_directory(output_dir);
+	    }
+	    // Combine and return.
+	    std::ostringstream oss;
+	    oss << "prob_" << simulator.episodeIndex() << "_";
+	    oss << simulator.time() << "_";
+	    std::string output_file(oss.str());
+	    fs::path full_path = output_dir / output_file;
+	    std::string prefix = full_path.string();
+	    {
+		std::string filename = prefix + "matrix_istl.txt";
+		std::ofstream filem(filename);
+		Dune::writeMatrixMarket(matrix, filem);
+	    }
+	    {		
+		std::string filename = prefix + "rhs_istl.txt";
+		std::ofstream fileb(filename);
+		Dune::writeMatrixMarket(rhs, fileb);
+	    }
+	}
+
+	
+    } //namespace helper   
+}// namespace Opm
+#endif