Added subfolder dumux/multidomain/2cstokes2p2c and adapted makefiles and

configure.ac


git-svn-id: svn://svn.iws.uni-stuttgart.de/DUMUX/dumux/trunk@12342 2fb0f335-1f38-0410-981e-8018bf24f1b0

configure.ac

@@ -83,6 +83,7 @@ AC_CONFIG_FILES([dumux.pc
     dumux/material/eos/Makefile 
     dumux/multidomain/Makefile 
     dumux/multidomain/common/Makefile 
+    dumux/multidomain/2cstokes2p2c/Makefile 
     dumux/nonlinear/Makefile
     dumux/parallel/Makefile 
     m4/Makefile

dumux/multidomain/2cstokes2p2c/2cstokes2p2cnewtoncontroller.hh

+// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+// vi: set et ts=4 sw=4 sts=4:
+/*****************************************************************************
+ *   See the file COPYING for full copying permissions.                      *
+ *                                                                           *
+ *   This program 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 2 of the License, or       *
+ *   (at your option) any later version.                                     *
+ *                                                                           *
+ *   This program 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 this program.  If not, see <http://www.gnu.org/licenses/>.   *
+ *****************************************************************************/
+/*!
+ * \file
+ * \brief Reference implementation of a Newton controller for coupled 2cStokes - 2p2c problems
+ */
+#ifndef DUMUX_2CSTOKES_2P2C_NEWTON_CONTROLLER_HH
+#define DUMUX_2CSTOKES_2P2C_NEWTON_CONTROLLER_HH
+
+#include <dumux/multidomain/common/multidomainnewtoncontroller.hh>
+
+/*!
+ * \file
+ */
+namespace Dumux
+{
+
+/*!
+ * \brief Implementation of a Newton controller for coupled 2cStokes - 2p2c problems
+ *
+ * 		  The Newton controller ensures that the updateStaticData routine is called
+ * 		  in the porous-medium sub-problem
+ */
+template <class TypeTag>
+class TwoCStokesTwoPTwoCNewtonController : public MultiDomainNewtonController<TypeTag>
+{
+    typedef MultiDomainNewtonController<TypeTag> ParentType;
+
+    typedef typename GET_PROP_TYPE(TypeTag, Problem) Problem;
+    typedef typename GET_PROP_TYPE(TypeTag, SolutionVector) SolutionVector;
+
+public:
+    TwoCStokesTwoPTwoCNewtonController(const Problem &problem)
+        : ParentType(problem)
+    {  }
+
+    /*!
+     * \brief Indicates that one Newton iteration was finished.
+     */
+    void newtonEndStep(SolutionVector &uCurrentIter, SolutionVector &uLastIter)
+    {
+        ParentType::newtonEndStep(uCurrentIter, uLastIter);
+
+        this->model_().sdModel2().updateStaticData(this->model_().sdModel2().curSol(),
+                                                   this->model_().sdModel2().prevSol());
+    }
+};
+
+} // namespace Dumux
+
+#endif // DUMUX_2CSTOKES_2P2C_NEWTON_CONTROLLER_HH

dumux/multidomain/2cstokes2p2c/Makefile.am

+2cstokes2p2cdir = $(includedir)/dumux/multidomain/2cstokes2p2c
+2cstokes2p2c_HEADERS = *.hh
+
+include $(top_srcdir)/am/global-rules

dumux/multidomain/Makefile.am

-SUBDIRS = common 
+SUBDIRS = common \
+		  2cstokes2p2c
+ 
 multidomaindir = $(includedir)/dumux/multidomain
 
 include $(top_srcdir)/am/global-rules