Merge pull request #220 from andlaus/propertysystem_mcu

make the property system work with multiple compile units

examples/lens_immiscible_ecfv_ad.cpp

@@ -28,25 +28,9 @@
  */
 #include "config.h"
 
+#include "lens_immiscible_ecfv_ad.hh"
+
 #include <ewoms/common/start.hh>
-#include <ewoms/models/immiscible/immisciblemodel.hh>
-#include <ewoms/disc/ecfv/ecfvdiscretization.hh>
-#include "problems/lensproblem.hh"
-
-namespace Ewoms {
-namespace Properties {
-NEW_TYPE_TAG(LensProblemEcfvAd, INHERITS_FROM(ImmiscibleTwoPhaseModel, LensBaseProblem));
-
-// use the element centered finite volume spatial discretization
-SET_TAG_PROP(LensProblemEcfvAd, SpatialDiscretizationSplice, EcfvDiscretization);
-
-// use automatic differentiation for this simulator
-SET_TAG_PROP(LensProblemEcfvAd, LocalLinearizerSplice, AutoDiffLocalLinearizer);
-
-// this problem works fine if the linear solver uses single precision scalars
-SET_TYPE_PROP(LensProblemEcfvAd, LinearSolverScalar, float);
-
-}}
 
 int main(int argc, char **argv)
 {

examples/lens_immiscible_ecfv_ad.hh

@@ -0,0 +1,50 @@
+// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+// vi: set et ts=4 sw=4 sts=4:
+/*
+  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 2 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/>.
+
+  Consult the COPYING file in the top-level source directory of this
+  module for the precise wording of the license and the list of
+  copyright holders.
+*/
+/*!
+ * \file
+ *
+ * \brief Two-phase test for the immiscible model which uses the element-centered finite
+ *        volume discretization in conjunction with automatic differentiation
+ */
+#ifndef EWOMS_LENS_IMMISCIBLE_ECFV_AD_HH
+#define EWOMS_LENS_IMMISCIBLE_ECFV_AD_HH
+
+#include <ewoms/models/immiscible/immisciblemodel.hh>
+#include <ewoms/disc/ecfv/ecfvdiscretization.hh>
+#include "problems/lensproblem.hh"
+
+namespace Ewoms {
+namespace Properties {
+NEW_TYPE_TAG(LensProblemEcfvAd, INHERITS_FROM(ImmiscibleTwoPhaseModel, LensBaseProblem));
+
+// use the element centered finite volume spatial discretization
+SET_TAG_PROP(LensProblemEcfvAd, SpatialDiscretizationSplice, EcfvDiscretization);
+
+// use automatic differentiation for this simulator
+SET_TAG_PROP(LensProblemEcfvAd, LocalLinearizerSplice, AutoDiffLocalLinearizer);
+
+// this problem works fine if the linear solver uses single precision scalars
+SET_TYPE_PROP(LensProblemEcfvAd, LinearSolverScalar, float);
+}}
+
+#endif // EWOMS_LENS_IMMISCIBLE_ECFV_AD_HH

examples/lens_immiscible_ecfv_ad_cu1.cpp

@@ -0,0 +1,45 @@
+// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+// vi: set et ts=4 sw=4 sts=4:
+/*
+  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 2 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/>.
+
+  Consult the COPYING file in the top-level source directory of this
+  module for the precise wording of the license and the list of
+  copyright holders.
+*/
+/*!
+ * \file
+ *
+ * \brief This test is identical to the simulation of the lens problem that uses the
+ *        element centered finite volume discretization in conjunction with automatic
+ *        differentiation (lens_immiscible_ecfv_ad).
+ *
+ * The only difference is that it uses multiple compile units in order to ensure that
+ * eWoms code can be used within libraries that use the same type tag within multiple
+ * compile units. This file represents the first compile unit and just defines an startup
+ * function for the simulator.
+ */
+#include "config.h"
+
+#include "lens_immiscible_ecfv_ad.hh"
+
+#include <ewoms/common/start.hh>
+
+int mainCU1(int argc, char **argv)
+{
+    typedef TTAG(LensProblemEcfvAd) ProblemTypeTag;
+    return Ewoms::start<ProblemTypeTag>(argc, argv);
+}

examples/lens_immiscible_ecfv_ad_cu2.cpp

@@ -0,0 +1,45 @@
+// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+// vi: set et ts=4 sw=4 sts=4:
+/*
+  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 2 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/>.
+
+  Consult the COPYING file in the top-level source directory of this
+  module for the precise wording of the license and the list of
+  copyright holders.
+*/
+/*!
+ * \file
+ *
+ * \brief This test is identical to the simulation of the lens problem that uses the
+ *        element centered finite volume discretization in conjunction with automatic
+ *        differentiation (lens_immiscible_ecfv_ad).
+ *
+ * The only difference is that it uses multiple compile units in order to ensure that
+ * eWoms code can be used within libraries that use the same type tag within multiple
+ * compile units. This file represents the second compile unit and just defines an
+ * startup function for the simulator.
+ */
+#include "config.h"
+
+#include "lens_immiscible_ecfv_ad.hh"
+
+#include <ewoms/common/start.hh>
+
+int mainCU2(int argc, char **argv)
+{
+    typedef TTAG(LensProblemEcfvAd) ProblemTypeTag;
+    return Ewoms::start<ProblemTypeTag>(argc, argv);
+}

examples/lens_immiscible_ecfv_ad_main.cpp

@@ -0,0 +1,41 @@
+// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+// vi: set et ts=4 sw=4 sts=4:
+/*
+  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 2 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/>.
+
+  Consult the COPYING file in the top-level source directory of this
+  module for the precise wording of the license and the list of
+  copyright holders.
+*/
+/*!
+ * \file
+ *
+ * \brief This test is identical to the simulation of the lens problem that uses the
+ *        element centered finite volume discretization in conjunction with automatic
+ *        differentiation (lens_immiscible_ecfv_ad).
+ *
+ * The only difference is that it uses multiple compile units in order to ensure that
+ * eWoms code can be used within libraries that use the same type tag within multiple
+ * compile units. This file calls contains main() and just calls the main entry point
+ * defined by the first compile unit.
+ */
+int mainCU1(int argc, char **argv);
+int mainCU2(int argc, char **argv);
+
+int main(int argc, char **argv)
+{
+    return mainCU1(argc, argv);
+}