diff --git a/appl/lecture/msm/1p2cvs2p/external_interface.hh b/appl/lecture/msm/1p2cvs2p/external_interface.hh
index 65a806dca74b0047958cdc7c86435ea6b9251dd7..55af6edb09916136b12c6b9120fb5939df339e93 100644
--- a/appl/lecture/msm/1p2cvs2p/external_interface.hh
+++ b/appl/lecture/msm/1p2cvs2p/external_interface.hh
@@ -1,4 +1,18 @@
// $Id: pcm_parameters.hh 1329 $
+/*****************************************************************************
+ * 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/>. *
+ *****************************************************************************/
#ifndef PCM_PARAMETERS_HH
#define PCM_PARAMETERS_HH
diff --git a/appl/lecture/msm/1p2cvs2p/lens_1p2c.cc b/appl/lecture/msm/1p2cvs2p/lens_1p2c.cc
index 681903291ff2f8a70c335b5ce1f11d903522b9a9..5e9836c64972dabd11b7a96fca58cddfccb07b15 100755
--- a/appl/lecture/msm/1p2cvs2p/lens_1p2c.cc
+++ b/appl/lecture/msm/1p2cvs2p/lens_1p2c.cc
@@ -7,13 +7,18 @@
* University of Stuttgart, Germany *
* email: <givenname>.<name>@iws.uni-stuttgart.de *
* *
- * This program is free software; you can redistribute it and/or modify *
+ * 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, as long as this copyright notice *
- * is included in its original form. *
+ * the Free Software Foundation, either version 2 of the License, or *
+ * (at your option) any later version. *
* *
- * This program is distributed WITHOUT ANY WARRANTY. *
+ * 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/>. *
*****************************************************************************/
#include "config.h"
diff --git a/appl/lecture/msm/1p2cvs2p/lens_1p2cnewtoncontroller.hh b/appl/lecture/msm/1p2cvs2p/lens_1p2cnewtoncontroller.hh
index 7d7a902d0d1d4c8ef9794f5c94f1aa111211fc51..e3b7542098612f1d3384221e0a4f741058ada5f9 100644
--- a/appl/lecture/msm/1p2cvs2p/lens_1p2cnewtoncontroller.hh
+++ b/appl/lecture/msm/1p2cvs2p/lens_1p2cnewtoncontroller.hh
@@ -5,13 +5,18 @@
* University of Stuttgart, Germany *
* email: <givenname>.<name>@iws.uni-stuttgart.de *
* *
- * This program is free software; you can redistribute it and/or modify *
+ * 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, as long as this copyright notice *
- * is included in its original form. *
+ * the Free Software Foundation, either version 2 of the License, or *
+ * (at your option) any later version. *
* *
- * This program is distributed WITHOUT ANY WARRANTY. *
+ * 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
diff --git a/appl/lecture/msm/1p2cvs2p/lens_2p.cc b/appl/lecture/msm/1p2cvs2p/lens_2p.cc
index ac8eff58b66347cdd9c58503e5a4054745217db4..66fda19300947834f0d21476d1174da686195783 100755
--- a/appl/lecture/msm/1p2cvs2p/lens_2p.cc
+++ b/appl/lecture/msm/1p2cvs2p/lens_2p.cc
@@ -7,13 +7,18 @@
* University of Stuttgart, Germany *
* email: <givenname>.<name>@iws.uni-stuttgart.de *
* *
- * This program is free software; you can redistribute it and/or modify *
+ * 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, as long as this copyright notice *
- * is included in its original form. *
+ * the Free Software Foundation, either version 2 of the License, or *
+ * (at your option) any later version. *
* *
- * This program is distributed WITHOUT ANY WARRANTY. *
+ * 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/>. *
*****************************************************************************/
#include "config.h"
diff --git a/appl/lecture/msm/1p2cvs2p/lens_2pnewtoncontroller.hh b/appl/lecture/msm/1p2cvs2p/lens_2pnewtoncontroller.hh
index 5d6a5fa8dde897816f9d6a06922bfb1d7f3f616a..fba2ae35421ee859e312663759865aff6dfd80a7 100644
--- a/appl/lecture/msm/1p2cvs2p/lens_2pnewtoncontroller.hh
+++ b/appl/lecture/msm/1p2cvs2p/lens_2pnewtoncontroller.hh
@@ -5,13 +5,18 @@
* University of Stuttgart, Germany *
* email: <givenname>.<name>@iws.uni-stuttgart.de *
* *
- * This program is free software; you can redistribute it and/or modify *
+ * 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, as long as this copyright notice *
- * is included in its original form. *
+ * the Free Software Foundation, either version 2 of the License, or *
+ * (at your option) any later version. *
* *
- * This program is distributed WITHOUT ANY WARRANTY. *
+ * 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
diff --git a/appl/lecture/msm/1p2cvs2p/lensproblem1p2c.hh b/appl/lecture/msm/1p2cvs2p/lensproblem1p2c.hh
index e9ad8d5ed5ff6c3d4cec735f5ef47ed473a3bb1b..c825b14b36fd4181e10296ca6511a567289f6c4a 100644
--- a/appl/lecture/msm/1p2cvs2p/lensproblem1p2c.hh
+++ b/appl/lecture/msm/1p2cvs2p/lensproblem1p2c.hh
@@ -7,13 +7,18 @@
* University of Stuttgart, Germany *
* email: <givenname>.<name>@iws.uni-stuttgart.de *
* *
- * This program is free software; you can redistribute it and/or modify *
+ * 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, as long as this copyright notice *
- * is included in its original form. *
+ * the Free Software Foundation, either version 2 of the License, or *
+ * (at your option) any later version. *
* *
- * This program is distributed WITHOUT ANY WARRANTY. *
+ * 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/>. *
*****************************************************************************/
#ifndef DUMUX_LENSPROBLEM1P2C_HH
#define DUMUX_LENSPROBLEM1P2C_HH
diff --git a/appl/lecture/msm/1p2cvs2p/lensproblem2p.hh b/appl/lecture/msm/1p2cvs2p/lensproblem2p.hh
index febc63163193326d5909aaf708f78901fea0e541..eafe554d0d226b9e5d61ffdd67d679cc3874c277 100644
--- a/appl/lecture/msm/1p2cvs2p/lensproblem2p.hh
+++ b/appl/lecture/msm/1p2cvs2p/lensproblem2p.hh
@@ -7,13 +7,18 @@
* University of Stuttgart, Germany *
* email: <givenname>.<name>@iws.uni-stuttgart.de *
* *
- * This program is free software; you can redistribute it and/or modify *
+ * 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, as long as this copyright notice *
- * is included in its original form. *
+ * the Free Software Foundation, either version 2 of the License, or *
+ * (at your option) any later version. *
* *
- * This program is distributed WITHOUT ANY WARRANTY. *
+ * 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/>. *
*****************************************************************************/
#ifndef DUMUX_LENSPROBLEM2P_HH
#define DUMUX_LENSPROBLEM2P_HH
diff --git a/appl/lecture/msm/1p2cvs2p/lensspatialparameters1p2c.hh b/appl/lecture/msm/1p2cvs2p/lensspatialparameters1p2c.hh
index c9b31d0850afaff058ad5389342d9a5c406eb63a..c850b96792fe146654e9ddca06e55c705dc5e4a7 100644
--- a/appl/lecture/msm/1p2cvs2p/lensspatialparameters1p2c.hh
+++ b/appl/lecture/msm/1p2cvs2p/lensspatialparameters1p2c.hh
@@ -8,13 +8,18 @@
* University of Stuttgart, Germany *
* email: <givenname>.<name>@iws.uni-stuttgart.de *
* *
- * This program is free software; you can redistribute it and/or modify *
+ * 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, as long as this copyright notice *
- * is included in its original form. *
+ * the Free Software Foundation, either version 2 of the License, or *
+ * (at your option) any later version. *
* *
- * This program is distributed WITHOUT ANY WARRANTY. *
+ * 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/>. *
*****************************************************************************/
#ifndef DUMUX_LENSSPATIALPARAMETERS_1P2C_HH
#define DUMUX_LENSSPATIALPARAMETERS_1P2C_HH
diff --git a/appl/lecture/msm/1p2cvs2p/lensspatialparameters2p.hh b/appl/lecture/msm/1p2cvs2p/lensspatialparameters2p.hh
index c0cab07b07314876cfd2d32665b2199d3804e955..f8887efd84adfdff99280e529339497dc08f7722 100644
--- a/appl/lecture/msm/1p2cvs2p/lensspatialparameters2p.hh
+++ b/appl/lecture/msm/1p2cvs2p/lensspatialparameters2p.hh
@@ -8,13 +8,18 @@
* University of Stuttgart, Germany *
* email: <givenname>.<name>@iws.uni-stuttgart.de *
* *
- * This program is free software; you can redistribute it and/or modify *
+ * 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, as long as this copyright notice *
- * is included in its original form. *
+ * the Free Software Foundation, either version 2 of the License, or *
+ * (at your option) any later version. *
* *
- * This program is distributed WITHOUT ANY WARRANTY. *
+ * 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/>. *
*****************************************************************************/
#ifndef DUMUX_LENSSPATIALPARAMETERS_2P_HH
#define DUMUX_LENSSPATIALPARAMETERS_2P_HH
diff --git a/appl/lecture/msm/1p2cvs2p/water_contaminant.hh b/appl/lecture/msm/1p2cvs2p/water_contaminant.hh
index a5a80917723bb9c5d79ead1966e74295e17dbe0e..990aae37e87e552c349dbb9db4c6be6c4b8344a6 100644
--- a/appl/lecture/msm/1p2cvs2p/water_contaminant.hh
+++ b/appl/lecture/msm/1p2cvs2p/water_contaminant.hh
@@ -5,13 +5,18 @@
* University of Stuttgart, Germany *
* email: <givenname>.<name>@iws.uni-stuttgart.de *
* *
- * This program is free software; you can redistribute it and/or modify *
+ * 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, as long as this copyright notice *
- * is included in its original form. *
+ * the Free Software Foundation, either version 2 of the License, or *
+ * (at your option) any later version. *
* *
- * This program is distributed WITHOUT ANY WARRANTY. *
+ * 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
diff --git a/appl/lecture/msm/buckleyleverett/buckleyleverett_analytic.hh b/appl/lecture/msm/buckleyleverett/buckleyleverett_analytic.hh
index 10185e563c4a74069b0b1b18ef0acf6b5bb59024..f89a86d15e04aa6a7c1f8a5e70620b7e6be3ff97 100644
--- a/appl/lecture/msm/buckleyleverett/buckleyleverett_analytic.hh
+++ b/appl/lecture/msm/buckleyleverett/buckleyleverett_analytic.hh
@@ -1,5 +1,18 @@
// $Id$
-
+/*****************************************************************************
+ * 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/>. *
+ *****************************************************************************/
#ifndef DUMUX_BUCKLEYLEVERETT_ANALYTICAL_HH
#define DUMUX_BUCKLEYLEVERETT_ANALYTICAL_HH
diff --git a/appl/lecture/msm/buckleyleverett/buckleyleverett_ff.cc b/appl/lecture/msm/buckleyleverett/buckleyleverett_ff.cc
index 5379aaa3ee51b5106e309d593015a7614045d694..b680b8965a13bf17d8c82f54a3e45b9eeac54e8c 100644
--- a/appl/lecture/msm/buckleyleverett/buckleyleverett_ff.cc
+++ b/appl/lecture/msm/buckleyleverett/buckleyleverett_ff.cc
@@ -7,13 +7,18 @@
* University of Stuttgart, Germany *
* email: <givenname>.<name>@iws.uni-stuttgart.de *
* *
- * This program is free software; you can redistribute it and/or modify *
+ * 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, as long as this copyright notice *
- * is included in its original form. *
+ * the Free Software Foundation, either version 2 of the License, or *
+ * (at your option) any later version. *
* *
- * This program is distributed WITHOUT ANY WARRANTY. *
+ * 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/>. *
*****************************************************************************/
#include "config.h"
diff --git a/appl/lecture/msm/buckleyleverett/buckleyleverett_spatialparams.hh b/appl/lecture/msm/buckleyleverett/buckleyleverett_spatialparams.hh
index 7a0d85f01c6e21011def2e5ca3135e1d93c9ff40..5c7d1fceffe7b14bd4232f0fe0b0612c156b1775 100644
--- a/appl/lecture/msm/buckleyleverett/buckleyleverett_spatialparams.hh
+++ b/appl/lecture/msm/buckleyleverett/buckleyleverett_spatialparams.hh
@@ -6,13 +6,18 @@
* University of Stuttgart, Germany *
* email: <givenname>.<name>@iws.uni-stuttgart.de *
* *
- * This program is free software; you can redistribute it and/or modify *
+ * 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, as long as this copyright notice *
- * is included in its original form. *
+ * the Free Software Foundation, either version 2 of the License, or *
+ * (at your option) any later version. *
* *
- * This program is distributed WITHOUT ANY WARRANTY. *
+ * 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/>. *
*****************************************************************************/
#ifndef BUCKLEYLEVERETT_SPATIALPARAMETERS_HH
#define BUCKLEYLEVERETT_SPATIALPARAMETERS_HH
diff --git a/appl/lecture/msm/buckleyleverett/buckleyleverettproblem.hh b/appl/lecture/msm/buckleyleverett/buckleyleverettproblem.hh
index e1a8debf77d37f3a05a8044850f9f4f7c83f77dc..42d7dd162e0bc1cc64d2cb381fc0dc7501cb95a2 100644
--- a/appl/lecture/msm/buckleyleverett/buckleyleverettproblem.hh
+++ b/appl/lecture/msm/buckleyleverett/buckleyleverettproblem.hh
@@ -7,13 +7,18 @@
* University of Stuttgart, Germany *
* email: <givenname>.<name>@iws.uni-stuttgart.de *
* *
- * This program is free software; you can redistribute it and/or modify *
+ * 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, as long as this copyright notice *
- * is included in its original form. *
+ * the Free Software Foundation, either version 2 of the License, or *
+ * (at your option) any later version. *
* *
- * This program is distributed WITHOUT ANY WARRANTY. *
+ * 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/>. *
*****************************************************************************/
#ifndef DUMUX_BUCKLEYLEVERETTPROBLEM_HH
#define DUMUX_BUCKLEYLEVERETTPROBLEM_HH
diff --git a/appl/lecture/msm/buckleyleverett/external_interface.hh b/appl/lecture/msm/buckleyleverett/external_interface.hh
index 24f1ee48d5b7eb8282aa2fecdb1e803af92ddc9d..4932be901f396137d64933647b8f7f64f13893c0 100644
--- a/appl/lecture/msm/buckleyleverett/external_interface.hh
+++ b/appl/lecture/msm/buckleyleverett/external_interface.hh
@@ -1,4 +1,18 @@
// $Id: pcm_parameters.hh 1329 $
+/*****************************************************************************
+ * 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/>. *
+ *****************************************************************************/
#ifndef PCM_PARAMETERS_HH
#define PCM_PARAMETERS_HH
diff --git a/appl/lecture/msm/buckleyleverett/pseudoh2o.hh b/appl/lecture/msm/buckleyleverett/pseudoh2o.hh
index 8cbde7c6f4a76ff6975fc5ca58bafce4b5f40e34..15c517080acd797fc10a91a79cb3582383bb162a 100644
--- a/appl/lecture/msm/buckleyleverett/pseudoh2o.hh
+++ b/appl/lecture/msm/buckleyleverett/pseudoh2o.hh
@@ -4,13 +4,18 @@
* University of Stuttgart, Germany *
* email: <givenname>.<name>@iws.uni-stuttgart.de *
* *
- * This program is free software; you can redistribute it and/or modify *
+ * 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, as long as this copyright notice *
- * is included in its original form. *
+ * the Free Software Foundation, either version 2 of the License, or *
+ * (at your option) any later version. *
* *
- * This program is distributed WITHOUT ANY WARRANTY. *
+ * 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
diff --git a/appl/lecture/msm/buckleyleverett/pseudooil.hh b/appl/lecture/msm/buckleyleverett/pseudooil.hh
index fa2e4b265206cb1f88db48e7a33b366744751feb..526c2701c445e20f2e8063be033cc9b11441bf2e 100644
--- a/appl/lecture/msm/buckleyleverett/pseudooil.hh
+++ b/appl/lecture/msm/buckleyleverett/pseudooil.hh
@@ -4,13 +4,18 @@
* University of Stuttgart, Germany *
* email: <givenname>.<name>@iws.uni-stuttgart.de *
* *
- * This program is free software; you can redistribute it and/or modify *
+ * 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, as long as this copyright notice *
- * is included in its original form. *
+ * the Free Software Foundation, either version 2 of the License, or *
+ * (at your option) any later version. *
* *
- * This program is distributed WITHOUT ANY WARRANTY. *
+ * 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
diff --git a/appl/lecture/msm/mcwhorter/external_interface.hh b/appl/lecture/msm/mcwhorter/external_interface.hh
index 0fd3bd7be233005483bd7dbc548e4a4ba3295893..979e682539465f7d55cc925311988f8e95c01498 100644
--- a/appl/lecture/msm/mcwhorter/external_interface.hh
+++ b/appl/lecture/msm/mcwhorter/external_interface.hh
@@ -1,4 +1,18 @@
// $Id: pcm_parameters.hh 1329 $
+/*****************************************************************************
+ * 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/>. *
+ *****************************************************************************/
#ifndef PCM_PARAMETERS_HH
#define PCM_PARAMETERS_HH
diff --git a/appl/lecture/msm/mcwhorter/mcwhorter_analytic.hh b/appl/lecture/msm/mcwhorter/mcwhorter_analytic.hh
index 876b9bd74f42199e6486b47ee57c4b0041d9427c..5c8783b92e951e058c40f2f428294de9bf01345b 100644
--- a/appl/lecture/msm/mcwhorter/mcwhorter_analytic.hh
+++ b/appl/lecture/msm/mcwhorter/mcwhorter_analytic.hh
@@ -1,390 +1,403 @@
-// $Id$
-
+// $Id$
+/*****************************************************************************
+ * 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/>. *
+ *****************************************************************************/
#ifndef DUMUX_MCWHORTER_ANALYTIC_HH
#define DUMUX_MCWHORTER_ANALYTIC_HH
-
-/**
- * @file
- * @brief Analytic solution of
- * the McWhorter problem
- * @author Markus Wolff, Anneli Schöniger
- */
-
+
+/**
+ * @file
+ * @brief Analytic solution of
+ * the McWhorter problem
+ * @author Markus Wolff, Anneli Schöniger
+ */
+
namespace Dumux
-{
-/**
- * @brief Analytic solution of
- * the McWhorter problem
- *
- * for naming of variables see "An Improved Semi-Analytical Solution for Verification
- * of Numerical Models of Two-Phase Flow in Porous Media"
- * (R. Fucik, J. Mikyska, M. Benes, T. H. Illangasekare; 2007)
- */
-
-template<class TypeTag>
-class McWhorterAnalytic
-{
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(Problem)) Problem;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(Grid)) Grid;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(GridView)) GridView;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(Scalar)) Scalar;
-
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(SpatialParameters)) SpatialParameters;
- typedef typename SpatialParameters::MaterialLaw MaterialLaw;
- typedef typename MaterialLaw::Params MaterialLawParams;
-
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(FluidSystem)) FluidSystem;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(FluidState)) FluidState;
-
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(TwoPIndices)) Indices;
-
- enum
- {
- dim = GridView::dimension, dimworld = GridView::dimensionworld
- };
- enum
- {
- wPhaseIdx = Indices::wPhaseIdx, nPhaseIdx = Indices::nPhaseIdx
- };
-
- typedef Dune::BlockVector<Dune::FieldVector<Scalar, 1> > BlockVector;
- typedef typename GridView::Traits::template Codim<0>::Entity Element;
- typedef typename GridView::template Codim<0>::Iterator ElementIterator;
- typedef Dune::FieldVector<Scalar, dimworld> GlobalPosition;
-
-public:
-
+{
+/**
+ * @brief Analytic solution of
+ * the McWhorter problem
+ *
+ * for naming of variables see "An Improved Semi-Analytical Solution for Verification
+ * of Numerical Models of Two-Phase Flow in Porous Media"
+ * (R. Fucik, J. Mikyska, M. Benes, T. H. Illangasekare; 2007)
+ */
+
+template<class TypeTag>
+class McWhorterAnalytic
+{
+ typedef typename GET_PROP_TYPE(TypeTag, PTAG(Problem)) Problem;
+ typedef typename GET_PROP_TYPE(TypeTag, PTAG(Grid)) Grid;
+ typedef typename GET_PROP_TYPE(TypeTag, PTAG(GridView)) GridView;
+ typedef typename GET_PROP_TYPE(TypeTag, PTAG(Scalar)) Scalar;
+
+ typedef typename GET_PROP_TYPE(TypeTag, PTAG(SpatialParameters)) SpatialParameters;
+ typedef typename SpatialParameters::MaterialLaw MaterialLaw;
+ typedef typename MaterialLaw::Params MaterialLawParams;
+
+ typedef typename GET_PROP_TYPE(TypeTag, PTAG(FluidSystem)) FluidSystem;
+ typedef typename GET_PROP_TYPE(TypeTag, PTAG(FluidState)) FluidState;
+
+ typedef typename GET_PROP_TYPE(TypeTag, PTAG(TwoPIndices)) Indices;
+
+ enum
+ {
+ dim = GridView::dimension, dimworld = GridView::dimensionworld
+ };
+ enum
+ {
+ wPhaseIdx = Indices::wPhaseIdx, nPhaseIdx = Indices::nPhaseIdx
+ };
+
+ typedef Dune::BlockVector<Dune::FieldVector<Scalar, 1> > BlockVector;
+ typedef typename GridView::Traits::template Codim<0>::Entity Element;
+ typedef typename GridView::template Codim<0>::Iterator ElementIterator;
+ typedef Dune::FieldVector<Scalar, dimworld> GlobalPosition;
+
+public:
+
// functions needed for analytical solution
-
+
void initializeAnalytic()
- {
- analyticSolution_.resize(size_);
- analyticSolution_=0;
- error_.resize(size_);
- error_=0;
- elementVolume_.resize(size_);
- elementVolume_=0;
-
- return;
- }
-
+ {
+ analyticSolution_.resize(size_);
+ analyticSolution_=0;
+ error_.resize(size_);
+ error_=0;
+ elementVolume_.resize(size_);
+ elementVolume_=0;
+
+ return;
+ }
+
void calcSatError(BlockVector &Approx)
- {
- error_=0;
- elementVolume_=0;
-
- ElementIterator eItEnd = problem_.gridView().template end<0> ();
-
+ {
+ error_=0;
+ elementVolume_=0;
+
+ ElementIterator eItEnd = problem_.gridView().template end<0> ();
+
for (ElementIterator eIt = problem_.gridView().template end<0> (); eIt!= eItEnd; ++eIt)
- {
+ {
// get entity
- const Element& element = *eIt;
- int index = problem_.variables().index(*eIt);
- elementVolume_[index]= element.geometry().volume();
- // std::cout<<"elementVolume_ = "<<elementVolume_[index]<<std::endl;
- }
-
- double globalVolume = elementVolume_.one_norm();
- //std::cout<<"globalVolume = "<<globalVolume<<std::endl; TODO: globalVolume always zero!
-
+ const Element& element = *eIt;
+ int index = problem_.variables().index(*eIt);
+ elementVolume_[index]= element.geometry().volume();
+ // std::cout<<"elementVolume_ = "<<elementVolume_[index]<<std::endl;
+ }
+
+ double globalVolume = elementVolume_.one_norm();
+ //std::cout<<"globalVolume = "<<globalVolume<<std::endl; TODO: globalVolume always zero!
+
for (int i=0; i<size_; i++)
- {
- error_[i]=analyticSolution_[i]-Approx[i];
- //std::cout<<"error_ = "<<error_[i]<<std::endl;
- //std::cout<<"analyticSolution_ = "<<analyticSolution_[i]<<std::endl;
- //std::cout<<"Approx = "<<Approx[i]<<std::endl;
- }
-
- // std::cout<<"error_ = "<<error_<<std::endl;
-
- double diffNorm = error_.two_norm();
- // std::cout<<"diffNorm = "<<diffNorm<<std::endl;
-
+ {
+ error_[i]=analyticSolution_[i]-Approx[i];
+ //std::cout<<"error_ = "<<error_[i]<<std::endl;
+ //std::cout<<"analyticSolution_ = "<<analyticSolution_[i]<<std::endl;
+ //std::cout<<"Approx = "<<Approx[i]<<std::endl;
+ }
+
+ // std::cout<<"error_ = "<<error_<<std::endl;
+
+ double diffNorm = error_.two_norm();
+ // std::cout<<"diffNorm = "<<diffNorm<<std::endl;
+
for (int i=0; i<size_; i++)
- {
- error_[i] = (globalVolume) ? diffNorm * pow((elementVolume_[i]/globalVolume), 0.5) : 0;
- }
-
- return;
- }
-
+ {
+ error_[i] = (globalVolume) ? diffNorm * pow((elementVolume_[i]/globalVolume), 0.5) : 0;
+ }
+
+ return;
+ }
+
void prepareAnalytic()
- {
- const MaterialLawParams& materialLawParams(problem_.spatialParameters().materialLawParams(dummyGlobal_, dummyElement_));
-
- swr_ = materialLawParams.Swr();
- snr_ = materialLawParams.Snr();
- porosity_ = problem_.spatialParameters().porosity(dummyGlobal_, dummyElement_);
- permeability_ = problem_.spatialParameters().intrinsicPermeability(dummyGlobal_, dummyElement_)[0][0];
- sInit_ = problem_.initSat(dummyGlobal_, dummyElement_);
- Scalar s0 =(1 - snr_ - swr_);
- time_=0;
-
- h_= (s0 - sInit_)/intervalNum_;
-// std::cout<<"h_= "<<h_<<std::endl;
-
+ {
+ const MaterialLawParams& materialLawParams(problem_.spatialParameters().materialLawParams(dummyGlobal_, dummyElement_));
+
+ swr_ = materialLawParams.Swr();
+ snr_ = materialLawParams.Snr();
+ porosity_ = problem_.spatialParameters().porosity(dummyGlobal_, dummyElement_);
+ permeability_ = problem_.spatialParameters().intrinsicPermeability(dummyGlobal_, dummyElement_)[0][0];
+ sInit_ = problem_.initSat(dummyGlobal_, dummyElement_);
+ Scalar s0 =(1 - snr_ - swr_);
+ time_=0;
+
+ h_= (s0 - sInit_)/intervalNum_;
+// std::cout<<"h_= "<<h_<<std::endl;
+
// define saturation range for analytic solution
- satVec_= swr_;
+ satVec_= swr_;
for (int i=1; i<pointNum_; i++)
- {
- satVec_[i]=satVec_[i-1]+h_;
- }
- FluidState fluidState;
- Scalar temp = problem_.temperature(dummyGlobal_, dummyElement_);
- Scalar press = problem_.referencePressure(dummyGlobal_, dummyElement_);
- Scalar viscosityW = FluidSystem::phaseViscosity(wPhaseIdx, temp, press, fluidState);
- Scalar viscosityNW = FluidSystem::phaseViscosity(nPhaseIdx, temp, press, fluidState);
-
-
+ {
+ satVec_[i]=satVec_[i-1]+h_;
+ }
+ FluidState fluidState;
+ Scalar temp = problem_.temperature(dummyGlobal_, dummyElement_);
+ Scalar press = problem_.referencePressure(dummyGlobal_, dummyElement_);
+ Scalar viscosityW = FluidSystem::phaseViscosity(wPhaseIdx, temp, press, fluidState);
+ Scalar viscosityNW = FluidSystem::phaseViscosity(nPhaseIdx, temp, press, fluidState);
+
+
// get fractional flow function vector
for (int i=0; i<pointNum_; i++)
- {
- fractionalW_[i] = MaterialLaw::krw(materialLawParams, satVec_[i])/viscosityW;
- fractionalW_[i] /= (fractionalW_[i] + MaterialLaw::krn(materialLawParams, satVec_[i])/viscosityNW);
- }
-
+ {
+ fractionalW_[i] = MaterialLaw::krw(materialLawParams, satVec_[i])/viscosityW;
+ fractionalW_[i] /= (fractionalW_[i] + MaterialLaw::krn(materialLawParams, satVec_[i])/viscosityNW);
+ }
+
// get capillary pressure derivatives
- dpcdsw_=0;
-
+ dpcdsw_=0;
+
for (int i=0; i<pointNum_; i++)
- {
- dpcdsw_[i] = MaterialLaw::dpC_dSw(materialLawParams, satVec_[i]);
- }
-// std::cout<<"dpcdsw = "<<dpcdsw_<<std::endl;
-
+ {
+ dpcdsw_[i] = MaterialLaw::dpC_dSw(materialLawParams, satVec_[i]);
+ }
+// std::cout<<"dpcdsw = "<<dpcdsw_<<std::endl;
+
// set initial fW
if (sInit_ == 0)
- fInit_=0;
+ fInit_=0;
else
- fInit_=fractionalW_[0];
-
- fractionalW_[0]=0;
-
+ fInit_=fractionalW_[0];
+
+ fractionalW_[0]=0;
+
// normalize fW
// with r_ = qt/q0
// qt: total volume flux, q0: displacing phase flux at boundary
// --> r_ = 1 for unidirectional displacement; r_ = 0 for impermeable boundary
for (int i=0; i<pointNum_; i++)
- {
- fn_[i]= r_ * (fractionalW_[i] - fInit_)/ (1 - r_ * fInit_);
- }
-
- // std::cout<<"r_ = "<<r_<<std::endl;
- // std::cout<<"fn_ = "<<fn_<<std::endl;
-
+ {
+ fn_[i]= r_ * (fractionalW_[i] - fInit_)/ (1 - r_ * fInit_);
+ }
+
+ // std::cout<<"r_ = "<<r_<<std::endl;
+ // std::cout<<"fn_ = "<<fn_<<std::endl;
+
// diffusivity function
for (int i=0; i<pointNum_; i++)
- {d_[i] = fractionalW_[i]*(-dpcdsw_[i])*(MaterialLaw::krn(materialLawParams, satVec_[i])/viscosityNW)*permeability_;
- }
-
- // std::cout<<"fractionalW_ = "<<fractionalW_<<std::endl;
- // std::cout<<"permeability_ = "<<permeability_<<std::endl;
- // std::cout<<"d_ = "<<d_<<std::endl;
-
-
+ {d_[i] = fractionalW_[i]*(-dpcdsw_[i])*(MaterialLaw::krn(materialLawParams, satVec_[i])/viscosityNW)*permeability_;
+ }
+
+ // std::cout<<"fractionalW_ = "<<fractionalW_<<std::endl;
+ // std::cout<<"permeability_ = "<<permeability_<<std::endl;
+ // std::cout<<"d_ = "<<d_<<std::endl;
+
+
// gk_: part of fractional flow function
// initial guess for gk_
for (int i=0; i<pointNum_; i++)
- {
- gk_[i] = d_[i]/(1-fn_[i]);
- }
-
- gk_[0] = 0;
-
-// std::cout<<"gk_ = "<<gk_<<std::endl;
-
- return;
- }
-
+ {
+ gk_[i] = d_[i]/(1-fn_[i]);
+ }
+
+ gk_[0] = 0;
+
+// std::cout<<"gk_ = "<<gk_<<std::endl;
+
+ return;
+ }
+
void updateExSol()
- {
- // with displacing phase flux at boundary q0 = A * 1/sqrt(t)
+ {
+ // with displacing phase flux at boundary q0 = A * 1/sqrt(t)
// Akm1, Ak: successive approximations of A
- double Ak = 0;
- double Akm1 = 0;
- double diff = 1e100;
-
+ double Ak = 0;
+ double Akm1 = 0;
+ double diff = 1e100;
+
// partial numerical integrals a_, b_
- a_=0, b_=0;
- fp_=0;
-
+ a_=0, b_=0;
+ fp_=0;
+
// approximation of integral I
- double I0 = 0;
- double Ii = 0;
-
- int k = 0;
-
+ double I0 = 0;
+ double Ii = 0;
+
+ int k = 0;
+
while (diff> tolAnalytic_)
- {
- k++;
-// std::cout<<" k = "<<k<<std::endl;
+ {
+ k++;
+// std::cout<<" k = "<<k<<std::endl;
if (k> 50000)
- {
- std::cout<<"Analytic solution: Too many iterations!"<<std::endl;
- break;
- }
-
- Akm1=Ak;
- I0=0;
+ {
+ std::cout<<"Analytic solution: Too many iterations!"<<std::endl;
+ break;
+ }
+
+ Akm1=Ak;
+ I0=0;
for (int i=0; i<intervalNum_; i++)
- {
- a_[i] = 0.5 * h_ * sInit_ *(gk_[i] + gk_[i+1])+ pow(h_, 2) / 6* ((3* i + 1) * gk_[i]
- + (3 * i + 2) * gk_[i+1]);
- b_[i] = 0.5 * h_ * (gk_[i] + gk_[i+1]);
- I0 += (a_[i] - sInit_ * b_[i]);
- }
- // std::cout<<" I0 = "<<I0<<std::endl;
-
- gk_[0]=0;
+ {
+ a_[i] = 0.5 * h_ * sInit_ *(gk_[i] + gk_[i+1])+ pow(h_, 2) / 6* ((3* i + 1) * gk_[i]
+ + (3 * i + 2) * gk_[i+1]);
+ b_[i] = 0.5 * h_ * (gk_[i] + gk_[i+1]);
+ I0 += (a_[i] - sInit_ * b_[i]);
+ }
+ // std::cout<<" I0 = "<<I0<<std::endl;
+
+ gk_[0]=0;
for (int i=1; i<pointNum_; i++)
- {
- Ii=0;
+ {
+ Ii=0;
for (int j = i; j<intervalNum_; j++)
- Ii += (a_[j] - satVec_[i] * b_[j]);
- //gk_[i] = d_[i] + gk_[i]*(fn_[i] + Ii/I0); // method A
- gk_[i] = (d_[i] + gk_[i]*fn_[i])/(1 - Ii/I0); // method B
- }
-
+ Ii += (a_[j] - satVec_[i] * b_[j]);
+ //gk_[i] = d_[i] + gk_[i]*(fn_[i] + Ii/I0); // method A
+ gk_[i] = (d_[i] + gk_[i]*fn_[i])/(1 - Ii/I0); // method B
+ }
+
// with f(sInit) = 0: relationship between A and sInit
- Ak = pow((0.5*porosity_/pow((1 - fInit_), 2)*I0), 0.5);
- diff=fabs(Ak - Akm1);
- // std::cout<<"diff = "<<diff<<std::endl;
- }
-
- // std::cout<<" b_ = "<<b_<<std::endl;
- // std::cout<<" Ak = "<<Ak<<std::endl;
-
-
+ Ak = pow((0.5*porosity_/pow((1 - fInit_), 2)*I0), 0.5);
+ diff=fabs(Ak - Akm1);
+ // std::cout<<"diff = "<<diff<<std::endl;
+ }
+
+ // std::cout<<" b_ = "<<b_<<std::endl;
+ // std::cout<<" Ak = "<<Ak<<std::endl;
+
+
// fp_: first derivative of f
for (int i = 0; i<pointNum_; i++)
- {
+ {
for (int j = i; j<intervalNum_; j++)
- fp_[i] += b_[j]/I0;
- }
-
- // std::cout<<" fp_ = "<<fp_<<std::endl;
- // std::cout<<fInit_<<std::endl;
-
+ fp_[i] += b_[j]/I0;
+ }
+
+ // std::cout<<" fp_ = "<<fp_<<std::endl;
+ // std::cout<<fInit_<<std::endl;
+
for (int i = 0; i<pointNum_; i++)
- {
- xf_[i]= 2 * Ak * (1 - fInit_ * r_)/ porosity_ * fp_[i]* pow(time_, 0.5);
- }
-
-// std::cout<<" xf_ = "<<xf_<<std::endl;
-
+ {
+ xf_[i]= 2 * Ak * (1 - fInit_ * r_)/ porosity_ * fp_[i]* pow(time_, 0.5);
+ }
+
+// std::cout<<" xf_ = "<<xf_<<std::endl;
+
// iterate over vertices and get analytical saturation solution
- ElementIterator eItEnd = problem_.gridView().template end<0> ();
+ ElementIterator eItEnd = problem_.gridView().template end<0> ();
for (ElementIterator eIt = problem_.gridView().template begin<0> (); eIt!= eItEnd; ++eIt)
- {
- // get global coordinate of cell center
- const GlobalPosition& globalPos = eIt->geometry().center();
-
-// std::cout<<"globalPos = "<<globalPos[0]<<", x0 = "<<xf_[0]<<"\n";
-
+ {
+ // get global coordinate of cell center
+ const GlobalPosition& globalPos = eIt->geometry().center();
+
+// std::cout<<"globalPos = "<<globalPos[0]<<", x0 = "<<xf_[0]<<"\n";
+
// find index of current vertex
- int index = problem_.variables().index(*eIt);
-
+ int index = problem_.variables().index(*eIt);
+
// find x_f next to global coordinate of the vertex
- int xnext = 0;
+ int xnext = 0;
for (int i=intervalNum_; i>0; i--)
- {
+ {
if (globalPos[0] <= xf_[i])
- {
- xnext = i;
- break;
- }
- }
-
+ {
+ xnext = i;
+ break;
+ }
+ }
+
// account for the area not yet reached by the front
if (globalPos[0]> xf_[0])
- {
- analyticSolution_[index] = sInit_;
- continue;
- }
-
+ {
+ analyticSolution_[index] = sInit_;
+ continue;
+ }
+
if (globalPos[0] <= xf_[0])
- {
- analyticSolution_[index] = satVec_[xnext];
- continue;
- }
-
-// std::cout<<"Analytical = "<<satVec_[xnext]<<std::endl;
- }
-
+ {
+ analyticSolution_[index] = satVec_[xnext];
+ continue;
+ }
+
+// std::cout<<"Analytical = "<<satVec_[xnext]<<std::endl;
+ }
+
// call function to calculate the saturation error
- calcSatError(problem_.variables().saturation());
- return;
- }
-
- void calculateAnalyticSolution()
- {
- time_ += problem_.timeManager().timeStepSize();
- updateExSol();
- }
-
- //Write saturation and pressure into file
- template<class MultiWriter>
- void addOutputVtkFields(MultiWriter &writer)
- {
- BlockVector *analyticSolution = writer.template createField<Scalar, 1> (size_);
- BlockVector *error = writer.template createField<Scalar, 1> (size_);
-
- *analyticSolution = analyticSolution_;
- *error = error_;
-
- writer.addCellData(analyticSolution, "saturation (exact solution)");
- writer.addCellData(error, "error_");
-
- return;
- }
-
- McWhorterAnalytic(Problem& problem, Scalar tolAnalytic = 1e-14) :
- problem_(problem), analyticSolution_(0), error_(0), elementVolume_(0), size_(problem.gridView().size(0)), dummyElement_(
- *(problem_.gridView().template begin<0> ())), dummyGlobal_(GlobalPosition(1)), tolAnalytic_(tolAnalytic)
- {
- initializeAnalytic();
- prepareAnalytic();
- }
-
-protected:
-
-
-private:
- Problem& problem_;
-
- BlockVector analyticSolution_;
- BlockVector error_;
- BlockVector elementVolume_;
-
- int size_;
-
- const Element& dummyElement_;
- const GlobalPosition& dummyGlobal_;
-
- Scalar tolAnalytic_;
- Scalar r_;
-
- Scalar swr_;
- Scalar snr_;
- Scalar porosity_;
- Scalar sInit_;
- Scalar time_;
- Scalar permeability_;
+ calcSatError(problem_.variables().saturation());
+ return;
+ }
+
+ void calculateAnalyticSolution()
+ {
+ time_ += problem_.timeManager().timeStepSize();
+ updateExSol();
+ }
+
+ //Write saturation and pressure into file
+ template<class MultiWriter>
+ void addOutputVtkFields(MultiWriter &writer)
+ {
+ BlockVector *analyticSolution = writer.template createField<Scalar, 1> (size_);
+ BlockVector *error = writer.template createField<Scalar, 1> (size_);
+
+ *analyticSolution = analyticSolution_;
+ *error = error_;
+
+ writer.addCellData(analyticSolution, "saturation (exact solution)");
+ writer.addCellData(error, "error_");
+
+ return;
+ }
+
+ McWhorterAnalytic(Problem& problem, Scalar tolAnalytic = 1e-14) :
+ problem_(problem), analyticSolution_(0), error_(0), elementVolume_(0), size_(problem.gridView().size(0)), dummyElement_(
+ *(problem_.gridView().template begin<0> ())), dummyGlobal_(GlobalPosition(1)), tolAnalytic_(tolAnalytic)
+ {
+ initializeAnalytic();
+ prepareAnalytic();
+ }
+
+protected:
+
+
+private:
+ Problem& problem_;
+
+ BlockVector analyticSolution_;
+ BlockVector error_;
+ BlockVector elementVolume_;
+
+ int size_;
+
+ const Element& dummyElement_;
+ const GlobalPosition& dummyGlobal_;
+
+ Scalar tolAnalytic_;
+ Scalar r_;
+
+ Scalar swr_;
+ Scalar snr_;
+ Scalar porosity_;
+ Scalar sInit_;
+ Scalar time_;
+ Scalar permeability_;
enum
- { intervalNum_ = 1000, pointNum_ = intervalNum_+1};
- Dune::FieldVector<Scalar, pointNum_> satVec_;
- Dune::FieldVector<Scalar,pointNum_> fractionalW_;
- Dune::FieldVector<Scalar, pointNum_> dpcdsw_;
- Dune::FieldVector<Scalar, pointNum_> fn_;
- Dune::FieldVector<Scalar, pointNum_> d_;
- Dune::FieldVector<Scalar, pointNum_> gk_;
- Dune::FieldVector<Scalar, pointNum_> xf_;
- Scalar fInit_;
- Scalar h_;
- Dune::FieldVector<Scalar,intervalNum_> a_;
- Dune::FieldVector<Scalar,intervalNum_> b_;
- Dune::FieldVector<Scalar,pointNum_> fp_;
-
-};
-}
+ { intervalNum_ = 1000, pointNum_ = intervalNum_+1};
+ Dune::FieldVector<Scalar, pointNum_> satVec_;
+ Dune::FieldVector<Scalar,pointNum_> fractionalW_;
+ Dune::FieldVector<Scalar, pointNum_> dpcdsw_;
+ Dune::FieldVector<Scalar, pointNum_> fn_;
+ Dune::FieldVector<Scalar, pointNum_> d_;
+ Dune::FieldVector<Scalar, pointNum_> gk_;
+ Dune::FieldVector<Scalar, pointNum_> xf_;
+ Scalar fInit_;
+ Scalar h_;
+ Dune::FieldVector<Scalar,intervalNum_> a_;
+ Dune::FieldVector<Scalar,intervalNum_> b_;
+ Dune::FieldVector<Scalar,pointNum_> fp_;
+
+};
+}
#endif
diff --git a/appl/lecture/msm/mcwhorter/mcwhorter_ff.cc b/appl/lecture/msm/mcwhorter/mcwhorter_ff.cc
index 78a721c139a7b6d90fb0aca1128bae2d53fa9700..f204914ac40a0810fc2560f193a10522c61783ae 100644
--- a/appl/lecture/msm/mcwhorter/mcwhorter_ff.cc
+++ b/appl/lecture/msm/mcwhorter/mcwhorter_ff.cc
@@ -1,3 +1,17 @@
+/*****************************************************************************
+ * 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/>. *
+ *****************************************************************************/
#include "config.h"
#include <iostream>
#include <boost/format.hpp>
diff --git a/appl/lecture/msm/mcwhorter/mcwhorter_spatialparams.hh b/appl/lecture/msm/mcwhorter/mcwhorter_spatialparams.hh
index 1e6be79da4bde0a22de66226dfac6dd8a824ea0c..657368f2688c4f38497affd15eb790f4ef12d3fb 100644
--- a/appl/lecture/msm/mcwhorter/mcwhorter_spatialparams.hh
+++ b/appl/lecture/msm/mcwhorter/mcwhorter_spatialparams.hh
@@ -6,13 +6,18 @@
* University of Stuttgart, Germany *
* email: <givenname>.<name>@iws.uni-stuttgart.de *
* *
- * This program is free software; you can redistribute it and/or modify *
+ * 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, as long as this copyright notice *
- * is included in its original form. *
+ * the Free Software Foundation, either version 2 of the License, or *
+ * (at your option) any later version. *
* *
- * This program is distributed WITHOUT ANY WARRANTY. *
+ * 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/>. *
*****************************************************************************/
#ifndef MCWHORTER_SPATIALPARAMETERS_HH
#define MCWHORTER_SPATIALPARAMETERS_HH
diff --git a/appl/lecture/msm/mcwhorter/mcwhorterproblem.hh b/appl/lecture/msm/mcwhorter/mcwhorterproblem.hh
index 76b99a01301911e538dfff34d9886f24c954392e..02d421e6941f29f680172053c93d4e84c554074c 100644
--- a/appl/lecture/msm/mcwhorter/mcwhorterproblem.hh
+++ b/appl/lecture/msm/mcwhorter/mcwhorterproblem.hh
@@ -1,3 +1,17 @@
+/*****************************************************************************
+ * 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/>. *
+ *****************************************************************************/
#ifndef DUMUX_MCWHORTERPROBLEM_HH
#define DUMUX_MCWHORTERPROBLEM_HH
diff --git a/dumux/boxmodels/1p/1pfluxvariables.hh b/dumux/boxmodels/1p/1pfluxvariables.hh
index c4d5b877cd26afb7fadbe4de24aade0cc2036a04..df22932d0e561dbcf4421236048bb0cde11adcf1 100644
--- a/dumux/boxmodels/1p/1pfluxvariables.hh
+++ b/dumux/boxmodels/1p/1pfluxvariables.hh
@@ -6,13 +6,18 @@
* University of Stuttgart, Germany *
* email: <givenname>.<name>@iws.uni-stuttgart.de *
* *
- * This program is free software; you can redistribute it and/or modify *
+ * 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, as long as this copyright notice *
- * is included in its original form. *
+ * the Free Software Foundation, either version 2 of the License, or *
+ * (at your option) any later version. *
* *
- * This program is distributed WITHOUT ANY WARRANTY. *
+ * 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
diff --git a/dumux/boxmodels/1p/1pindices.hh b/dumux/boxmodels/1p/1pindices.hh
index 5fa95e63a944613622a3e75136b5e6b72b461ae6..3de458287b21205b601bde27cc8d5268c5b349a4 100644
--- a/dumux/boxmodels/1p/1pindices.hh
+++ b/dumux/boxmodels/1p/1pindices.hh
@@ -6,13 +6,18 @@
* University of Stuttgart, Germany *
* email: <givenname>.<name>@iws.uni-stuttgart.de *
* *
- * This program is free software; you can redistribute it and/or modify *
+ * 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, as long as this copyright notice *
- * is included in its original form. *
+ * the Free Software Foundation, either version 2 of the License, or *
+ * (at your option) any later version. *
* *
- * This program is distributed WITHOUT ANY WARRANTY. *
+ * 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
diff --git a/dumux/boxmodels/1p/1plocalresidual.hh b/dumux/boxmodels/1p/1plocalresidual.hh
index f9238ba45cc442f31df04c9469c830ff7f0517b0..88e6bd1537e7e193d6739e0eda2922ecb117c7bb 100644
--- a/dumux/boxmodels/1p/1plocalresidual.hh
+++ b/dumux/boxmodels/1p/1plocalresidual.hh
@@ -11,13 +11,18 @@
* University of Stuttgart, Germany *
* email: <givenname>.<name>@iws.uni-stuttgart.de *
* *
- * This program is free software; you can redistribute it and/or modify *
+ * 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, as long as this copyright notice *
- * is included in its original form. *
+ * the Free Software Foundation, either version 2 of the License, or *
+ * (at your option) any later version. *
* *
- * This program is distributed WITHOUT ANY WARRANTY. *
+ * 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
diff --git a/dumux/boxmodels/1p/1pmodel.hh b/dumux/boxmodels/1p/1pmodel.hh
index 096e6c3520ea13a9fbee3b43f6a7292fbe61477b..e2cff98a93cec2aa14698ba487e09f2edf67c446 100644
--- a/dumux/boxmodels/1p/1pmodel.hh
+++ b/dumux/boxmodels/1p/1pmodel.hh
@@ -6,13 +6,18 @@
* University of Stuttgart, Germany *
* email: <givenname>.<name>@iws.uni-stuttgart.de *
* *
- * This program is free software; you can redistribute it and/or modify *
+ * 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, as long as this copyright notice *
- * is included in its original form. *
+ * the Free Software Foundation, either version 2 of the License, or *
+ * (at your option) any later version. *
* *
- * This program is distributed WITHOUT ANY WARRANTY. *
+ * 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
diff --git a/dumux/boxmodels/1p/1pproblem.hh b/dumux/boxmodels/1p/1pproblem.hh
index 618e740f3713c7c37c4a98e8ccafca342c70cdc4..86c4b27f2ed9d506f4d55dd1eeaa2ee2b0a7aa01 100644
--- a/dumux/boxmodels/1p/1pproblem.hh
+++ b/dumux/boxmodels/1p/1pproblem.hh
@@ -5,13 +5,18 @@
* University of Stuttgart, Germany *
* email: <givenname>.<name>@iws.uni-stuttgart.de *
* *
- * This program is free software; you can redistribute it and/or modify *
+ * 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, as long as this copyright notice *
- * is included in its original form. *
+ * the Free Software Foundation, either version 2 of the License, or *
+ * (at your option) any later version. *
* *
- * This program is distributed WITHOUT ANY WARRANTY. *
+ * 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
diff --git a/dumux/boxmodels/1p/1pproperties.hh b/dumux/boxmodels/1p/1pproperties.hh
index bc6aa89b7e50ef0d03cf7817e75369d998e77eb0..be1a028c8a110f0d75704cbd56fa960e4ab3c4c6 100644
--- a/dumux/boxmodels/1p/1pproperties.hh
+++ b/dumux/boxmodels/1p/1pproperties.hh
@@ -6,13 +6,18 @@
* University of Stuttgart, Germany *
* email: <givenname>.<name>@iws.uni-stuttgart.de *
* *
- * This program is free software; you can redistribute it and/or modify *
+ * 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, as long as this copyright notice *
- * is included in its original form. *
+ * the Free Software Foundation, either version 2 of the License, or *
+ * (at your option) any later version. *
* *
- * This program is distributed WITHOUT ANY WARRANTY. *
+ * 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
diff --git a/dumux/boxmodels/1p/1ppropertydefaults.hh b/dumux/boxmodels/1p/1ppropertydefaults.hh
index 344db0f939b9904794716cac36adcf549f3be8dd..b2ffd66ffcfceab257dafff001f7a45f177e6056 100644
--- a/dumux/boxmodels/1p/1ppropertydefaults.hh
+++ b/dumux/boxmodels/1p/1ppropertydefaults.hh
@@ -6,13 +6,18 @@
* University of Stuttgart, Germany *
* email: <givenname>.<name>@iws.uni-stuttgart.de *
* *
- * This program is free software; you can redistribute it and/or modify *
+ * 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, as long as this copyright notice *
- * is included in its original form. *
+ * the Free Software Foundation, either version 2 of the License, or *
+ * (at your option) any later version. *
* *
- * This program is distributed WITHOUT ANY WARRANTY. *
+ * 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
diff --git a/dumux/boxmodels/1p/1pvolumevariables.hh b/dumux/boxmodels/1p/1pvolumevariables.hh
index 7c2bf9cf3df9fe050d8ecd13b184fb34c5cec722..713aaf087edd0ba00cde175e46e127ff7c722682 100644
--- a/dumux/boxmodels/1p/1pvolumevariables.hh
+++ b/dumux/boxmodels/1p/1pvolumevariables.hh
@@ -6,13 +6,18 @@
* University of Stuttgart, Germany *
* email: <givenname>.<name>@iws.uni-stuttgart.de *
* *
- * This program is free software; you can redistribute it and/or modify *
+ * 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, as long as this copyright notice *
- * is included in its original form. *
+ * the Free Software Foundation, either version 2 of the License, or *
+ * (at your option) any later version. *
* *
- * This program is distributed WITHOUT ANY WARRANTY. *
+ * 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
diff --git a/dumux/boxmodels/1p2c/1p2cfluidstate.hh b/dumux/boxmodels/1p2c/1p2cfluidstate.hh
index 320689dc66599b15788586ee24cd361fca35043f..adbc04b6546462e825c1255d97706c3f0d60a851 100644
--- a/dumux/boxmodels/1p2c/1p2cfluidstate.hh
+++ b/dumux/boxmodels/1p2c/1p2cfluidstate.hh
@@ -5,13 +5,18 @@
* University of Stuttgart, Germany *
* email: <givenname>.<name>@iws.uni-stuttgart.de *
* *
- * This program is free software; you can redistribute it and/or modify *
+ * 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, as long as this copyright notice *
- * is included in its original form. *
+ * the Free Software Foundation, either version 2 of the License, or *
+ * (at your option) any later version. *
* *
- * This program is distributed WITHOUT ANY WARRANTY. *
+ * 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
diff --git a/dumux/boxmodels/1p2c/1p2cfluxvariables.hh b/dumux/boxmodels/1p2c/1p2cfluxvariables.hh
index 868472f5d2fc379d1ae90521bd306370f1d52995..da3be2c3348c43d795f7f5df9a2a9f238130e7b6 100644
--- a/dumux/boxmodels/1p2c/1p2cfluxvariables.hh
+++ b/dumux/boxmodels/1p2c/1p2cfluxvariables.hh
@@ -7,13 +7,18 @@
* University of Stuttgart, Germany *
* email: <givenname>.<name>@iws.uni-stuttgart.de *
* *
- * This program is free software; you can redistribute it and/or modify *
+ * 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, as long as this copyright notice *
- * is included in its original form. *
+ * the Free Software Foundation, either version 2 of the License, or *
+ * (at your option) any later version. *
* *
- * This program is distributed WITHOUT ANY WARRANTY. *
+ * 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
diff --git a/dumux/boxmodels/1p2c/1p2cindices.hh b/dumux/boxmodels/1p2c/1p2cindices.hh
index b2c09c9dcf5ee3a8ee90239bc4e7ba34c6699fe4..d3599a3883611604d1e7ee7e95e50f2cad0c8f09 100644
--- a/dumux/boxmodels/1p2c/1p2cindices.hh
+++ b/dumux/boxmodels/1p2c/1p2cindices.hh
@@ -7,13 +7,18 @@
* University of Stuttgart, Germany *
* email: <givenname>.<name>@iws.uni-stuttgart.de *
* *
- * This program is free software; you can redistribute it and/or modify *
+ * 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, as long as this copyright notice *
- * is included in its original form. *
+ * the Free Software Foundation, either version 2 of the License, or *
+ * (at your option) any later version. *
* *
- * This program is distributed WITHOUT ANY WARRANTY. *
+ * 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
diff --git a/dumux/boxmodels/1p2c/1p2clocalresidual.hh b/dumux/boxmodels/1p2c/1p2clocalresidual.hh
index c99118cf2f668ddf723b098274210ab9b059ac28..6828633cb23cc59e7adad521658c3d45a2198677 100644
--- a/dumux/boxmodels/1p2c/1p2clocalresidual.hh
+++ b/dumux/boxmodels/1p2c/1p2clocalresidual.hh
@@ -7,13 +7,18 @@
* University of Stuttgart, Germany *
* email: <givenname>.<name>@iws.uni-stuttgart.de *
* *
- * This program is free software; you can redistribute it and/or modify *
+ * 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, as long as this copyright notice *
- * is included in its original form. *
+ * the Free Software Foundation, either version 2 of the License, or *
+ * (at your option) any later version. *
* *
- * This program is distributed WITHOUT ANY WARRANTY. *
+ * 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
diff --git a/dumux/boxmodels/1p2c/1p2cmodel.hh b/dumux/boxmodels/1p2c/1p2cmodel.hh
index 45d0706ade1d8e43e0695c9b7fc786dcfa6cd683..441edc2b38dd98d22bf56c8f5fbb2bd2a9712deb 100644
--- a/dumux/boxmodels/1p2c/1p2cmodel.hh
+++ b/dumux/boxmodels/1p2c/1p2cmodel.hh
@@ -7,13 +7,18 @@
* University of Stuttgart, Germany *
* email: <givenname>.<name>@iws.uni-stuttgart.de *
* *
- * This program is free software; you can redistribute it and/or modify *
+ * 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, as long as this copyright notice *
- * is included in its original form. *
+ * the Free Software Foundation, either version 2 of the License, or *
+ * (at your option) any later version. *
* *
- * This program is distributed WITHOUT ANY WARRANTY. *
+ * 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
diff --git a/dumux/boxmodels/1p2c/1p2cproblem.hh b/dumux/boxmodels/1p2c/1p2cproblem.hh
index 5cb21b3ff338711203865d467653f643ef76331e..bf83417477e54277f7e0687fb66760bb93aa289a 100644
--- a/dumux/boxmodels/1p2c/1p2cproblem.hh
+++ b/dumux/boxmodels/1p2c/1p2cproblem.hh
@@ -7,13 +7,18 @@
* University of Stuttgart, Germany *
* email: <givenname>.<name>@iws.uni-stuttgart.de *
* *
- * This program is free software; you can redistribute it and/or modify *
+ * 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, as long as this copyright notice *
- * is included in its original form. *
+ * the Free Software Foundation, either version 2 of the License, or *
+ * (at your option) any later version. *
* *
- * This program is distributed WITHOUT ANY WARRANTY. *
+ * 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
diff --git a/dumux/boxmodels/1p2c/1p2cproperties.hh b/dumux/boxmodels/1p2c/1p2cproperties.hh
index 23a7e08ed758951fbe9c72af3fdddf1278f1f5e0..8e323f2f24e525347cbdb3f1c1fef476eaa84599 100644
--- a/dumux/boxmodels/1p2c/1p2cproperties.hh
+++ b/dumux/boxmodels/1p2c/1p2cproperties.hh
@@ -7,13 +7,18 @@
* University of Stuttgart, Germany *
* email: <givenname>.<name>@iws.uni-stuttgart.de *
* *
- * This program is free software; you can redistribute it and/or modify *
+ * 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, as long as this copyright notice *
- * is included in its original form. *
+ * the Free Software Foundation, either version 2 of the License, or *
+ * (at your option) any later version. *
* *
- * This program is distributed WITHOUT ANY WARRANTY. *
+ * 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
diff --git a/dumux/boxmodels/1p2c/1p2cpropertydefaults.hh b/dumux/boxmodels/1p2c/1p2cpropertydefaults.hh
index e3da169ddb430a7d1db5e520026d6197b94b98cc..df60ee2bbcde147a7e7167b94bef166bcefbe79c 100644
--- a/dumux/boxmodels/1p2c/1p2cpropertydefaults.hh
+++ b/dumux/boxmodels/1p2c/1p2cpropertydefaults.hh
@@ -7,13 +7,18 @@
* University of Stuttgart, Germany *
* email: <givenname>.<name>@iws.uni-stuttgart.de *
* *
- * This program is free software; you can redistribute it and/or modify *
+ * 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, as long as this copyright notice *
- * is included in its original form. *
+ * the Free Software Foundation, either version 2 of the License, or *
+ * (at your option) any later version. *
* *
- * This program is distributed WITHOUT ANY WARRANTY. *
+ * 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
diff --git a/dumux/boxmodels/1p2c/1p2cvolumevariables.hh b/dumux/boxmodels/1p2c/1p2cvolumevariables.hh
index cf43492153d9461333a54d5a04f74bd158019c12..37a7c46d2759c0b193ecae4988f77248a338ec33 100644
--- a/dumux/boxmodels/1p2c/1p2cvolumevariables.hh
+++ b/dumux/boxmodels/1p2c/1p2cvolumevariables.hh
@@ -7,13 +7,18 @@
* University of Stuttgart, Germany *
* email: <givenname>.<name>@iws.uni-stuttgart.de *
* *
- * This program is free software; you can redistribute it and/or modify *
+ * 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, as long as this copyright notice *
- * is included in its original form. *
+ * the Free Software Foundation, either version 2 of the License, or *
+ * (at your option) any later version. *
* *
- * This program is distributed WITHOUT ANY WARRANTY. *
+ * 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
diff --git a/dumux/boxmodels/2p/2pfluidstate.hh b/dumux/boxmodels/2p/2pfluidstate.hh
index cde712bd18a3d09e3138c4aff94360d9a2ad8372..0191e2fac29763181c5dab190dc5a10714a6f7a2 100644
--- a/dumux/boxmodels/2p/2pfluidstate.hh
+++ b/dumux/boxmodels/2p/2pfluidstate.hh
@@ -5,13 +5,18 @@
* University of Stuttgart, Germany *
* email: <givenname>.<name>@iws.uni-stuttgart.de *
* *
- * This program is free software; you can redistribute it and/or modify *
+ * 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, as long as this copyright notice *
- * is included in its original form. *
+ * the Free Software Foundation, either version 2 of the License, or *
+ * (at your option) any later version. *
* *
- * This program is distributed WITHOUT ANY WARRANTY. *
+ * 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
diff --git a/dumux/boxmodels/2p/2pfluxvariables.hh b/dumux/boxmodels/2p/2pfluxvariables.hh
index 367b6e8f3dfc15811dd96e09e4559349cb32cbba..7f89df5c3d3f12ecdf2aa1bf8e201da12de25d61 100644
--- a/dumux/boxmodels/2p/2pfluxvariables.hh
+++ b/dumux/boxmodels/2p/2pfluxvariables.hh
@@ -6,13 +6,18 @@
* University of Stuttgart, Germany *
* email: <givenname>.<name>@iws.uni-stuttgart.de *
* *
- * This program is free software; you can redistribute it and/or modify *
+ * 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, as long as this copyright notice *
- * is included in its original form. *
+ * the Free Software Foundation, either version 2 of the License, or *
+ * (at your option) any later version. *
* *
- * This program is distributed WITHOUT ANY WARRANTY. *
+ * 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
diff --git a/dumux/boxmodels/2p/2pindices.hh b/dumux/boxmodels/2p/2pindices.hh
index 09db757fe628bd911ec895efad29fe16f4531ca9..baf72d0da1e8903e29081b0e0e0716d464f31984 100644
--- a/dumux/boxmodels/2p/2pindices.hh
+++ b/dumux/boxmodels/2p/2pindices.hh
@@ -6,13 +6,18 @@
* University of Stuttgart, Germany *
* email: <givenname>.<name>@iws.uni-stuttgart.de *
* *
- * This program is free software; you can redistribute it and/or modify *
+ * 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, as long as this copyright notice *
- * is included in its original form. *
+ * the Free Software Foundation, either version 2 of the License, or *
+ * (at your option) any later version. *
* *
- * This program is distributed WITHOUT ANY WARRANTY. *
+ * 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/>. *
*****************************************************************************/
/*!
diff --git a/dumux/boxmodels/2p/2plocalresidual.hh b/dumux/boxmodels/2p/2plocalresidual.hh
index 953a657512c340580340491f5d58da7f0261ebce..265749198729dc562b481f31e3c1eb33c52aaaaa 100644
--- a/dumux/boxmodels/2p/2plocalresidual.hh
+++ b/dumux/boxmodels/2p/2plocalresidual.hh
@@ -11,13 +11,18 @@
* University of Stuttgart, Germany *
* email: <givenname>.<name>@iws.uni-stuttgart.de *
* *
- * This program is free software; you can redistribute it and/or modify *
+ * 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, as long as this copyright notice *
- * is included in its original form. *
+ * the Free Software Foundation, either version 2 of the License, or *
+ * (at your option) any later version. *
* *
- * This program is distributed WITHOUT ANY WARRANTY. *
+ * 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
diff --git a/dumux/boxmodels/2p/2pmodel.hh b/dumux/boxmodels/2p/2pmodel.hh
index 56fe811f9a4838eefb8bf102f15841033f2911f6..46fea213cce4c95b05a534205303ac207ea2e71f 100644
--- a/dumux/boxmodels/2p/2pmodel.hh
+++ b/dumux/boxmodels/2p/2pmodel.hh
@@ -11,13 +11,18 @@
* University of Stuttgart, Germany *
* email: <givenname>.<name>@iws.uni-stuttgart.de *
* *
- * This program is free software; you can redistribute it and/or modify *
+ * 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, as long as this copyright notice *
- * is included in its original form. *
+ * the Free Software Foundation, either version 2 of the License, or *
+ * (at your option) any later version. *
* *
- * This program is distributed WITHOUT ANY WARRANTY. *
+ * 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/>. *
*****************************************************************************/
/*!
diff --git a/dumux/boxmodels/2p/2pproblem.hh b/dumux/boxmodels/2p/2pproblem.hh
index b20414490aa1dff4e0c96da97aa8195f234056ec..254b37b11db99991f5524dd7f7e29ec8cec5ac60 100644
--- a/dumux/boxmodels/2p/2pproblem.hh
+++ b/dumux/boxmodels/2p/2pproblem.hh
@@ -5,13 +5,18 @@
* University of Stuttgart, Germany *
* email: <givenname>.<name>@iws.uni-stuttgart.de *
* *
- * This program is free software; you can redistribute it and/or modify *
+ * 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, as long as this copyright notice *
- * is included in its original form. *
+ * the Free Software Foundation, either version 2 of the License, or *
+ * (at your option) any later version. *
* *
- * This program is distributed WITHOUT ANY WARRANTY. *
+ * 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
diff --git a/dumux/boxmodels/2p/2pproperties.hh b/dumux/boxmodels/2p/2pproperties.hh
index 09d7d6f90cb14c578163adc64753fa6cd5e516d5..8867b465071c7738274befdb6ab15c18b8a52fe5 100644
--- a/dumux/boxmodels/2p/2pproperties.hh
+++ b/dumux/boxmodels/2p/2pproperties.hh
@@ -6,13 +6,18 @@
* University of Stuttgart, Germany *
* email: <givenname>.<name>@iws.uni-stuttgart.de *
* *
- * This program is free software; you can redistribute it and/or modify *
+ * 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, as long as this copyright notice *
- * is included in its original form. *
+ * the Free Software Foundation, either version 2 of the License, or *
+ * (at your option) any later version. *
* *
- * This program is distributed WITHOUT ANY WARRANTY. *
+ * 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/>. *
*****************************************************************************/
/*!
* \ingroup TwoPBoxModel
diff --git a/dumux/boxmodels/2p/2ppropertydefaults.hh b/dumux/boxmodels/2p/2ppropertydefaults.hh
index fc8b161fd9c47edcede6770a655d7fa8753fa32d..2c9cec967408cf43b5525c79f907089de9c5edd1 100644
--- a/dumux/boxmodels/2p/2ppropertydefaults.hh
+++ b/dumux/boxmodels/2p/2ppropertydefaults.hh
@@ -6,13 +6,18 @@
* University of Stuttgart, Germany *
* email: <givenname>.<name>@iws.uni-stuttgart.de *
* *
- * This program is free software; you can redistribute it and/or modify *
+ * 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, as long as this copyright notice *
- * is included in its original form. *
+ * the Free Software Foundation, either version 2 of the License, or *
+ * (at your option) any later version. *
* *
- * This program is distributed WITHOUT ANY WARRANTY. *
+ * 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/>. *
*****************************************************************************/
/*!
* \ingroup TwoPBoxModel
diff --git a/dumux/boxmodels/2p/2pvolumevariables.hh b/dumux/boxmodels/2p/2pvolumevariables.hh
index 2691df1416ca7da1b8a0b6200e16f9cdd0b77a62..085fbc80d54352fafd3887aa7091d110b2161f8d 100644
--- a/dumux/boxmodels/2p/2pvolumevariables.hh
+++ b/dumux/boxmodels/2p/2pvolumevariables.hh
@@ -6,13 +6,18 @@
* University of Stuttgart, Germany *
* email: <givenname>.<name>@iws.uni-stuttgart.de *
* *
- * This program is free software; you can redistribute it and/or modify *
+ * 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, as long as this copyright notice *
- * is included in its original form. *
+ * the Free Software Foundation, either version 2 of the License, or *
+ * (at your option) any later version. *
* *
- * This program is distributed WITHOUT ANY WARRANTY. *
+ * 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
diff --git a/dumux/boxmodels/2p2c/2p2cfluidstate.hh b/dumux/boxmodels/2p2c/2p2cfluidstate.hh
index 28626ca8acfd14809427ba25c4bb0b488e08dac8..1233d106dc92a514783ad546f9b1e81412978087 100644
--- a/dumux/boxmodels/2p2c/2p2cfluidstate.hh
+++ b/dumux/boxmodels/2p2c/2p2cfluidstate.hh
@@ -7,13 +7,18 @@
* University of Stuttgart, Germany *
* email: <givenname>.<name>@iws.uni-stuttgart.de *
* *
- * This program is free software; you can redistribute it and/or modify *
+ * 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, as long as this copyright notice *
- * is included in its original form. *
+ * the Free Software Foundation, either version 2 of the License, or *
+ * (at your option) any later version. *
* *
- * This program is distributed WITHOUT ANY WARRANTY. *
+ * 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
diff --git a/dumux/boxmodels/2p2c/2p2cfluxvariables.hh b/dumux/boxmodels/2p2c/2p2cfluxvariables.hh
index 780fcf8a255aba1a06f6f4d3986b445152141aa9..569179e8042be7ce068bf2b709931f72888bbb25 100644
--- a/dumux/boxmodels/2p2c/2p2cfluxvariables.hh
+++ b/dumux/boxmodels/2p2c/2p2cfluxvariables.hh
@@ -7,13 +7,18 @@
* University of Stuttgart, Germany *
* email: <givenname>.<name>@iws.uni-stuttgart.de *
* *
- * This program is free software; you can redistribute it and/or modify *
+ * 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, as long as this copyright notice *
- * is included in its original form. *
+ * the Free Software Foundation, either version 2 of the License, or *
+ * (at your option) any later version. *
* *
- * This program is distributed WITHOUT ANY WARRANTY. *
+ * 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
diff --git a/dumux/boxmodels/2p2c/2p2cindices.hh b/dumux/boxmodels/2p2c/2p2cindices.hh
index 9b44ba3f43bcc82eff394f7981e2d93aa9f4680b..8862e7f9e8eda8bb9caa6d1cf10959c0076d3f7c 100644
--- a/dumux/boxmodels/2p2c/2p2cindices.hh
+++ b/dumux/boxmodels/2p2c/2p2cindices.hh
@@ -5,13 +5,18 @@
* University of Stuttgart, Germany *
* email: <givenname>.<name>@iws.uni-stuttgart.de *
* *
- * This program is free software; you can redistribute it and/or modify *
+ * 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, as long as this copyright notice *
- * is included in its original form. *
+ * the Free Software Foundation, either version 2 of the License, or *
+ * (at your option) any later version. *
* *
- * This program is distributed WITHOUT ANY WARRANTY. *
+ * 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/>. *
*****************************************************************************/
/*!
diff --git a/dumux/boxmodels/2p2c/2p2clocalresidual.hh b/dumux/boxmodels/2p2c/2p2clocalresidual.hh
index 2a21508b445994255f5a081f509e426173937101..e1473a362a51b830641621f3b905b53ffc3ff3ea 100644
--- a/dumux/boxmodels/2p2c/2p2clocalresidual.hh
+++ b/dumux/boxmodels/2p2c/2p2clocalresidual.hh
@@ -7,13 +7,18 @@
* University of Stuttgart, Germany *
* email: <givenname>.<name>@iws.uni-stuttgart.de *
* *
- * This program is free software; you can redistribute it and/or modify *
+ * 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, as long as this copyright notice *
- * is included in its original form. *
+ * the Free Software Foundation, either version 2 of the License, or *
+ * (at your option) any later version. *
* *
- * This program is distributed WITHOUT ANY WARRANTY. *
+ * 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
diff --git a/dumux/boxmodels/2p2c/2p2cmodel.hh b/dumux/boxmodels/2p2c/2p2cmodel.hh
index 6deead7d5a1d80bdd8eb9f1b7bd4a66d4493a219..f950f2d239aee9bd731d231214d770bbf22c6a37 100644
--- a/dumux/boxmodels/2p2c/2p2cmodel.hh
+++ b/dumux/boxmodels/2p2c/2p2cmodel.hh
@@ -5,13 +5,18 @@
* University of Stuttgart, Germany *
* email: <givenname>.<name>@iws.uni-stuttgart.de *
* *
- * This program is free software; you can redistribute it and/or modify *
+ * 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, as long as this copyright notice *
- * is included in its original form. *
+ * the Free Software Foundation, either version 2 of the License, or *
+ * (at your option) any later version. *
* *
- * This program is distributed WITHOUT ANY WARRANTY. *
+ * 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/>. *
*****************************************************************************/
/*!
diff --git a/dumux/boxmodels/2p2c/2p2cnewtoncontroller.hh b/dumux/boxmodels/2p2c/2p2cnewtoncontroller.hh
index fb15233e81d956ce09c7e110c1c3bdbabb36cb9e..17bea69cbfa3a1c819de07600c8e4f35da07226c 100644
--- a/dumux/boxmodels/2p2c/2p2cnewtoncontroller.hh
+++ b/dumux/boxmodels/2p2c/2p2cnewtoncontroller.hh
@@ -5,13 +5,18 @@
* University of Stuttgart, Germany *
* email: <givenname>.<name>@iws.uni-stuttgart.de *
* *
- * This program is free software; you can redistribute it and/or modify *
+ * 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, as long as this copyright notice *
- * is included in its original form. *
+ * the Free Software Foundation, either version 2 of the License, or *
+ * (at your option) any later version. *
* *
- * This program is distributed WITHOUT ANY WARRANTY. *
+ * 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
diff --git a/dumux/boxmodels/2p2c/2p2cproblem.hh b/dumux/boxmodels/2p2c/2p2cproblem.hh
index 958a928039f9aad90b7bca00741c2b8fc9b14711..53c91d282067929485900176fdf6526072038e64 100644
--- a/dumux/boxmodels/2p2c/2p2cproblem.hh
+++ b/dumux/boxmodels/2p2c/2p2cproblem.hh
@@ -5,13 +5,18 @@
* University of Stuttgart, Germany *
* email: <givenname>.<name>@iws.uni-stuttgart.de *
* *
- * This program is free software; you can redistribute it and/or modify *
+ * 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, as long as this copyright notice *
- * is included in its original form. *
+ * the Free Software Foundation, either version 2 of the License, or *
+ * (at your option) any later version. *
* *
- * This program is distributed WITHOUT ANY WARRANTY. *
+ * 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
diff --git a/dumux/boxmodels/2p2c/2p2cproperties.hh b/dumux/boxmodels/2p2c/2p2cproperties.hh
index 9ebcfa6fed96f85e42f67780ab4cc81fa8513a0c..52044426013170a6c0527ecdc17ad45982dcf991 100644
--- a/dumux/boxmodels/2p2c/2p2cproperties.hh
+++ b/dumux/boxmodels/2p2c/2p2cproperties.hh
@@ -8,13 +8,18 @@
* University of Stuttgart, Germany *
* email: <givenname>.<name>@iws.uni-stuttgart.de *
* *
- * This program is free software; you can redistribute it and/or modify *
+ * 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, as long as this copyright notice *
- * is included in its original form. *
+ * the Free Software Foundation, either version 2 of the License, or *
+ * (at your option) any later version. *
* *
- * This program is distributed WITHOUT ANY WARRANTY. *
+ * 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/>. *
*****************************************************************************/
/*!
* \ingroup TwoPTwoCModel
diff --git a/dumux/boxmodels/2p2c/2p2cpropertydefaults.hh b/dumux/boxmodels/2p2c/2p2cpropertydefaults.hh
index b3fddc3366a3f0622ecae810b0442f3b4890c32c..ab81cee5381421ec7173e6505c73f09ce04636dd 100644
--- a/dumux/boxmodels/2p2c/2p2cpropertydefaults.hh
+++ b/dumux/boxmodels/2p2c/2p2cpropertydefaults.hh
@@ -5,13 +5,18 @@
* University of Stuttgart, Germany *
* email: <givenname>.<name>@iws.uni-stuttgart.de *
* *
- * This program is free software; you can redistribute it and/or modify *
+ * 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, as long as this copyright notice *
- * is included in its original form. *
+ * the Free Software Foundation, either version 2 of the License, or *
+ * (at your option) any later version. *
* *
- * This program is distributed WITHOUT ANY WARRANTY. *
+ * 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/>. *
*****************************************************************************/
/*!
* \ingroup TwoPTwoCModel
diff --git a/dumux/boxmodels/2p2c/2p2cvolumevariables.hh b/dumux/boxmodels/2p2c/2p2cvolumevariables.hh
index 2b429347f88b9c9ae4aa3eaa9319e1ca5a06a9aa..ecacb0fd466a8d13f92f63ea37663e89152a7a3e 100644
--- a/dumux/boxmodels/2p2c/2p2cvolumevariables.hh
+++ b/dumux/boxmodels/2p2c/2p2cvolumevariables.hh
@@ -7,13 +7,18 @@
* University of Stuttgart, Germany *
* email: <givenname>.<name>@iws.uni-stuttgart.de *
* *
- * This program is free software; you can redistribute it and/or modify *
+ * 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, as long as this copyright notice *
- * is included in its original form. *
+ * the Free Software Foundation, either version 2 of the License, or *
+ * (at your option) any later version. *
* *
- * This program is distributed WITHOUT ANY WARRANTY. *
+ * 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
diff --git a/dumux/boxmodels/2p2cni/2p2cniboundaryvariables.hh b/dumux/boxmodels/2p2cni/2p2cniboundaryvariables.hh
index 8cd8cc43f01b79e99112a0c2d1652d67ea8839d3..fbbbed3bafbebb44a392e7bb756166636faf3421 100644
--- a/dumux/boxmodels/2p2cni/2p2cniboundaryvariables.hh
+++ b/dumux/boxmodels/2p2cni/2p2cniboundaryvariables.hh
@@ -6,13 +6,18 @@
* University of Stuttgart, Germany *
* email: <givenname>.<name>@iws.uni-stuttgart.de *
* *
- * This program is free software; you can redistribute it and/or modify *
+ * 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, as long as this copyright notice *
- * is included in its original form. *
+ * the Free Software Foundation, either version 2 of the License, or *
+ * (at your option) any later version. *
* *
- * This program is distributed WITHOUT ANY WARRANTY. *
+ * 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
diff --git a/dumux/boxmodels/2p2cni/2p2cnifluxvariables.hh b/dumux/boxmodels/2p2cni/2p2cnifluxvariables.hh
index 96a4a2f51d4d007ec51baa1d648da73170d5f3c4..df523335745767f1adb18f4dacea256aee167685 100644
--- a/dumux/boxmodels/2p2cni/2p2cnifluxvariables.hh
+++ b/dumux/boxmodels/2p2cni/2p2cnifluxvariables.hh
@@ -8,13 +8,18 @@
* University of Stuttgart, Germany *
* email: <givenname>.<name>@iws.uni-stuttgart.de *
* *
- * This program is free software; you can redistribute it and/or modify *
+ * 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, as long as this copyright notice *
- * is included in its original form. *
+ * the Free Software Foundation, either version 2 of the License, or *
+ * (at your option) any later version. *
* *
- * This program is distributed WITHOUT ANY WARRANTY. *
+ * 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
diff --git a/dumux/boxmodels/2p2cni/2p2cniindices.hh b/dumux/boxmodels/2p2cni/2p2cniindices.hh
index 3e41b2516aedff54f6253811021a32b4d2a55379..77c251799d12bfc1e5ef718f68630620fe0e9587 100644
--- a/dumux/boxmodels/2p2cni/2p2cniindices.hh
+++ b/dumux/boxmodels/2p2cni/2p2cniindices.hh
@@ -8,13 +8,18 @@
* University of Stuttgart, Germany *
* email: <givenname>.<name>@iws.uni-stuttgart.de *
* *
- * This program is free software; you can redistribute it and/or modify *
+ * 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, as long as this copyright notice *
- * is included in its original form. *
+ * the Free Software Foundation, either version 2 of the License, or *
+ * (at your option) any later version. *
* *
- * This program is distributed WITHOUT ANY WARRANTY. *
+ * 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/>. *
*****************************************************************************/
/*!
diff --git a/dumux/boxmodels/2p2cni/2p2cnilocalresidual.hh b/dumux/boxmodels/2p2cni/2p2cnilocalresidual.hh
index 1f9b75d568cc3a488ce2b9981280c2b6b7eba090..50d1d0b69860db45ddb32b209bbd2015393df3c3 100644
--- a/dumux/boxmodels/2p2cni/2p2cnilocalresidual.hh
+++ b/dumux/boxmodels/2p2cni/2p2cnilocalresidual.hh
@@ -8,13 +8,18 @@
* University of Stuttgart, Germany *
* email: <givenname>.<name>@iws.uni-stuttgart.de *
* *
- * This program is free software; you can redistribute it and/or modify *
+ * 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, as long as this copyright notice *
- * is included in its original form. *
+ * the Free Software Foundation, either version 2 of the License, or *
+ * (at your option) any later version. *
* *
- * This program is distributed WITHOUT ANY WARRANTY. *
+ * 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
diff --git a/dumux/boxmodels/2p2cni/2p2cnimodel.hh b/dumux/boxmodels/2p2cni/2p2cnimodel.hh
index b8bf259fcd0cc66bd8d930f2ce0a87f53833c3d2..45aa91db0e90fc2f118e175bb666e91eb403aeff 100644
--- a/dumux/boxmodels/2p2cni/2p2cnimodel.hh
+++ b/dumux/boxmodels/2p2cni/2p2cnimodel.hh
@@ -8,13 +8,18 @@
* University of Stuttgart, Germany *
* email: <givenname>.<name>@iws.uni-stuttgart.de *
* *
- * This program is free software; you can redistribute it and/or modify *
+ * 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, as long as this copyright notice *
- * is included in its original form. *
+ * the Free Software Foundation, either version 2 of the License, or *
+ * (at your option) any later version. *
* *
- * This program is distributed WITHOUT ANY WARRANTY. *
+ * 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
diff --git a/dumux/boxmodels/2p2cni/2p2cniproblem.hh b/dumux/boxmodels/2p2cni/2p2cniproblem.hh
index 16408fb1b4ca02112cca37c5a44fff4a8b9c3ea9..48422dea4659932be1ae717ae4ac0b0c51fdb105 100644
--- a/dumux/boxmodels/2p2cni/2p2cniproblem.hh
+++ b/dumux/boxmodels/2p2cni/2p2cniproblem.hh
@@ -5,13 +5,18 @@
* University of Stuttgart, Germany *
* email: <givenname>.<name>@iws.uni-stuttgart.de *
* *
- * This program is free software; you can redistribute it and/or modify *
+ * 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, as long as this copyright notice *
- * is included in its original form. *
+ * the Free Software Foundation, either version 2 of the License, or *
+ * (at your option) any later version. *
* *
- * This program is distributed WITHOUT ANY WARRANTY. *
+ * 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
diff --git a/dumux/boxmodels/2p2cni/2p2cniproperties.hh b/dumux/boxmodels/2p2cni/2p2cniproperties.hh
index 74eb704a8992549ec12b64dc8fe19836f739ae8a..1344e72c1a532090c3c679fcb5f476b34961549f 100644
--- a/dumux/boxmodels/2p2cni/2p2cniproperties.hh
+++ b/dumux/boxmodels/2p2cni/2p2cniproperties.hh
@@ -5,13 +5,18 @@
* University of Stuttgart, Germany *
* email: <givenname>.<name>@iws.uni-stuttgart.de *
* *
- * This program is free software; you can redistribute it and/or modify *
+ * 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, as long as this copyright notice *
- * is included in its original form. *
+ * the Free Software Foundation, either version 2 of the License, or *
+ * (at your option) any later version. *
* *
- * This program is distributed WITHOUT ANY WARRANTY. *
+ * 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/>. *
*****************************************************************************/
/*!
* \ingroup TwoPTwoCNIModel
diff --git a/dumux/boxmodels/2p2cni/2p2cnipropertydefaults.hh b/dumux/boxmodels/2p2cni/2p2cnipropertydefaults.hh
index 551acf3ed39d04eb842738639436c949a042920b..8196f1fa9906af7a2b9a020e9e6249e82f1a81fc 100644
--- a/dumux/boxmodels/2p2cni/2p2cnipropertydefaults.hh
+++ b/dumux/boxmodels/2p2cni/2p2cnipropertydefaults.hh
@@ -8,13 +8,18 @@
* University of Stuttgart, Germany *
* email: <givenname>.<name>@iws.uni-stuttgart.de *
* *
- * This program is free software; you can redistribute it and/or modify *
+ * 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, as long as this copyright notice *
- * is included in its original form. *
+ * the Free Software Foundation, either version 2 of the License, or *
+ * (at your option) any later version. *
* *
- * This program is distributed WITHOUT ANY WARRANTY. *
+ * 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/>. *
*****************************************************************************/
/*!
* \ingroup TwoPTwoCNIModel
diff --git a/dumux/boxmodels/2p2cni/2p2cnivolumevariables.hh b/dumux/boxmodels/2p2cni/2p2cnivolumevariables.hh
index a6c158ca5fcda51203fc07f8b2f3a48d2138b1d6..2a12e12e13fd60640b86057b9f4be3a96bfb5d31 100644
--- a/dumux/boxmodels/2p2cni/2p2cnivolumevariables.hh
+++ b/dumux/boxmodels/2p2cni/2p2cnivolumevariables.hh
@@ -7,13 +7,18 @@
* Institute of Hydraulic Engineering *
* University of Stuttgart, Germany *
* *
- * This program is free software; you can redistribute it and/or modify *
+ * 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, as long as this copyright notice *
- * is included in its original form. *
+ * the Free Software Foundation, either version 2 of the License, or *
+ * (at your option) any later version. *
* *
- * This program is distributed WITHOUT ANY WARRANTY. *
+ * 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
diff --git a/dumux/boxmodels/2pni/2pnifluxvariables.hh b/dumux/boxmodels/2pni/2pnifluxvariables.hh
index 579aa70578d0fe42354fa3924093392a35b8dba4..cd9afbb9bca98e418eb2550632dc1d88a56e95e3 100644
--- a/dumux/boxmodels/2pni/2pnifluxvariables.hh
+++ b/dumux/boxmodels/2pni/2pnifluxvariables.hh
@@ -8,13 +8,18 @@
* University of Stuttgart, Germany *
* email: <givenname>.<name>@iws.uni-stuttgart.de *
* *
- * This program is free software; you can redistribute it and/or modify *
+ * 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, as long as this copyright notice *
- * is included in its original form. *
+ * the Free Software Foundation, either version 2 of the License, or *
+ * (at your option) any later version. *
* *
- * This program is distributed WITHOUT ANY WARRANTY. *
+ * 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
diff --git a/dumux/boxmodels/2pni/2pniindices.hh b/dumux/boxmodels/2pni/2pniindices.hh
index 35748ee40d727c4d6b280876295f245880e43054..d1e5ca2245848754b7f5498c57f9cbe21fc1b526 100644
--- a/dumux/boxmodels/2pni/2pniindices.hh
+++ b/dumux/boxmodels/2pni/2pniindices.hh
@@ -7,13 +7,18 @@
* University of Stuttgart, Germany *
* email: <givenname>.<name>@iws.uni-stuttgart.de *
* *
- * This program is free software; you can redistribute it and/or modify *
+ * 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, as long as this copyright notice *
- * is included in its original form. *
+ * the Free Software Foundation, either version 2 of the License, or *
+ * (at your option) any later version. *
* *
- * This program is distributed WITHOUT ANY WARRANTY. *
+ * 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
diff --git a/dumux/boxmodels/2pni/2pnilocalresidual.hh b/dumux/boxmodels/2pni/2pnilocalresidual.hh
index 1ae7b921f34e278d7723bd4baf62c73152b09247..8539266b9a384a3d6256e2ca72b3c3a32f5972d8 100644
--- a/dumux/boxmodels/2pni/2pnilocalresidual.hh
+++ b/dumux/boxmodels/2pni/2pnilocalresidual.hh
@@ -7,13 +7,18 @@
* University of Stuttgart, Germany *
* email: <givenname>.<name>@iws.uni-stuttgart.de *
* *
- * This program is free software; you can redistribute it and/or modify *
+ * 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, as long as this copyright notice *
- * is included in its original form. *
+ * the Free Software Foundation, either version 2 of the License, or *
+ * (at your option) any later version. *
* *
- * This program is distributed WITHOUT ANY WARRANTY. *
+ * 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
diff --git a/dumux/boxmodels/2pni/2pnimodel.hh b/dumux/boxmodels/2pni/2pnimodel.hh
index 99242ea397f51893723f9841edabea0d6926a1c9..83965e1e085370a94642eb2f2d0b26e487cbfb1f 100644
--- a/dumux/boxmodels/2pni/2pnimodel.hh
+++ b/dumux/boxmodels/2pni/2pnimodel.hh
@@ -10,13 +10,18 @@
* University of Stuttgart, Germany *
* email: <givenname>.<name>@iws.uni-stuttgart.de *
* *
- * This program is free software; you can redistribute it and/or modify *
+ * 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, as long as this copyright notice *
- * is included in its original form. *
+ * the Free Software Foundation, either version 2 of the License, or *
+ * (at your option) any later version. *
* *
- * This program is distributed WITHOUT ANY WARRANTY. *
+ * 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
diff --git a/dumux/boxmodels/2pni/2pniproblem.hh b/dumux/boxmodels/2pni/2pniproblem.hh
index 8c5273bd43d791c7df5029c86d14a124429494c6..f2e2a7d1d3d8716a32f1bcb83c503509cfc5be67 100644
--- a/dumux/boxmodels/2pni/2pniproblem.hh
+++ b/dumux/boxmodels/2pni/2pniproblem.hh
@@ -5,13 +5,18 @@
* University of Stuttgart, Germany *
* email: <givenname>.<name>@iws.uni-stuttgart.de *
* *
- * This program is free software; you can redistribute it and/or modify *
+ * 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, as long as this copyright notice *
- * is included in its original form. *
+ * the Free Software Foundation, either version 2 of the License, or *
+ * (at your option) any later version. *
* *
- * This program is distributed WITHOUT ANY WARRANTY. *
+ * 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
diff --git a/dumux/boxmodels/2pni/2pniproperties.hh b/dumux/boxmodels/2pni/2pniproperties.hh
index 2f1722a7a2e5a31142b2ff022a3cc2af112ad896..f22a8c314e6621cbb836cdc91d2ae338879f4cc3 100644
--- a/dumux/boxmodels/2pni/2pniproperties.hh
+++ b/dumux/boxmodels/2pni/2pniproperties.hh
@@ -7,13 +7,18 @@
* University of Stuttgart, Germany *
* email: <givenname>.<name>@iws.uni-stuttgart.de *
* *
- * This program is free software; you can redistribute it and/or modify *
+ * 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, as long as this copyright notice *
- * is included in its original form. *
+ * the Free Software Foundation, either version 2 of the License, or *
+ * (at your option) any later version. *
* *
- * This program is distributed WITHOUT ANY WARRANTY. *
+ * 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/>. *
*****************************************************************************/
/*!
* \ingroup TwoPNIBoxModel
diff --git a/dumux/boxmodels/2pni/2pnipropertydefaults.hh b/dumux/boxmodels/2pni/2pnipropertydefaults.hh
index 4dcd69590462e5a22de2a6aa63ade3101aba313d..80d2de4c70dc93c094872ccb4af7d83af8c677e5 100644
--- a/dumux/boxmodels/2pni/2pnipropertydefaults.hh
+++ b/dumux/boxmodels/2pni/2pnipropertydefaults.hh
@@ -7,13 +7,18 @@
* University of Stuttgart, Germany *
* email: <givenname>.<name>@iws.uni-stuttgart.de *
* *
- * This program is free software; you can redistribute it and/or modify *
+ * 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, as long as this copyright notice *
- * is included in its original form. *
+ * the Free Software Foundation, either version 2 of the License, or *
+ * (at your option) any later version. *
* *
- * This program is distributed WITHOUT ANY WARRANTY. *
+ * 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/>. *
*****************************************************************************/
/*!
* \ingroup TwoPNIBoxModel
diff --git a/dumux/boxmodels/2pni/2pnivolumevariables.hh b/dumux/boxmodels/2pni/2pnivolumevariables.hh
index 6aeed3942702be93b358ffd8714d22ca7748cfaf..04d380c09d4743cf5d8f0b0b901c8ada4625e6d2 100644
--- a/dumux/boxmodels/2pni/2pnivolumevariables.hh
+++ b/dumux/boxmodels/2pni/2pnivolumevariables.hh
@@ -5,13 +5,18 @@
* Institute of Hydraulic Engineering *
* University of Stuttgart, Germany *
* *
- * This program is free software; you can redistribute it and/or modify *
+ * 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, as long as this copyright notice *
- * is included in its original form. *
+ * the Free Software Foundation, either version 2 of the License, or *
+ * (at your option) any later version. *
* *
- * This program is distributed WITHOUT ANY WARRANTY. *
+ * 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
diff --git a/dumux/boxmodels/common/boxassembler.hh b/dumux/boxmodels/common/boxassembler.hh
index 29d57529efac9f441444cf6e7b56fa8a3d075e8a..5e10a8d60819673c0e8e167e7707cf17f0565cea 100644
--- a/dumux/boxmodels/common/boxassembler.hh
+++ b/dumux/boxmodels/common/boxassembler.hh
@@ -6,13 +6,18 @@
* University of Stuttgart, Germany *
* email: <givenname>.<name>@iws.uni-stuttgart.de *
* *
- * This program is free software; you can redistribute it and/or modify *
+ * 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, as long as this copyright notice *
- * is included in its original form. *
+ * the Free Software Foundation, either version 2 of the License, or *
+ * (at your option) any later version. *
* *
- * This program is distributed WITHOUT ANY WARRANTY. *
+ * 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
diff --git a/dumux/boxmodels/common/boxelementboundarytypes.hh b/dumux/boxmodels/common/boxelementboundarytypes.hh
index 4e583d6e07e59347e11760709082c24f2a9e28e2..913c06c593bd1fa7758d12e682fd1af39965a369 100644
--- a/dumux/boxmodels/common/boxelementboundarytypes.hh
+++ b/dumux/boxmodels/common/boxelementboundarytypes.hh
@@ -5,13 +5,18 @@
* University of Stuttgart, Germany *
* email: <givenname>.<name>@iws.uni-stuttgart.de *
* *
- * This program is free software; you can redistribute it and/or modify *
+ * 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, as long as this copyright notice *
- * is included in its original form. *
+ * the Free Software Foundation, either version 2 of the License, or *
+ * (at your option) any later version. *
* *
- * This program is distributed WITHOUT ANY WARRANTY. *
+ * 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
diff --git a/dumux/boxmodels/common/boxelementvolumevariables.hh b/dumux/boxmodels/common/boxelementvolumevariables.hh
index 07c4cb0671eea4cace1f7a51323e2d396198f3f9..ff719ed68e1929680aab9f5d8bd673884cf3e377 100644
--- a/dumux/boxmodels/common/boxelementvolumevariables.hh
+++ b/dumux/boxmodels/common/boxelementvolumevariables.hh
@@ -5,13 +5,18 @@
* University of Stuttgart, Germany *
* email: <givenname>.<name>@iws.uni-stuttgart.de *
* *
- * This program is free software; you can redistribute it and/or modify *
+ * 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, as long as this copyright notice *
- * is included in its original form. *
+ * the Free Software Foundation, either version 2 of the License, or *
+ * (at your option) any later version. *
* *
- * This program is distributed WITHOUT ANY WARRANTY. *
+ * 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
diff --git a/dumux/boxmodels/common/boxfvelementgeometry.hh b/dumux/boxmodels/common/boxfvelementgeometry.hh
index 69f65892f5c85c42a59551aed8af28998a9c9cd0..947c8744143ffa905fe2d653cb34476b9336ef90 100644
--- a/dumux/boxmodels/common/boxfvelementgeometry.hh
+++ b/dumux/boxmodels/common/boxfvelementgeometry.hh
@@ -5,13 +5,18 @@
* University of Stuttgart, Germany *
* email: <givenname>.<name>@iws.uni-stuttgart.de *
* *
- * This program is free software; you can redistribute it and/or modify *
+ * 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, as long as this copyright notice *
- * is included in its original form. *
+ * the Free Software Foundation, either version 2 of the License, or *
+ * (at your option) any later version. *
* *
- * This program is distributed WITHOUT ANY WARRANTY. *
+ * 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
diff --git a/dumux/boxmodels/common/boxlocaljacobian.hh b/dumux/boxmodels/common/boxlocaljacobian.hh
index e6aa5100c33342d9146c0c4d1224ec8fad86a365..bfd7aa0d884d18976c6be24d85a07d37c34a34a2 100644
--- a/dumux/boxmodels/common/boxlocaljacobian.hh
+++ b/dumux/boxmodels/common/boxlocaljacobian.hh
@@ -11,13 +11,18 @@
* University of Stuttgart, Germany *
* email: <givenname>.<name>@iws.uni-stuttgart.de *
* *
- * This program is free software; you can redistribute it and/or modify *
+ * 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, as long as this copyright notice *
- * is included in its original form. *
+ * the Free Software Foundation, either version 2 of the License, or *
+ * (at your option) any later version. *
* *
- * This program is distributed WITHOUT ANY WARRANTY. *
+ * 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
diff --git a/dumux/boxmodels/common/boxlocalresidual.hh b/dumux/boxmodels/common/boxlocalresidual.hh
index 71302b8805d774f25548692930fa565ba2364f71..511eeae021d4e4c72336ddad11fc8df31004edb6 100644
--- a/dumux/boxmodels/common/boxlocalresidual.hh
+++ b/dumux/boxmodels/common/boxlocalresidual.hh
@@ -11,13 +11,18 @@
* University of Stuttgart, Germany *
* email: <givenname>.<name>@iws.uni-stuttgart.de *
* *
- * This program is free software; you can redistribute it and/or modify *
+ * 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, as long as this copyright notice *
- * is included in its original form. *
+ * the Free Software Foundation, either version 2 of the License, or *
+ * (at your option) any later version. *
* *
- * This program is distributed WITHOUT ANY WARRANTY. *
+ * 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
diff --git a/dumux/boxmodels/common/boxmodel.hh b/dumux/boxmodels/common/boxmodel.hh
index bb843ed34e62ab02d81373a814b1e23299b9e6db..0032ac677b2f13d7e390f690ba13038caef776c1 100644
--- a/dumux/boxmodels/common/boxmodel.hh
+++ b/dumux/boxmodels/common/boxmodel.hh
@@ -6,13 +6,18 @@
* University of Stuttgart, Germany *
* email: <givenname>.<name>@iws.uni-stuttgart.de *
* *
- * This program is free software; you can redistribute it and/or modify *
+ * 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, as long as this copyright notice *
- * is included in its original form. *
+ * the Free Software Foundation, either version 2 of the License, or *
+ * (at your option) any later version. *
* *
- * This program is distributed WITHOUT ANY WARRANTY. *
+ * 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
diff --git a/dumux/boxmodels/common/boxproblem.hh b/dumux/boxmodels/common/boxproblem.hh
index 48d232e874c3383ade921bfec73a4170a30d2c07..78ef1aaee9b2438cf22c839d5f06b42e0c1bca23 100644
--- a/dumux/boxmodels/common/boxproblem.hh
+++ b/dumux/boxmodels/common/boxproblem.hh
@@ -5,13 +5,18 @@
* University of Stuttgart, Germany *
* email: <givenname>.<name>@iws.uni-stuttgart.de *
* *
- * This program is free software; you can redistribute it and/or modify *
+ * 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, as long as this copyright notice *
- * is included in its original form. *
+ * the Free Software Foundation, either version 2 of the License, or *
+ * (at your option) any later version. *
* *
- * This program is distributed WITHOUT ANY WARRANTY. *
+ * 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
diff --git a/dumux/boxmodels/common/boxproperties.hh b/dumux/boxmodels/common/boxproperties.hh
index 81f192c2ec313e0de63757053d66a6924d171743..eeace1e3551eb422e9c21c7b0d0cf0943ab3276a 100644
--- a/dumux/boxmodels/common/boxproperties.hh
+++ b/dumux/boxmodels/common/boxproperties.hh
@@ -6,13 +6,18 @@
* University of Stuttgart, Germany *
* email: <givenname>.<name>@iws.uni-stuttgart.de *
* *
- * This program is free software; you can redistribute it and/or modify *
+ * 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, as long as this copyright notice *
- * is included in its original form. *
+ * the Free Software Foundation, either version 2 of the License, or *
+ * (at your option) any later version. *
* *
- * This program is distributed WITHOUT ANY WARRANTY. *
+ * 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/>. *
*****************************************************************************/
#ifndef DUMUX_BOX_PROPERTIES_HH
#define DUMUX_BOX_PROPERTIES_HH
diff --git a/dumux/boxmodels/common/boxpropertydefaults.hh b/dumux/boxmodels/common/boxpropertydefaults.hh
index 1536b99d29f4548dd0c895152264b3654d1456f5..b93317369717a320f6865d210a41342b1fd5f925 100644
--- a/dumux/boxmodels/common/boxpropertydefaults.hh
+++ b/dumux/boxmodels/common/boxpropertydefaults.hh
@@ -6,13 +6,18 @@
* University of Stuttgart, Germany *
* email: <givenname>.<name>@iws.uni-stuttgart.de *
* *
- * This program is free software; you can redistribute it and/or modify *
+ * 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, as long as this copyright notice *
- * is included in its original form. *
+ * the Free Software Foundation, either version 2 of the License, or *
+ * (at your option) any later version. *
* *
- * This program is distributed WITHOUT ANY WARRANTY. *
+ * 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
diff --git a/dumux/boxmodels/common/boxvolumevariables.hh b/dumux/boxmodels/common/boxvolumevariables.hh
index 5142a79a743feb46dd790c38c761d6d8208d2d96..7c4f932b812cc5ffc2627152b8eb16eaac03874d 100644
--- a/dumux/boxmodels/common/boxvolumevariables.hh
+++ b/dumux/boxmodels/common/boxvolumevariables.hh
@@ -4,13 +4,18 @@
* University of Stuttgart, Germany *
* email: <givenname>.<name>@iws.uni-stuttgart.de *
* *
- * This program is free software; you can redistribute it and/or modify *
+ * 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, as long as this copyright notice *
- * is included in its original form. *
+ * the Free Software Foundation, either version 2 of the License, or *
+ * (at your option) any later version. *
* *
- * This program is distributed WITHOUT ANY WARRANTY. *
+ * 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
diff --git a/dumux/boxmodels/common/pdelabboxistlvectorbackend.hh b/dumux/boxmodels/common/pdelabboxistlvectorbackend.hh
index ad08708ee31257d68f1ff8e67ac8741274eadb3f..1b6c9e27f8e46f383388aa4a062fa4efce98789d 100644
--- a/dumux/boxmodels/common/pdelabboxistlvectorbackend.hh
+++ b/dumux/boxmodels/common/pdelabboxistlvectorbackend.hh
@@ -1,3 +1,17 @@
+/*****************************************************************************
+ * 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
*
diff --git a/dumux/boxmodels/common/pdelabboxlocaloperator.hh b/dumux/boxmodels/common/pdelabboxlocaloperator.hh
index edea6cdd9b957447c6b64e3315d281d5895d1b0d..2279295208f437b48cdd56820a131cad7da440e7 100644
--- a/dumux/boxmodels/common/pdelabboxlocaloperator.hh
+++ b/dumux/boxmodels/common/pdelabboxlocaloperator.hh
@@ -5,13 +5,18 @@
* University of Stuttgart, Germany *
* email: <givenname>.<name>@iws.uni-stuttgart.de *
* *
- * This program is free software; you can redistribute it and/or modify *
+ * 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, as long as this copyright notice *
- * is included in its original form. *
+ * the Free Software Foundation, either version 2 of the License, or *
+ * (at your option) any later version. *
* *
- * This program is distributed WITHOUT ANY WARRANTY. *
+ * 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
diff --git a/dumux/boxmodels/richards/richardsfluidstate.hh b/dumux/boxmodels/richards/richardsfluidstate.hh
index 726100ef81831892e70b3b9de942a4e63c545d8c..46f8a38f8b395ec4e53fb312f28a4db63e8c0e8b 100644
--- a/dumux/boxmodels/richards/richardsfluidstate.hh
+++ b/dumux/boxmodels/richards/richardsfluidstate.hh
@@ -5,13 +5,18 @@
* University of Stuttgart, Germany *
* email: <givenname>.<name>@iws.uni-stuttgart.de *
* *
- * This program is free software; you can redistribute it and/or modify *
+ * 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, as long as this copyright notice *
- * is included in its original form. *
+ * the Free Software Foundation, either version 2 of the License, or *
+ * (at your option) any later version. *
* *
- * This program is distributed WITHOUT ANY WARRANTY. *
+ * 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
diff --git a/dumux/boxmodels/richards/richardsfluxvariables.hh b/dumux/boxmodels/richards/richardsfluxvariables.hh
index 8351e5096350e2987c859cd1a03a70827d8d7f6f..a575c02181b8ece5568824c8264a091630ee5d79 100644
--- a/dumux/boxmodels/richards/richardsfluxvariables.hh
+++ b/dumux/boxmodels/richards/richardsfluxvariables.hh
@@ -6,13 +6,18 @@
* University of Stuttgart, Germany *
* email: <givenname>.<name>@iws.uni-stuttgart.de *
* *
- * This program is free software; you can redistribute it and/or modify *
+ * 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, as long as this copyright notice *
- * is included in its original form. *
+ * the Free Software Foundation, either version 2 of the License, or *
+ * (at your option) any later version. *
* *
- * This program is distributed WITHOUT ANY WARRANTY. *
+ * 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
diff --git a/dumux/boxmodels/richards/richardsindices.hh b/dumux/boxmodels/richards/richardsindices.hh
index 363c2bfca62fe28cb0fd30a0fd9973a96374389a..5a7d0635107c1fd7c3ef47bab571671e4f490379 100644
--- a/dumux/boxmodels/richards/richardsindices.hh
+++ b/dumux/boxmodels/richards/richardsindices.hh
@@ -5,13 +5,18 @@
* University of Stuttgart, Germany *
* email: <givenname>.<name>@iws.uni-stuttgart.de *
* *
- * This program is free software; you can redistribute it and/or modify *
+ * 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, as long as this copyright notice *
- * is included in its original form. *
+ * the Free Software Foundation, either version 2 of the License, or *
+ * (at your option) any later version. *
* *
- * This program is distributed WITHOUT ANY WARRANTY. *
+ * 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
diff --git a/dumux/boxmodels/richards/richardslocalresidual.hh b/dumux/boxmodels/richards/richardslocalresidual.hh
index 432f05421ee49659be2f94cb3a212e8f07f5ecbf..b38e8ac3d9f5eb00ff94f5b5f8eee67ef0a11f8d 100644
--- a/dumux/boxmodels/richards/richardslocalresidual.hh
+++ b/dumux/boxmodels/richards/richardslocalresidual.hh
@@ -11,13 +11,18 @@
* University of Stuttgart, Germany *
* email: <givenname>.<name>@iws.uni-stuttgart.de *
* *
- * This program is free software; you can redistribute it and/or modify *
+ * 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, as long as this copyright notice *
- * is included in its original form. *
+ * the Free Software Foundation, either version 2 of the License, or *
+ * (at your option) any later version. *
* *
- * This program is distributed WITHOUT ANY WARRANTY. *
+ * 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
diff --git a/dumux/boxmodels/richards/richardsmodel.hh b/dumux/boxmodels/richards/richardsmodel.hh
index 92b9198b301e5c50773556b3c14000d2758b4981..cd9d8417ffc7a951952c63ef7b4ba540d08689e7 100644
--- a/dumux/boxmodels/richards/richardsmodel.hh
+++ b/dumux/boxmodels/richards/richardsmodel.hh
@@ -11,13 +11,18 @@
* University of Stuttgart, Germany *
* email: <givenname>.<name>@iws.uni-stuttgart.de *
* *
- * This program is free software; you can redistribute it and/or modify *
+ * 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, as long as this copyright notice *
- * is included in its original form. *
+ * the Free Software Foundation, either version 2 of the License, or *
+ * (at your option) any later version. *
* *
- * This program is distributed WITHOUT ANY WARRANTY. *
+ * 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/>. *
*****************************************************************************/
/*!
diff --git a/dumux/boxmodels/richards/richardsnewtoncontroller.hh b/dumux/boxmodels/richards/richardsnewtoncontroller.hh
index 8d86982cfacb35d3ef53de150a2e6f4ffeacefaa..c6b19e88701368e8cee429b34ba467f83a9cfbed 100644
--- a/dumux/boxmodels/richards/richardsnewtoncontroller.hh
+++ b/dumux/boxmodels/richards/richardsnewtoncontroller.hh
@@ -5,13 +5,18 @@
* University of Stuttgart, Germany *
* email: <givenname>.<name>@iws.uni-stuttgart.de *
* *
- * This program is free software; you can redistribute it and/or modify *
+ * 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, as long as this copyright notice *
- * is included in its original form. *
+ * the Free Software Foundation, either version 2 of the License, or *
+ * (at your option) any later version. *
* *
- * This program is distributed WITHOUT ANY WARRANTY. *
+ * 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
diff --git a/dumux/boxmodels/richards/richardsproblem.hh b/dumux/boxmodels/richards/richardsproblem.hh
index 5b28aaf167af7b48fc2be0b8327b093664ebd276..e46c699eff153df50d23699cc3811131808a9a57 100644
--- a/dumux/boxmodels/richards/richardsproblem.hh
+++ b/dumux/boxmodels/richards/richardsproblem.hh
@@ -5,13 +5,18 @@
* University of Stuttgart, Germany *
* email: <givenname>.<name>@iws.uni-stuttgart.de *
* *
- * This program is free software; you can redistribute it and/or modify *
+ * 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, as long as this copyright notice *
- * is included in its original form. *
+ * the Free Software Foundation, either version 2 of the License, or *
+ * (at your option) any later version. *
* *
- * This program is distributed WITHOUT ANY WARRANTY. *
+ * 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
diff --git a/dumux/boxmodels/richards/richardsproperties.hh b/dumux/boxmodels/richards/richardsproperties.hh
index b76b4a48a3a3a03f8ce6f781d22b72127c8a0cf7..7371ff8ced4324a3167185722e1b9ba29e21c627 100644
--- a/dumux/boxmodels/richards/richardsproperties.hh
+++ b/dumux/boxmodels/richards/richardsproperties.hh
@@ -5,13 +5,18 @@
* University of Stuttgart, Germany *
* email: <givenname>.<name>@iws.uni-stuttgart.de *
* *
- * This program is free software; you can redistribute it and/or modify *
+ * 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, as long as this copyright notice *
- * is included in its original form. *
+ * the Free Software Foundation, either version 2 of the License, or *
+ * (at your option) any later version. *
* *
- * This program is distributed WITHOUT ANY WARRANTY. *
+ * 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
diff --git a/dumux/boxmodels/richards/richardspropertydefaults.hh b/dumux/boxmodels/richards/richardspropertydefaults.hh
index 01bdabf8f8558bd9ab23af81d98e6fb338d09af8..7764b1e31d708c9eacb95409aa1f6e915e30cbd3 100644
--- a/dumux/boxmodels/richards/richardspropertydefaults.hh
+++ b/dumux/boxmodels/richards/richardspropertydefaults.hh
@@ -5,13 +5,18 @@
* University of Stuttgart, Germany *
* email: <givenname>.<name>@iws.uni-stuttgart.de *
* *
- * This program is free software; you can redistribute it and/or modify *
+ * 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, as long as this copyright notice *
- * is included in its original form. *
+ * the Free Software Foundation, either version 2 of the License, or *
+ * (at your option) any later version. *
* *
- * This program is distributed WITHOUT ANY WARRANTY. *
+ * 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
diff --git a/dumux/boxmodels/richards/richardsvolumevariables.hh b/dumux/boxmodels/richards/richardsvolumevariables.hh
index 0791aadbb784312ba3a91bb1d4293e18a5df1903..27789582bdfc2c4b9265c8c5ec6d19a7f47a009e 100644
--- a/dumux/boxmodels/richards/richardsvolumevariables.hh
+++ b/dumux/boxmodels/richards/richardsvolumevariables.hh
@@ -6,13 +6,18 @@
* University of Stuttgart, Germany *
* email: <givenname>.<name>@iws.uni-stuttgart.de *
* *
- * This program is free software; you can redistribute it and/or modify *
+ * 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, as long as this copyright notice *
- * is included in its original form. *
+ * the Free Software Foundation, either version 2 of the License, or *
+ * (at your option) any later version. *
* *
- * This program is distributed WITHOUT ANY WARRANTY. *
+ * 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
diff --git a/dumux/common/basicproperties.hh b/dumux/common/basicproperties.hh
index 2cd6281be02b528a332f42d5ecbe82a7a8643167..641e5ba091535a8a0f9c0b927a181be30251ab52 100644
--- a/dumux/common/basicproperties.hh
+++ b/dumux/common/basicproperties.hh
@@ -5,13 +5,18 @@
* University of Stuttgart, Germany *
* email: <givenname>.<name>@iws.uni-stuttgart.de *
* *
- * This program is free software; you can redistribute it and/or modify *
+ * 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, as long as this copyright notice *
- * is included in its original form. *
+ * the Free Software Foundation, either version 2 of the License, or *
+ * (at your option) any later version. *
* *
- * This program is distributed WITHOUT ANY WARRANTY. *
+ * 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
diff --git a/dumux/common/boundaryconditions.hh b/dumux/common/boundaryconditions.hh
index cb889a32c6ff42537dbaad6ff17f823aec9eece4..dca813305ba85782759f2e31f7a6991745387976 100644
--- a/dumux/common/boundaryconditions.hh
+++ b/dumux/common/boundaryconditions.hh
@@ -5,13 +5,18 @@
* University of Stuttgart, Germany *
* email: <givenname>.<name>@iws.uni-stuttgart.de *
* *
- * This program is free software; you can redistribute it and/or modify *
+ * 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, as long as this copyright notice *
- * is included in its original form. *
+ * the Free Software Foundation, either version 2 of the License, or *
+ * (at your option) any later version. *
* *
- * This program is distributed WITHOUT ANY WARRANTY. *
+ * 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/>. *
*****************************************************************************/
#ifndef DUMUX_BOUNDARYCONDITIONS_HH
#define DUMUX_BOUNDARYCONDITIONS_HH
diff --git a/dumux/common/boundarytypes.hh b/dumux/common/boundarytypes.hh
index 6da615adc6c317acd86338f72707a75d4b8e4263..35b12701bffdc91c4d712c128fbfdc2f448d1d16 100644
--- a/dumux/common/boundarytypes.hh
+++ b/dumux/common/boundarytypes.hh
@@ -5,13 +5,18 @@
* University of Stuttgart, Germany *
* email: <givenname>.<name>@iws.uni-stuttgart.de *
* *
- * This program is free software; you can redistribute it and/or modify *
+ * 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, as long as this copyright notice *
- * is included in its original form. *
+ * the Free Software Foundation, either version 2 of the License, or *
+ * (at your option) any later version. *
* *
- * This program is distributed WITHOUT ANY WARRANTY. *
+ * 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
diff --git a/dumux/common/exceptions.hh b/dumux/common/exceptions.hh
index f4dfa6a56197923fd81862755d45eaedc7ee9e45..2302528f33e7276e5004d068cf4a346d2e0b28b3 100644
--- a/dumux/common/exceptions.hh
+++ b/dumux/common/exceptions.hh
@@ -6,13 +6,18 @@
* University of Stuttgart, Germany *
* email: <givenname>.<name>@iws.uni-stuttgart.de *
* *
- * This program is free software; you can redistribute it and/or modify *
+ * 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, as long as this copyright notice *
- * is included in its original form. *
+ * the Free Software Foundation, either version 2 of the License, or *
+ * (at your option) any later version. *
* *
- * This program is distributed WITHOUT ANY WARRANTY. *
+ * 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
diff --git a/dumux/common/fixedlengthspline_.hh b/dumux/common/fixedlengthspline_.hh
index 7b577c3b7d5c0f0c3dc825ff29305be45a188248..ef89fa422368680eb1dda075a9216ae47f34136a 100644
--- a/dumux/common/fixedlengthspline_.hh
+++ b/dumux/common/fixedlengthspline_.hh
@@ -5,13 +5,18 @@
* University of Stuttgart, Germany *
* email: <givenname>.<name>@iws.uni-stuttgart.de *
* *
- * This program is free software; you can redistribute it and/or modify *
+ * 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, as long as this copyright notice *
- * is included in its original form. *
+ * the Free Software Foundation, either version 2 of the License, or *
+ * (at your option) any later version. *
* *
- * This program is distributed WITHOUT ANY WARRANTY. *
+ * 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
diff --git a/dumux/common/math.hh b/dumux/common/math.hh
index 2d10b8a475b8b1485da24ca4ce110c5d619226ab..d9ead8d5504d76e95ff3afb19e5322b1692a2c15 100644
--- a/dumux/common/math.hh
+++ b/dumux/common/math.hh
@@ -5,13 +5,18 @@
* University of Stuttgart, Germany *
* email: <givenname>.<name>@iws.uni-stuttgart.de *
* *
- * This program is free software; you can redistribute it and/or modify *
+ * 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, as long as this copyright notice *
- * is included in its original form. *
+ * the Free Software Foundation, either version 2 of the License, or *
+ * (at your option) any later version. *
* *
- * This program is distributed WITHOUT ANY WARRANTY. *
+ * 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
diff --git a/dumux/common/pardiso.hh b/dumux/common/pardiso.hh
index 8431054eb0afd4ef6073cbd7af316da3bb9a1df9..abed548e56fbcff789d1fe8d3656327c874e3248 100644
--- a/dumux/common/pardiso.hh
+++ b/dumux/common/pardiso.hh
@@ -5,13 +5,18 @@
* University of Stuttgart, Germany *
* email: <givenname>.<name>@iws.uni-stuttgart.de *
* *
- * This program is free software; you can redistribute it and/or modify *
+ * 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, as long as this copyright notice *
- * is included in its original form. *
+ * the Free Software Foundation, either version 2 of the License, or *
+ * (at your option) any later version. *
* *
- * This program is distributed WITHOUT ANY WARRANTY. *
+ * 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
diff --git a/dumux/common/pdelabpreconditioner.hh b/dumux/common/pdelabpreconditioner.hh
index 950ffa89b10990980dc559f95c92e01c18762141..100a1e039c7928d84156c9b2f1350f2b2967681f 100644
--- a/dumux/common/pdelabpreconditioner.hh
+++ b/dumux/common/pdelabpreconditioner.hh
@@ -5,13 +5,18 @@
* University of Stuttgart, Germany *
* email: <givenname>.<name>@iws.uni-stuttgart.de *
* *
- * This program is free software; you can redistribute it and/or modify *
+ * 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, as long as this copyright notice *
- * is included in its original form. *
+ * the Free Software Foundation, either version 2 of the License, or *
+ * (at your option) any later version. *
* *
- * This program is distributed WITHOUT ANY WARRANTY. *
+ * 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
diff --git a/dumux/common/propertysystem.hh b/dumux/common/propertysystem.hh
index 59c76e3ccac751f43a8dfaccb749440c578c97ec..40bca9d43771e573294af29297744a86eb4a7252 100644
--- a/dumux/common/propertysystem.hh
+++ b/dumux/common/propertysystem.hh
@@ -5,13 +5,18 @@
* University of Stuttgart, Germany *
* email: <givenname>.<name>@iws.uni-stuttgart.de *
* *
- * This program is free software; you can redistribute it and/or modify *
+ * 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, as long as this copyright notice *
- * is included in its original form. *
+ * the Free Software Foundation, either version 2 of the License, or *
+ * (at your option) any later version. *
* *
- * This program is distributed WITHOUT ANY WARRANTY. *
+ * 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/>. *
*****************************************************************************/
/*!
diff --git a/dumux/common/spline.hh b/dumux/common/spline.hh
index d0aa63d8961455c15af6060322e88cc9b54009e7..d28769ef455582bcab8c0d420a75155de65e96bd 100644
--- a/dumux/common/spline.hh
+++ b/dumux/common/spline.hh
@@ -5,13 +5,18 @@
* University of Stuttgart, Germany *
* email: <givenname>.<name>@iws.uni-stuttgart.de *
* *
- * This program is free software; you can redistribute it and/or modify *
+ * 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, as long as this copyright notice *
- * is included in its original form. *
+ * the Free Software Foundation, either version 2 of the License, or *
+ * (at your option) any later version. *
* *
- * This program is distributed WITHOUT ANY WARRANTY. *
+ * 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
diff --git a/dumux/common/splinecommon_.hh b/dumux/common/splinecommon_.hh
index b8c804ebad174d1a9e5d387051e66d59b59328b1..c67f8c90bd272c6bbd88f98c9a5d8f3f232ded5e 100644
--- a/dumux/common/splinecommon_.hh
+++ b/dumux/common/splinecommon_.hh
@@ -5,13 +5,18 @@
* University of Stuttgart, Germany *
* email: <givenname>.<name>@iws.uni-stuttgart.de *
* *
- * This program is free software; you can redistribute it and/or modify *
+ * 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, as long as this copyright notice *
- * is included in its original form. *
+ * the Free Software Foundation, either version 2 of the License, or *
+ * (at your option) any later version. *
* *
- * This program is distributed WITHOUT ANY WARRANTY. *
+ * 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
diff --git a/dumux/common/start.hh b/dumux/common/start.hh
index 33bf86d4487b3bf3904d874b58a49283cc94d209..7a3caf70f8093bf7946bfb4db4e43dc15288d2e6 100644
--- a/dumux/common/start.hh
+++ b/dumux/common/start.hh
@@ -5,13 +5,18 @@
* University of Stuttgart, Germany *
* email: <givenname>.<name>@iws.uni-stuttgart.de *
* *
- * This program is free software; you can redistribute it and/or modify *
+ * 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, as long as this copyright notice *
- * is included in its original form. *
+ * the Free Software Foundation, either version 2 of the License, or *
+ * (at your option) any later version. *
* *
- * This program is distributed WITHOUT ANY WARRANTY. *
+ * 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
diff --git a/dumux/common/timemanager.hh b/dumux/common/timemanager.hh
index 2bbdd28d235f8e34bb4197c320de089a95e43840..3a64b420daef05f92615a19feeb8af2178145942 100644
--- a/dumux/common/timemanager.hh
+++ b/dumux/common/timemanager.hh
@@ -5,13 +5,18 @@
* University of Stuttgart, Germany *
* email: <givenname>.<name>@iws.uni-stuttgart.de *
* *
- * This program is free software; you can redistribute it and/or modify *
+ * 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, as long as this copyright notice *
- * is included in its original form. *
+ * the Free Software Foundation, either version 2 of the License, or *
+ * (at your option) any later version. *
* *
- * This program is distributed WITHOUT ANY WARRANTY. *
+ * 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
diff --git a/dumux/common/valgrind.hh b/dumux/common/valgrind.hh
index 3acd123d82221c92fcfd0f51c8844735588f2516..2630453aafd4ae09105e86e4c183f0a8350ac673 100644
--- a/dumux/common/valgrind.hh
+++ b/dumux/common/valgrind.hh
@@ -5,13 +5,18 @@
* University of Stuttgart, Germany *
* email: <givenname>.<name>@iws.uni-stuttgart.de *
* *
- * This program is free software; you can redistribute it and/or modify *
+ * 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, as long as this copyright notice *
- * is included in its original form. *
+ * the Free Software Foundation, either version 2 of the License, or *
+ * (at your option) any later version. *
* *
- * This program is distributed WITHOUT ANY WARRANTY. *
+ * 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
diff --git a/dumux/common/variablelengthspline_.hh b/dumux/common/variablelengthspline_.hh
index 2de1de2870e7699b8777125feec5892183659213..69ec36dbcc334343b06cc947f911bcb3b94b5026 100644
--- a/dumux/common/variablelengthspline_.hh
+++ b/dumux/common/variablelengthspline_.hh
@@ -5,13 +5,18 @@
* University of Stuttgart, Germany *
* email: <givenname>.<name>@iws.uni-stuttgart.de *
* *
- * This program is free software; you can redistribute it and/or modify *
+ * 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, as long as this copyright notice *
- * is included in its original form. *
+ * the Free Software Foundation, either version 2 of the License, or *
+ * (at your option) any later version. *
* *
- * This program is distributed WITHOUT ANY WARRANTY. *
+ * 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
diff --git a/dumux/decoupled/1p/1pproperties.hh b/dumux/decoupled/1p/1pproperties.hh
index 267a04ad9202f162e8ff613a7a48dff223c39e16..e227b59ee6728e334880c2a95514cbcd98d94e9f 100644
--- a/dumux/decoupled/1p/1pproperties.hh
+++ b/dumux/decoupled/1p/1pproperties.hh
@@ -7,13 +7,18 @@
* University of Stuttgart, Germany *
* email: <givenname>.<name>@iws.uni-stuttgart.de *
* *
- * This program is free software; you can redistribute it and/or modify *
+ * 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, as long as this copyright notice *
- * is included in its original form. *
+ * the Free Software Foundation, either version 2 of the License, or *
+ * (at your option) any later version. *
* *
- * This program is distributed WITHOUT ANY WARRANTY. *
+ * 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/>. *
*****************************************************************************/
/*!
diff --git a/dumux/decoupled/1p/diffusion/diffusionproblem1p.hh b/dumux/decoupled/1p/diffusion/diffusionproblem1p.hh
index b5ad19bc6fb02f3f616868c52dd374d37797f8bc..c415c6a2529c7534337ab9c8cf6c3f4f1fe01ac6 100644
--- a/dumux/decoupled/1p/diffusion/diffusionproblem1p.hh
+++ b/dumux/decoupled/1p/diffusion/diffusionproblem1p.hh
@@ -6,13 +6,18 @@
* University of Stuttgart, Germany *
* email: <givenname>.<name>@iws.uni-stuttgart.de *
* *
- * This program is free software; you can redistribute it and/or modify *
+ * 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, as long as this copyright notice *
- * is included in its original form. *
+ * the Free Software Foundation, either version 2 of the License, or *
+ * (at your option) any later version. *
* *
- * This program is distributed WITHOUT ANY WARRANTY. *
+ * 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
diff --git a/dumux/decoupled/1p/diffusion/fv/fvpressure1p.hh b/dumux/decoupled/1p/diffusion/fv/fvpressure1p.hh
index 74fedb59dae817664d1d88e8d9235afeebf938c2..23a9ea426498fd837a6c8c357618db47af3501f3 100644
--- a/dumux/decoupled/1p/diffusion/fv/fvpressure1p.hh
+++ b/dumux/decoupled/1p/diffusion/fv/fvpressure1p.hh
@@ -6,13 +6,18 @@
* University of Stuttgart, Germany *
* email: <givenname>.<name>@iws.uni-stuttgart.de *
* *
- * This program is free software; you can redistribute it and/or modify *
+ * 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, as long as this copyright notice *
- * is included in its original form. *
+ * the Free Software Foundation, either version 2 of the License, or *
+ * (at your option) any later version. *
* *
- * This program is distributed WITHOUT ANY WARRANTY. *
+ * 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/>. *
*****************************************************************************/
#ifndef DUMUX_FVPRESSURE1P_HH
#define DUMUX_FVPRESSURE1P_HH
diff --git a/dumux/decoupled/1p/diffusion/fv/fvvelocity1p.hh b/dumux/decoupled/1p/diffusion/fv/fvvelocity1p.hh
index 32221a51309d6fd80b2e5ad6389e84cffb36aaed..869616c6871175c9d5ed5825d3f4858b2bc6bae9 100644
--- a/dumux/decoupled/1p/diffusion/fv/fvvelocity1p.hh
+++ b/dumux/decoupled/1p/diffusion/fv/fvvelocity1p.hh
@@ -5,13 +5,18 @@
* University of Stuttgart, Germany *
* email: <givenname>.<name>@iws.uni-stuttgart.de *
* *
- * This program is free software; you can redistribute it and/or modify *
+ * 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, as long as this copyright notice *
- * is included in its original form. *
+ * the Free Software Foundation, either version 2 of the License, or *
+ * (at your option) any later version. *
* *
- * This program is distributed WITHOUT ANY WARRANTY. *
+ * 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/>. *
*****************************************************************************/
#ifndef DUMUX_FVVELOCITY1P_HH
#define DUMUX_FVVELOCITY1P_HH
diff --git a/dumux/decoupled/2p/2pfluidstate.hh b/dumux/decoupled/2p/2pfluidstate.hh
index 9ab4781c4cc55af6951ff0159060ad0eb12b41ec..f36314ac19d44a2d02045fd2d2a200c0f3faa4c5 100644
--- a/dumux/decoupled/2p/2pfluidstate.hh
+++ b/dumux/decoupled/2p/2pfluidstate.hh
@@ -5,13 +5,18 @@
* University of Stuttgart, Germany *
* email: <givenname>.<name>@iws.uni-stuttgart.de *
* *
- * This program is free software; you can redistribute it and/or modify *
+ * 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, as long as this copyright notice *
- * is included in its original form. *
+ * the Free Software Foundation, either version 2 of the License, or *
+ * (at your option) any later version. *
* *
- * This program is distributed WITHOUT ANY WARRANTY. *
+ * 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
diff --git a/dumux/decoupled/2p/2pproperties.hh b/dumux/decoupled/2p/2pproperties.hh
index dcbcc30d041aa0db0a65a3d85d5c1a8b9e8f4a33..2cbaeab7693284a2f3bd3d9b1a3e28d10b5e1a29 100644
--- a/dumux/decoupled/2p/2pproperties.hh
+++ b/dumux/decoupled/2p/2pproperties.hh
@@ -7,13 +7,18 @@
* University of Stuttgart, Germany *
* email: <givenname>.<name>@iws.uni-stuttgart.de *
* *
- * This program is free software; you can redistribute it and/or modify *
+ * 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, as long as this copyright notice *
- * is included in its original form. *
+ * the Free Software Foundation, either version 2 of the License, or *
+ * (at your option) any later version. *
* *
- * This program is distributed WITHOUT ANY WARRANTY. *
+ * 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/>. *
*****************************************************************************/
/*!
diff --git a/dumux/decoupled/2p/diffusion/diffusionproblem2p.hh b/dumux/decoupled/2p/diffusion/diffusionproblem2p.hh
index bfb51e12a6384a4d29c8acd86f7395c35e9f89d4..24a6118dba088cc102c9d6d63fb19bda05a9acb8 100644
--- a/dumux/decoupled/2p/diffusion/diffusionproblem2p.hh
+++ b/dumux/decoupled/2p/diffusion/diffusionproblem2p.hh
@@ -6,13 +6,18 @@
* University of Stuttgart, Germany *
* email: <givenname>.<name>@iws.uni-stuttgart.de *
* *
- * This program is free software; you can redistribute it and/or modify *
+ * 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, as long as this copyright notice *
- * is included in its original form. *
+ * the Free Software Foundation, either version 2 of the License, or *
+ * (at your option) any later version. *
* *
- * This program is distributed WITHOUT ANY WARRANTY. *
+ * 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
diff --git a/dumux/decoupled/2p/diffusion/fv/fvpressure2p.hh b/dumux/decoupled/2p/diffusion/fv/fvpressure2p.hh
index 627f9a3a5e05031d76d30de775f5148532becc72..035cf1be033f927e02aeea07bfbc3b204993540b 100644
--- a/dumux/decoupled/2p/diffusion/fv/fvpressure2p.hh
+++ b/dumux/decoupled/2p/diffusion/fv/fvpressure2p.hh
@@ -7,13 +7,18 @@
* University of Stuttgart, Germany *
* email: <givenname>.<name>@iws.uni-stuttgart.de *
* *
- * This program is free software; you can redistribute it and/or modify *
+ * 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, as long as this copyright notice *
- * is included in its original form. *
+ * the Free Software Foundation, either version 2 of the License, or *
+ * (at your option) any later version. *
* *
- * This program is distributed WITHOUT ANY WARRANTY. *
+ * 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/>. *
*****************************************************************************/
#ifndef DUMUX_FVPRESSURE2P_HH
#define DUMUX_FVPRESSURE2P_HH
diff --git a/dumux/decoupled/2p/diffusion/fv/fvvelocity2p.hh b/dumux/decoupled/2p/diffusion/fv/fvvelocity2p.hh
index 4a27d3d0af448d1768e5d90dbadb2a76337e0f92..45ace5ba83949d7c1b5ee00b594d6ab5f20d9ef3 100644
--- a/dumux/decoupled/2p/diffusion/fv/fvvelocity2p.hh
+++ b/dumux/decoupled/2p/diffusion/fv/fvvelocity2p.hh
@@ -5,13 +5,18 @@
* University of Stuttgart, Germany *
* email: <givenname>.<name>@iws.uni-stuttgart.de *
* *
- * This program is free software; you can redistribute it and/or modify *
+ * 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, as long as this copyright notice *
- * is included in its original form. *
+ * the Free Software Foundation, either version 2 of the License, or *
+ * (at your option) any later version. *
* *
- * This program is distributed WITHOUT ANY WARRANTY. *
+ * 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/>. *
*****************************************************************************/
#ifndef DUMUX_FVVELOCITY2P_HH
#define DUMUX_FVVELOCITY2P_HH
diff --git a/dumux/decoupled/2p/diffusion/fvmpfa/fvmpfaopressure2p.hh b/dumux/decoupled/2p/diffusion/fvmpfa/fvmpfaopressure2p.hh
index 1d44b79263206c585c97ebe42337926176a7d484..db83331768d6d8a06c5de348255fbfcaa3e39d33 100644
--- a/dumux/decoupled/2p/diffusion/fvmpfa/fvmpfaopressure2p.hh
+++ b/dumux/decoupled/2p/diffusion/fvmpfa/fvmpfaopressure2p.hh
@@ -6,13 +6,18 @@
* University of Stuttgart, Germany *
* email: <givenname>.<name>@mathematik.uni-stuttgart.de *
* *
- * This program is free software; you can redistribute it and/or modify *
+ * 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, as long as this copyright notice *
- * is included in its original form. *
+ * the Free Software Foundation, either version 2 of the License, or *
+ * (at your option) any later version. *
* *
- * This program is distributed WITHOUT ANY WARRANTY. *
+ * 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/>. *
*****************************************************************************/
#ifndef DUNE_FVMPFAOPRESSURE2P_HH
#define DUNE_FVMPFAOPRESSURE2P_HH
diff --git a/dumux/decoupled/2p/diffusion/fvmpfa/fvmpfaovelocity2p.hh b/dumux/decoupled/2p/diffusion/fvmpfa/fvmpfaovelocity2p.hh
index 82bcf630629ac73989f6abdd2fe6dd5b6c16bd05..9c538c637eed788a445b3babebdab0eba0fbd811 100644
--- a/dumux/decoupled/2p/diffusion/fvmpfa/fvmpfaovelocity2p.hh
+++ b/dumux/decoupled/2p/diffusion/fvmpfa/fvmpfaovelocity2p.hh
@@ -6,13 +6,18 @@
* University of Stuttgart, Germany *
* email: <givenname>.<name>@mathematik.uni-stuttgart.de *
* *
- * This program is free software; you can redistribute it and/or modify *
+ * 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, as long as this copyright notice *
- * is included in its original form. *
+ * the Free Software Foundation, either version 2 of the License, or *
+ * (at your option) any later version. *
* *
- * This program is distributed WITHOUT ANY WARRANTY. *
+ * 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/>. *
*****************************************************************************/
#ifndef DUNE_MPFAOVELOCITY2P_HH
diff --git a/dumux/decoupled/2p/diffusion/fvmpfa/mpfaproperties.hh b/dumux/decoupled/2p/diffusion/fvmpfa/mpfaproperties.hh
index ee01d6977f2e977c22112240ff859546f7c78535..5bcfeacf0d9d8f5100cff80a99577b621ddd0879 100644
--- a/dumux/decoupled/2p/diffusion/fvmpfa/mpfaproperties.hh
+++ b/dumux/decoupled/2p/diffusion/fvmpfa/mpfaproperties.hh
@@ -6,13 +6,18 @@
* University of Stuttgart, Germany *
* email: <givenname>.<name>@mathematik.uni-stuttgart.de *
* *
- * This program is free software; you can redistribute it and/or modify *
+ * 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, as long as this copyright notice *
- * is included in its original form. *
+ * the Free Software Foundation, either version 2 of the License, or *
+ * (at your option) any later version. *
* *
- * This program is distributed WITHOUT ANY WARRANTY. *
+ * 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/>. *
*****************************************************************************/
/*!
diff --git a/dumux/decoupled/2p/diffusion/mimetic/croperator.hh b/dumux/decoupled/2p/diffusion/mimetic/croperator.hh
index 26fa43fd30db918cc99c7233687a207423036385..f2a8c843e216ba535d8d4414dddab24abfd9e02c 100644
--- a/dumux/decoupled/2p/diffusion/mimetic/croperator.hh
+++ b/dumux/decoupled/2p/diffusion/mimetic/croperator.hh
@@ -5,13 +5,18 @@
* University of Stuttgart, Germany *
* email: <givenname>.<name>@iws.uni-stuttgart.de *
* *
- * This program is free software; you can redistribute it and/or modify *
+ * 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, as long as this copyright notice *
- * is included in its original form. *
+ * the Free Software Foundation, either version 2 of the License, or *
+ * (at your option) any later version. *
* *
- * This program is distributed WITHOUT ANY WARRANTY. *
+ * 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/>. *
*****************************************************************************/
#ifndef DUMUX_CROPERATOR_HH
#define DUMUX_CROPERATOR_HH
diff --git a/dumux/decoupled/2p/diffusion/mimetic/localstiffness.hh b/dumux/decoupled/2p/diffusion/mimetic/localstiffness.hh
index 93d8b6087a057c903b8d0cf23a3be150aa1ce03c..34461769e2b8b0a4cfeff08f47c0d08d5554b10a 100644
--- a/dumux/decoupled/2p/diffusion/mimetic/localstiffness.hh
+++ b/dumux/decoupled/2p/diffusion/mimetic/localstiffness.hh
@@ -1,4 +1,18 @@
// $Id: localstiffness.hh 560 2009-06-10 09:32:22Z sander $
+/*****************************************************************************
+ * 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/>. *
+ *****************************************************************************/
#ifndef DUNE_LOCALSTIFFNESS_HH
#define DUNE_LOCALSTIFFNESS_HH
diff --git a/dumux/decoupled/2p/diffusion/mimetic/mimeticgroundwater.hh b/dumux/decoupled/2p/diffusion/mimetic/mimeticgroundwater.hh
index 5e348c83af2dd955de14e8bf4e850b07f986cc82..ab556cc154d082ac52117994edac5492546496b7 100644
--- a/dumux/decoupled/2p/diffusion/mimetic/mimeticgroundwater.hh
+++ b/dumux/decoupled/2p/diffusion/mimetic/mimeticgroundwater.hh
@@ -5,13 +5,18 @@
* University of Stuttgart, Germany *
* email: <givenname>.<name>@iws.uni-stuttgart.de *
* *
-* 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, as long as this copyright notice *
-* is included in its original form. *
-* *
-* This program is distributed WITHOUT ANY WARRANTY. *
+ * 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
diff --git a/dumux/decoupled/2p/diffusion/mimetic/mimeticoperator.hh b/dumux/decoupled/2p/diffusion/mimetic/mimeticoperator.hh
index b1debb4feaf3c56f57ee53735629f432c5cd0c1f..7e4353190cff759cdf030c13eac2e841357deb0a 100644
--- a/dumux/decoupled/2p/diffusion/mimetic/mimeticoperator.hh
+++ b/dumux/decoupled/2p/diffusion/mimetic/mimeticoperator.hh
@@ -5,13 +5,18 @@
* University of Stuttgart, Germany *
* email: <givenname>.<name>@iws.uni-stuttgart.de *
* *
- * This program is free software; you can redistribute it and/or modify *
+ * 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, as long as this copyright notice *
- * is included in its original form. *
+ * the Free Software Foundation, either version 2 of the License, or *
+ * (at your option) any later version. *
* *
- * This program is distributed WITHOUT ANY WARRANTY. *
+ * 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
diff --git a/dumux/decoupled/2p/diffusion/mimetic/mimeticpressure2p.hh b/dumux/decoupled/2p/diffusion/mimetic/mimeticpressure2p.hh
index 3ebd93fd5f5dda0ad2d744f866dfbb258a7fe298..cf0128f40535e0b6f0dc24e4b16c5f8703c8bfab 100644
--- a/dumux/decoupled/2p/diffusion/mimetic/mimeticpressure2p.hh
+++ b/dumux/decoupled/2p/diffusion/mimetic/mimeticpressure2p.hh
@@ -7,13 +7,18 @@
* University of Stuttgart, Germany *
* email: <givenname>.<name>@iws.uni-stuttgart.de *
* *
- * This program is free software; you can redistribute it and/or modify *
+ * 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, as long as this copyright notice *
- * is included in its original form. *
+ * the Free Software Foundation, either version 2 of the License, or *
+ * (at your option) any later version. *
* *
- * This program is distributed WITHOUT ANY WARRANTY. *
+ * 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
diff --git a/dumux/decoupled/2p/impes/impesproblem2p.hh b/dumux/decoupled/2p/impes/impesproblem2p.hh
index b8b2e49daf462934b926d22c9473f390c765b875..3e6cb153e622fae522ae1a035bf8fcdfa9f8cc13 100644
--- a/dumux/decoupled/2p/impes/impesproblem2p.hh
+++ b/dumux/decoupled/2p/impes/impesproblem2p.hh
@@ -6,13 +6,18 @@
* University of Stuttgart, Germany *
* email: <givenname>.<name>@iws.uni-stuttgart.de *
* *
- * This program is free software; you can redistribute it and/or modify *
+ * 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, as long as this copyright notice *
- * is included in its original form. *
+ * the Free Software Foundation, either version 2 of the License, or *
+ * (at your option) any later version. *
* *
- * This program is distributed WITHOUT ANY WARRANTY. *
+ * 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
diff --git a/dumux/decoupled/2p/transport/fv/capillarydiffusion.hh b/dumux/decoupled/2p/transport/fv/capillarydiffusion.hh
index ff021368ba611f08bf47ed56f5e159319a84d528..709675f81db202a9cbba6edc8d3b399ca40be6e2 100644
--- a/dumux/decoupled/2p/transport/fv/capillarydiffusion.hh
+++ b/dumux/decoupled/2p/transport/fv/capillarydiffusion.hh
@@ -6,13 +6,18 @@
* University of Stuttgart, Germany *
* email: <givenname>.<name>@iws.uni-stuttgart.de *
* *
- * This program is free software; you can redistribute it and/or modify *
+ * 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, as long as this copyright notice *
- * is included in its original form. *
+ * the Free Software Foundation, either version 2 of the License, or *
+ * (at your option) any later version. *
* *
- * This program is distributed WITHOUT ANY WARRANTY. *
+ * 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/>. *
*****************************************************************************/
#ifndef DUMUX_CAPILLARYDIFFUSION_HH
#define DUMUX_CAPILLARYDIFFUSION_HH
diff --git a/dumux/decoupled/2p/transport/fv/convectivepart.hh b/dumux/decoupled/2p/transport/fv/convectivepart.hh
index 54b9474f46862c012d4f69607c15a6c173ecf7cd..3eec46d4109960fc7aeade83e3b813bc1b3d526f 100644
--- a/dumux/decoupled/2p/transport/fv/convectivepart.hh
+++ b/dumux/decoupled/2p/transport/fv/convectivepart.hh
@@ -5,13 +5,18 @@
* University of Stuttgart, Germany *
* email: <givenname>.<name>@iws.uni-stuttgart.de *
* *
- * This program is free software; you can redistribute it and/or modify *
+ * 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, as long as this copyright notice *
- * is included in its original form. *
+ * the Free Software Foundation, either version 2 of the License, or *
+ * (at your option) any later version. *
* *
- * This program is distributed WITHOUT ANY WARRANTY. *
+ * 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/>. *
*****************************************************************************/
#ifndef DUMUX_CONVECTIVEPART_HH
#define DUMUX_CONVECTIVEPART_HH
diff --git a/dumux/decoupled/2p/transport/fv/diffusivepart.hh b/dumux/decoupled/2p/transport/fv/diffusivepart.hh
index 31753672a44a818f120ba9dfbb6ea809386750b7..a35860f424bb0728ec617006f4dc56d2b39c2897 100644
--- a/dumux/decoupled/2p/transport/fv/diffusivepart.hh
+++ b/dumux/decoupled/2p/transport/fv/diffusivepart.hh
@@ -6,13 +6,18 @@
* University of Stuttgart, Germany *
* email: <givenname>.<name>@iws.uni-stuttgart.de *
* *
- * This program is free software; you can redistribute it and/or modify *
+ * 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, as long as this copyright notice *
- * is included in its original form. *
+ * the Free Software Foundation, either version 2 of the License, or *
+ * (at your option) any later version. *
* *
- * This program is distributed WITHOUT ANY WARRANTY. *
+ * 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/>. *
*****************************************************************************/
#ifndef DUMUX_DIFFUSIVEPART_HH
#define DUMUX_DIFFUSIVEPART_HH
diff --git a/dumux/decoupled/2p/transport/fv/evalcflflux.hh b/dumux/decoupled/2p/transport/fv/evalcflflux.hh
index 2996d37ef00da8eef9cf40ebab34fab74998a6b2..63a05a429cc6c06ae6c6866f42bac40fae4430b8 100644
--- a/dumux/decoupled/2p/transport/fv/evalcflflux.hh
+++ b/dumux/decoupled/2p/transport/fv/evalcflflux.hh
@@ -5,13 +5,18 @@
* University of Stuttgart, Germany *
* email: <givenname>.<name>@iws.uni-stuttgart.de *
* *
- * This program is free software; you can redistribute it and/or modify *
+ * 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, as long as this copyright notice *
- * is included in its original form. *
+ * the Free Software Foundation, either version 2 of the License, or *
+ * (at your option) any later version. *
* *
- * This program is distributed WITHOUT ANY WARRANTY. *
+ * 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/>. *
*****************************************************************************/
#ifndef DUMUX_EVALCFLFLUX_HH
#define DUMUX_EVALCFLFLUX_HH
diff --git a/dumux/decoupled/2p/transport/fv/evalcflflux_coats.hh b/dumux/decoupled/2p/transport/fv/evalcflflux_coats.hh
index 5ed8c12c433bab1e4115f7889921d032d2cbb2ba..86dfb232938b45e1ef079371597c0779773d85a5 100644
--- a/dumux/decoupled/2p/transport/fv/evalcflflux_coats.hh
+++ b/dumux/decoupled/2p/transport/fv/evalcflflux_coats.hh
@@ -5,13 +5,18 @@
* University of Stuttgart, Germany *
* email: <givenname>.<name>@iws.uni-stuttgart.de *
* *
- * This program is free software; you can redistribute it and/or modify *
+ * 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, as long as this copyright notice *
- * is included in its original form. *
+ * the Free Software Foundation, either version 2 of the License, or *
+ * (at your option) any later version. *
* *
- * This program is distributed WITHOUT ANY WARRANTY. *
+ * 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/>. *
*****************************************************************************/
#ifndef DUMUX_EVALCFLFLUX_COATS_HH
#define DUMUX_EVALCFLFLUX_COATS_HH
diff --git a/dumux/decoupled/2p/transport/fv/evalcflflux_default.hh b/dumux/decoupled/2p/transport/fv/evalcflflux_default.hh
index c216d8a11c3bb7785b94062fbf1c42c20bebc402..0e985bcf23873ae3b1bb86b6144ed45a7acc464e 100644
--- a/dumux/decoupled/2p/transport/fv/evalcflflux_default.hh
+++ b/dumux/decoupled/2p/transport/fv/evalcflflux_default.hh
@@ -5,13 +5,18 @@
* University of Stuttgart, Germany *
* email: <givenname>.<name>@iws.uni-stuttgart.de *
* *
- * This program is free software; you can redistribute it and/or modify *
+ * 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, as long as this copyright notice *
- * is included in its original form. *
+ * the Free Software Foundation, either version 2 of the License, or *
+ * (at your option) any later version. *
* *
- * This program is distributed WITHOUT ANY WARRANTY. *
+ * 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/>. *
*****************************************************************************/
#ifndef DUMUX_EVALCFLFLUX_DEFAULT_HH
#define DUMUX_EVALCFLFLUX_DEFAULT_HH
diff --git a/dumux/decoupled/2p/transport/fv/fvsaturation2p.hh b/dumux/decoupled/2p/transport/fv/fvsaturation2p.hh
index 4bf40a592af4fed464d18fd2ce7a9eac9c8c53c2..0ef5e767de1b293d93c442a9bd06c73e36578969 100644
--- a/dumux/decoupled/2p/transport/fv/fvsaturation2p.hh
+++ b/dumux/decoupled/2p/transport/fv/fvsaturation2p.hh
@@ -5,13 +5,18 @@
* University of Stuttgart, Germany *
* email: <givenname>.<name>@iws.uni-stuttgart.de *
* *
- * This program is free software; you can redistribute it and/or modify *
+ * 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, as long as this copyright notice *
- * is included in its original form. *
+ * the Free Software Foundation, either version 2 of the License, or *
+ * (at your option) any later version. *
* *
- * This program is distributed WITHOUT ANY WARRANTY. *
+ * 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/>. *
*****************************************************************************/
#ifndef DUMUX_FVSATURATION2P_HH
#define DUMUX_FVSATURATION2P_HH
diff --git a/dumux/decoupled/2p/transport/fv/gravitypart.hh b/dumux/decoupled/2p/transport/fv/gravitypart.hh
index 25c0a5012852cc3873dfd2c2d1bb8866bb3a5ac7..513fb8a8b8ea47f32dc35d5880d8c695228c89bd 100644
--- a/dumux/decoupled/2p/transport/fv/gravitypart.hh
+++ b/dumux/decoupled/2p/transport/fv/gravitypart.hh
@@ -5,13 +5,18 @@
* University of Stuttgart, Germany *
* email: <givenname>.<name>@iws.uni-stuttgart.de *
* *
- * This program is free software; you can redistribute it and/or modify *
+ * 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, as long as this copyright notice *
- * is included in its original form. *
+ * the Free Software Foundation, either version 2 of the License, or *
+ * (at your option) any later version. *
* *
- * This program is distributed WITHOUT ANY WARRANTY. *
+ * 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/>. *
*****************************************************************************/
#ifndef DUMUX_GRAVITYPART_HH
#define DUMUX_GRAVITYPART_HH
diff --git a/dumux/decoupled/2p/transport/transportproblem2p.hh b/dumux/decoupled/2p/transport/transportproblem2p.hh
index b378ffc8e5e3832f7af7466b7c316c9f1d69745d..9ff7b3d0816dca01adcc6e7ab0513cadcdc3e765 100644
--- a/dumux/decoupled/2p/transport/transportproblem2p.hh
+++ b/dumux/decoupled/2p/transport/transportproblem2p.hh
@@ -6,13 +6,18 @@
* University of Stuttgart, Germany *
* email: <givenname>.<name>@iws.uni-stuttgart.de *
* *
- * This program is free software; you can redistribute it and/or modify *
+ * 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, as long as this copyright notice *
- * is included in its original form. *
+ * the Free Software Foundation, either version 2 of the License, or *
+ * (at your option) any later version. *
* *
- * This program is distributed WITHOUT ANY WARRANTY. *
+ * 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
diff --git a/dumux/decoupled/2p/transport/transportproperties.hh b/dumux/decoupled/2p/transport/transportproperties.hh
index 068e84fe8f2b1b2166fa75c5c5f68826f6304445..4f687f660d931b1d93451d6b0fa3fe341effe615 100644
--- a/dumux/decoupled/2p/transport/transportproperties.hh
+++ b/dumux/decoupled/2p/transport/transportproperties.hh
@@ -5,13 +5,18 @@
* University of Stuttgart, Germany *
* email: <givenname>.<name>@iws.uni-stuttgart.de *
* *
- * This program is free software; you can redistribute it and/or modify *
+ * 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, as long as this copyright notice *
- * is included in its original form. *
+ * the Free Software Foundation, either version 2 of the License, or *
+ * (at your option) any later version. *
* *
- * This program is distributed WITHOUT ANY WARRANTY. *
+ * 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/>. *
*****************************************************************************/
#ifndef DUMUX_TRANSPORT_PROPERTIES_HH
#define DUMUX_TRANSPORT_PROPERTIES_HH
diff --git a/dumux/decoupled/2p/variableclass2p.hh b/dumux/decoupled/2p/variableclass2p.hh
index 3a4a575e0a059e47f53a7e5651ed2d7a5846f035..bc9133e534ced005218f3a4f95999a5327521c18 100644
--- a/dumux/decoupled/2p/variableclass2p.hh
+++ b/dumux/decoupled/2p/variableclass2p.hh
@@ -5,13 +5,18 @@
* University of Stuttgart, Germany *
* email: <givenname>.<name>@iws.uni-stuttgart.de *
* *
- * This program is free software; you can redistribute it and/or modify *
+ * 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, as long as this copyright notice *
- * is included in its original form. *
+ * the Free Software Foundation, either version 2 of the License, or *
+ * (at your option) any later version. *
* *
- * This program is distributed WITHOUT ANY WARRANTY. *
+ * 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/>. *
*****************************************************************************/
#ifndef DUMUX_VARIABLECLASS2P_HH
#define DUMUX_VARIABLECLASS2P_HH
diff --git a/dumux/decoupled/2p2c/2p2cproblem.hh b/dumux/decoupled/2p2c/2p2cproblem.hh
index efe84e697abc00bc6eff3c1fee5309967a473e06..4918c8aaf03ea5dc82d232ee0f52c7f37838decb 100644
--- a/dumux/decoupled/2p2c/2p2cproblem.hh
+++ b/dumux/decoupled/2p2c/2p2cproblem.hh
@@ -5,13 +5,18 @@
* University of Stuttgart, Germany *
* email: <givenname>.<name>@iws.uni-stuttgart.de *
* *
- * This program is free software; you can redistribute it and/or modify *
+ * 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, as long as this copyright notice *
- * is included in its original form. *
+ * the Free Software Foundation, either version 2 of the License, or *
+ * (at your option) any later version. *
* *
- * This program is distributed WITHOUT ANY WARRANTY. *
+ * 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
diff --git a/dumux/decoupled/2p2c/2p2cproperties.hh b/dumux/decoupled/2p2c/2p2cproperties.hh
index 8a79fcc5306555d31f35fcf532777ae3801a4d39..85941d3520bc83366117decd93b992d227302452 100644
--- a/dumux/decoupled/2p2c/2p2cproperties.hh
+++ b/dumux/decoupled/2p2c/2p2cproperties.hh
@@ -5,13 +5,18 @@
* University of Stuttgart, Germany *
* email: <givenname>.<name>@iws.uni-stuttgart.de *
* *
- * This program is free software; you can redistribute it and/or modify *
+ * 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, as long as this copyright notice *
- * is included in its original form. *
+ * the Free Software Foundation, either version 2 of the License, or *
+ * (at your option) any later version. *
* *
- * This program is distributed WITHOUT ANY WARRANTY. *
+ * 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/>. *
*****************************************************************************/
/*!
diff --git a/dumux/decoupled/2p2c/boundaryconditions2p2c.hh b/dumux/decoupled/2p2c/boundaryconditions2p2c.hh
index 96e20ae49f6f1c9d2820c2ee4956ca1ab28bdc96..717cc177c5cccc3e9186237f249e8d0b0e910b76 100644
--- a/dumux/decoupled/2p2c/boundaryconditions2p2c.hh
+++ b/dumux/decoupled/2p2c/boundaryconditions2p2c.hh
@@ -5,13 +5,18 @@
* University of Stuttgart, Germany *
* email: <givenname>.<name>@iws.uni-stuttgart.de *
* *
- * This program is free software; you can redistribute it and/or modify *
+ * 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, as long as this copyright notice *
- * is included in its original form. *
+ * the Free Software Foundation, either version 2 of the License, or *
+ * (at your option) any later version. *
* *
- * This program is distributed WITHOUT ANY WARRANTY. *
+ * 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
diff --git a/dumux/decoupled/2p2c/dec2p2cfluidstate.hh b/dumux/decoupled/2p2c/dec2p2cfluidstate.hh
index 08e1632114117168f1d248e97fc258a55fe4c136..3ba3911a744454072561ec1e57bd6bcc8b10a23a 100644
--- a/dumux/decoupled/2p2c/dec2p2cfluidstate.hh
+++ b/dumux/decoupled/2p2c/dec2p2cfluidstate.hh
@@ -4,13 +4,18 @@
* University of Stuttgart, Germany *
* email: <givenname>.<name>@iws.uni-stuttgart.de *
* *
- * This program is free software; you can redistribute it and/or modify *
+ * 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, as long as this copyright notice *
- * is included in its original form. *
+ * the Free Software Foundation, either version 2 of the License, or *
+ * (at your option) any later version. *
* *
- * This program is distributed WITHOUT ANY WARRANTY. *
+ * 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
diff --git a/dumux/decoupled/2p2c/fvpressure2p2c.hh b/dumux/decoupled/2p2c/fvpressure2p2c.hh
index cc45ef8bbbecfbf579bad8787eaa3894bee1c626..019e31f42acdb1bc3cea0d60fcd27841369a7857 100644
--- a/dumux/decoupled/2p2c/fvpressure2p2c.hh
+++ b/dumux/decoupled/2p2c/fvpressure2p2c.hh
@@ -7,13 +7,18 @@
* University of Stuttgart, Germany *
* email: <givenname>.<name>@iws.uni-stuttgart.de *
* *
- * This program is free software; you can redistribute it and/or modify *
+ * 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, as long as this copyright notice *
- * is included in its original form. *
+ * the Free Software Foundation, either version 2 of the License, or *
+ * (at your option) any later version. *
* *
- * This program is distributed WITHOUT ANY WARRANTY. *
+ * 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/>. *
*****************************************************************************/
#ifndef DUMUX_FVPRESSURE2P2C_HH
#define DUMUX_FVPRESSURE2P2C_HH
diff --git a/dumux/decoupled/2p2c/fvpressure2p2cmultiphysics.hh b/dumux/decoupled/2p2c/fvpressure2p2cmultiphysics.hh
index c4fe6c309c3c5ab50201cc26c2be26f28b4abf88..f123c3a4049581b2ebd1ae3784764bffea225a1a 100644
--- a/dumux/decoupled/2p2c/fvpressure2p2cmultiphysics.hh
+++ b/dumux/decoupled/2p2c/fvpressure2p2cmultiphysics.hh
@@ -7,13 +7,18 @@
* University of Stuttgart, Germany *
* email: <givenname>.<name>@iws.uni-stuttgart.de *
* *
- * This program is free software; you can redistribute it and/or modify *
+ * 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, as long as this copyright notice *
- * is included in its original form. *
+ * the Free Software Foundation, either version 2 of the License, or *
+ * (at your option) any later version. *
* *
- * This program is distributed WITHOUT ANY WARRANTY. *
+ * 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/>. *
*****************************************************************************/
#ifndef DUMUX_FVPRESSURE2P2CMULTIPHYSICS_HH
#define DUMUX_FVPRESSURE2P2CMULTIPHYSICS_HH
diff --git a/dumux/decoupled/2p2c/fvtransport2p2c.hh b/dumux/decoupled/2p2c/fvtransport2p2c.hh
index b093f893dea8b0a62e760e2965c25c2bb69d040c..fe36818af2febd8bf9126cde62973801a3745739 100644
--- a/dumux/decoupled/2p2c/fvtransport2p2c.hh
+++ b/dumux/decoupled/2p2c/fvtransport2p2c.hh
@@ -5,13 +5,18 @@
* University of Stuttgart, Germany *
* email: <givenname>.<name>@iws.uni-stuttgart.de *
* *
- * This program is free software; you can redistribute it and/or modify *
+ * 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, as long as this copyright notice *
- * is included in its original form. *
+ * the Free Software Foundation, either version 2 of the License, or *
+ * (at your option) any later version. *
* *
- * This program is distributed WITHOUT ANY WARRANTY. *
+ * 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/>. *
*****************************************************************************/
#ifndef DUMUX_FVTRANSPORT2P2C_HH
#define DUMUX_FVTRANSPORT2P2C_HH
diff --git a/dumux/decoupled/2p2c/fvtransport2p2cmultiphysics.hh b/dumux/decoupled/2p2c/fvtransport2p2cmultiphysics.hh
index 826e939e3e84dbf5a1f2e6d974bd3cc2f8477f14..1778de44574ec6eab285f819ac7d1ad0d9b6350d 100644
--- a/dumux/decoupled/2p2c/fvtransport2p2cmultiphysics.hh
+++ b/dumux/decoupled/2p2c/fvtransport2p2cmultiphysics.hh
@@ -5,13 +5,18 @@
* University of Stuttgart, Germany *
* email: <givenname>.<name>@iws.uni-stuttgart.de *
* *
- * This program is free software; you can redistribute it and/or modify *
+ * 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, as long as this copyright notice *
- * is included in its original form. *
+ * the Free Software Foundation, either version 2 of the License, or *
+ * (at your option) any later version. *
* *
- * This program is distributed WITHOUT ANY WARRANTY. *
+ * 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/>. *
*****************************************************************************/
#ifndef DUMUX_FVTRANSPORT2P2CMULTIPHYSICS_HH
#define DUMUX_FVTRANSPORT2P2CMULTIPHYSICS_HH
diff --git a/dumux/decoupled/2p2c/pseudo1p2cfluidstate.hh b/dumux/decoupled/2p2c/pseudo1p2cfluidstate.hh
index e3a738ee912382395709b7b5779afc2078589bdd..0586824762585b08ffa9c3407b64b32edf45f269 100644
--- a/dumux/decoupled/2p2c/pseudo1p2cfluidstate.hh
+++ b/dumux/decoupled/2p2c/pseudo1p2cfluidstate.hh
@@ -4,13 +4,18 @@
* University of Stuttgart, Germany *
* email: <givenname>.<name>@iws.uni-stuttgart.de *
* *
- * This program is free software; you can redistribute it and/or modify *
+ * 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, as long as this copyright notice *
- * is included in its original form. *
+ * the Free Software Foundation, either version 2 of the License, or *
+ * (at your option) any later version. *
* *
- * This program is distributed WITHOUT ANY WARRANTY. *
+ * 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
diff --git a/dumux/decoupled/2p2c/variableclass2p2c.hh b/dumux/decoupled/2p2c/variableclass2p2c.hh
index 0c092197372e31d89ea8e5736c8588d713954e2a..b1540ed9f5057175158b8593cdd0ed740380902a 100644
--- a/dumux/decoupled/2p2c/variableclass2p2c.hh
+++ b/dumux/decoupled/2p2c/variableclass2p2c.hh
@@ -5,13 +5,18 @@
* University of Stuttgart, Germany *
* email: <givenname>.<name>@iws.uni-stuttgart.de *
* *
- * This program is free software; you can redistribute it and/or modify *
+ * 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, as long as this copyright notice *
- * is included in its original form. *
+ * the Free Software Foundation, either version 2 of the License, or *
+ * (at your option) any later version. *
* *
- * This program is distributed WITHOUT ANY WARRANTY. *
+ * 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/>. *
*****************************************************************************/
#ifndef DUMUX_VARIABLECLASS2P2C_HH
#define DUMUX_VARIABLECLASS2P2C_HH
diff --git a/dumux/decoupled/common/decoupledproperties.hh b/dumux/decoupled/common/decoupledproperties.hh
index 48501c683f51c42a351aa95ec047f8ba34da3f3f..6ced5b3adad5a3182abd1cd82de0d2f8c9fcd38d 100644
--- a/dumux/decoupled/common/decoupledproperties.hh
+++ b/dumux/decoupled/common/decoupledproperties.hh
@@ -5,13 +5,18 @@
* University of Stuttgart, Germany *
* email: <givenname>.<name>@iws.uni-stuttgart.de *
* *
- * This program is free software; you can redistribute it and/or modify *
+ * 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, as long as this copyright notice *
- * is included in its original form. *
+ * the Free Software Foundation, either version 2 of the License, or *
+ * (at your option) any later version. *
* *
- * This program is distributed WITHOUT ANY WARRANTY. *
+ * 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/>. *
*****************************************************************************/
#ifndef DUMUX_DECOUPLED_PROPERTIES_HH
#define DUMUX_DECOUPLED_PROPERTIES_HH
diff --git a/dumux/decoupled/common/impet.hh b/dumux/decoupled/common/impet.hh
index 2a812ff216cd9a76287361189b757c006d816afb..a37842e97901fc06fc97f8d5cd174e69160edb7b 100644
--- a/dumux/decoupled/common/impet.hh
+++ b/dumux/decoupled/common/impet.hh
@@ -6,13 +6,18 @@
* University of Stuttgart, Germany *
* email: <givenname>.<name>@iws.uni-stuttgart.de *
* *
- * This program is free software; you can redistribute it and/or modify *
+ * 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, as long as this copyright notice *
- * is included in its original form. *
+ * the Free Software Foundation, either version 2 of the License, or *
+ * (at your option) any later version. *
* *
- * This program is distributed WITHOUT ANY WARRANTY. *
+ * 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/>. *
*****************************************************************************/
#ifndef DUMUX_IMPET_HH
#define DUMUX_IMPET_HH
diff --git a/dumux/decoupled/common/impetproblem.hh b/dumux/decoupled/common/impetproblem.hh
index f1fb0543a72b82381f2530512ec7b1f2e2b79811..25e375ba9a1472e49190bc67e041cafe43e70237 100644
--- a/dumux/decoupled/common/impetproblem.hh
+++ b/dumux/decoupled/common/impetproblem.hh
@@ -5,13 +5,18 @@
* University of Stuttgart, Germany *
* email: <givenname>.<name>@iws.uni-stuttgart.de *
* *
- * This program is free software; you can redistribute it and/or modify *
+ * 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, as long as this copyright notice *
- * is included in its original form. *
+ * the Free Software Foundation, either version 2 of the License, or *
+ * (at your option) any later version. *
* *
- * This program is distributed WITHOUT ANY WARRANTY. *
+ * 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/>. *
*****************************************************************************/
#ifndef DUMUX_IMPETPROBLEM_HH
#define DUMUX_IMPETPROBLEM_HH
diff --git a/dumux/decoupled/common/impetproperties.hh b/dumux/decoupled/common/impetproperties.hh
index 54e85af93a787b57ebdb788ff7f89307d421fcab..73c0c17986f9dc462c4f0a936724823344c6cbd2 100644
--- a/dumux/decoupled/common/impetproperties.hh
+++ b/dumux/decoupled/common/impetproperties.hh
@@ -5,13 +5,18 @@
* University of Stuttgart, Germany *
* email: <givenname>.<name>@iws.uni-stuttgart.de *
* *
- * This program is free software; you can redistribute it and/or modify *
+ * 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, as long as this copyright notice *
- * is included in its original form. *
+ * the Free Software Foundation, either version 2 of the License, or *
+ * (at your option) any later version. *
* *
- * This program is distributed WITHOUT ANY WARRANTY. *
+ * 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/>. *
*****************************************************************************/
#ifndef DUMUX_IMPET_PROPERTIES_HH
#define DUMUX_IMPET_PROPERTIES_HH
diff --git a/dumux/decoupled/common/onemodelproblem.hh b/dumux/decoupled/common/onemodelproblem.hh
index a9c80ba747ea5f0da50c93047db4577d8c3488b3..6aacba2fff92c36f6a48b8fa07ba1869d52994f7 100644
--- a/dumux/decoupled/common/onemodelproblem.hh
+++ b/dumux/decoupled/common/onemodelproblem.hh
@@ -6,13 +6,18 @@
* University of Stuttgart, Germany *
* email: <givenname>.<name>@iws.uni-stuttgart.de *
* *
- * This program is free software; you can redistribute it and/or modify *
+ * 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, as long as this copyright notice *
- * is included in its original form. *
+ * the Free Software Foundation, either version 2 of the License, or *
+ * (at your option) any later version. *
* *
- * This program is distributed WITHOUT ANY WARRANTY. *
+ * 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/>. *
*****************************************************************************/
#ifndef DUMUX_ONE_MODEL_PROBLEM_HH
diff --git a/dumux/decoupled/common/variableclass.hh b/dumux/decoupled/common/variableclass.hh
index fa770c5c8fbf3195628e6c6a302811ebc94b8512..50ff5890d3f721d798e709e9492854ae12582acc 100644
--- a/dumux/decoupled/common/variableclass.hh
+++ b/dumux/decoupled/common/variableclass.hh
@@ -5,13 +5,18 @@
* University of Stuttgart, Germany *
* email: <givenname>.<name>@iws.uni-stuttgart.de *
* *
- * This program is free software; you can redistribute it and/or modify *
+ * 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, as long as this copyright notice *
- * is included in its original form. *
+ * the Free Software Foundation, either version 2 of the License, or *
+ * (at your option) any later version. *
* *
- * This program is distributed WITHOUT ANY WARRANTY. *
+ * 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/>. *
*****************************************************************************/
#ifndef DUMUX_VARIABLECLASS_HH
#define DUMUX_VARIABLECLASS_HH
diff --git a/dumux/io/outputToFile.hh b/dumux/io/outputToFile.hh
index cc230dd9c4eb88591da7b3f35c358f071867db67..24b076f7fb1350470581778ca3d9bbf5669eb245 100644
--- a/dumux/io/outputToFile.hh
+++ b/dumux/io/outputToFile.hh
@@ -5,13 +5,18 @@
* University of Stuttgart, Germany *
* email: <givenname>.<name>@iws.uni-stuttgart.de *
* *
- * This program is free software; you can redistribute it and/or modify *
+ * 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, as long as this copyright notice *
- * is included in its original form. *
+ * the Free Software Foundation, either version 2 of the License, or *
+ * (at your option) any later version. *
* *
- * This program is distributed WITHOUT ANY WARRANTY. *
+ * 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
diff --git a/dumux/io/restart.hh b/dumux/io/restart.hh
index bfe15799cc3939dad5ab92657035ccd80f507b37..2fb9a30c1cc017625a68cd8397a29c6ad240c8e8 100644
--- a/dumux/io/restart.hh
+++ b/dumux/io/restart.hh
@@ -5,13 +5,18 @@
* University of Stuttgart, Germany *
* email: <givenname>.<name>@iws.uni-stuttgart.de *
* *
- * This program is free software; you can redistribute it and/or modify *
+ * 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, as long as this copyright notice *
- * is included in its original form. *
+ * the Free Software Foundation, either version 2 of the License, or *
+ * (at your option) any later version. *
* *
- * This program is distributed WITHOUT ANY WARRANTY. *
+ * 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
diff --git a/dumux/io/vtkmultiwriter.hh b/dumux/io/vtkmultiwriter.hh
index c33ac2e9c81026a3686086443caa999ee5519e6a..af9f1d5bc61c378daa6930ce2266daaae3426e27 100644
--- a/dumux/io/vtkmultiwriter.hh
+++ b/dumux/io/vtkmultiwriter.hh
@@ -6,13 +6,18 @@
* University of Stuttgart, Germany *
* email: <givenname>.<name>@iws.uni-stuttgart.de *
* *
- * This program is free software; you can redistribute it and/or modify *
+ * 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, as long as this copyright notice *
- * is included in its original form. *
+ * the Free Software Foundation, either version 2 of the License, or *
+ * (at your option) any later version. *
* *
- * This program is distributed WITHOUT ANY WARRANTY. *
+ * 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
diff --git a/dumux/material/binarycoefficients/fullermethod.hh b/dumux/material/binarycoefficients/fullermethod.hh
index 62ff05a845e325a4a4084e0c60f9af139d56740e..f3ee79f61e776897ac7c7e994b111250cc798249 100644
--- a/dumux/material/binarycoefficients/fullermethod.hh
+++ b/dumux/material/binarycoefficients/fullermethod.hh
@@ -5,13 +5,18 @@
* University of Stuttgart, Germany *
* email: <givenname>.<name>@iws.uni-stuttgart.de *
* *
- * This program is free software; you can redistribute it and/or modify *
+ * 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, as long as this copyright notice *
- * is included in its original form. *
+ * the Free Software Foundation, either version 2 of the License, or *
+ * (at your option) any later version. *
* *
- * This program is distributed WITHOUT ANY WARRANTY. *
+ * 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
diff --git a/dumux/material/binarycoefficients/h2_n2.hh b/dumux/material/binarycoefficients/h2_n2.hh
index 667a9029e2299be1e274ee971642f696598ac5cc..a06a897f0a6101fef238661ea5c828ed71beea85 100644
--- a/dumux/material/binarycoefficients/h2_n2.hh
+++ b/dumux/material/binarycoefficients/h2_n2.hh
@@ -4,13 +4,18 @@
* University of Stuttgart, Germany *
* email: <givenname>.<name>@iws.uni-stuttgart.de *
* *
- * This program is free software; you can redistribute it and/or modify *
+ * 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, as long as this copyright notice *
- * is included in its original form. *
+ * the Free Software Foundation, either version 2 of the License, or *
+ * (at your option) any later version. *
* *
- * This program is distributed WITHOUT ANY WARRANTY. *
+ * 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
diff --git a/dumux/material/binarycoefficients/h2o_n2.hh b/dumux/material/binarycoefficients/h2o_n2.hh
index 91de0bed30cfa4b39c33d88aa9c43e69636e1aec..ceac225e63ba5786472fb7c16b785cb2a66b41db 100644
--- a/dumux/material/binarycoefficients/h2o_n2.hh
+++ b/dumux/material/binarycoefficients/h2o_n2.hh
@@ -5,13 +5,18 @@
* University of Stuttgart, Germany *
* email: <givenname>.<name>@iws.uni-stuttgart.de *
* *
- * This program is free software; you can redistribute it and/or modify *
+ * 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, as long as this copyright notice *
- * is included in its original form. *
+ * the Free Software Foundation, either version 2 of the License, or *
+ * (at your option) any later version. *
* *
- * This program is distributed WITHOUT ANY WARRANTY. *
+ * 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
diff --git a/dumux/material/binarycoefficients/henryiapws.hh b/dumux/material/binarycoefficients/henryiapws.hh
index 9a8c0b1f16118a155ec6e73d47e4598661afdafa..2f14fd6f79c9b9403ff87027fde0617cb749d075 100644
--- a/dumux/material/binarycoefficients/henryiapws.hh
+++ b/dumux/material/binarycoefficients/henryiapws.hh
@@ -5,13 +5,18 @@
* University of Stuttgart, Germany *
* email: <givenname>.<name>@iws.uni-stuttgart.de *
* *
- * This program is free software; you can redistribute it and/or modify *
+ * 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, as long as this copyright notice *
- * is included in its original form. *
+ * the Free Software Foundation, either version 2 of the License, or *
+ * (at your option) any later version. *
* *
- * This program is distributed WITHOUT ANY WARRANTY. *
+ * 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
diff --git a/dumux/material/components/brine.hh b/dumux/material/components/brine.hh
index dc629450ade39691f64d7e5b866c73286aa5cabc..af165772eee1c954b0d488e62052dcdf5679dea2 100644
--- a/dumux/material/components/brine.hh
+++ b/dumux/material/components/brine.hh
@@ -5,13 +5,18 @@
* University of Stuttgart, Germany *
* email: <givenname>.<name>@iws.uni-stuttgart.de *
* *
- * This program is free software; you can redistribute it and/or modify *
+ * 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, as long as this copyright notice *
- * is included in its original form. *
+ * the Free Software Foundation, either version 2 of the License, or *
+ * (at your option) any later version. *
* *
- * This program is distributed WITHOUT ANY WARRANTY. *
+ * 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
diff --git a/dumux/material/components/ch4.hh b/dumux/material/components/ch4.hh
index 93fc9a979cb444a738591faffdb305ce8a953ea2..d03bea285440b9e90f934a93353a598d514822c3 100644
--- a/dumux/material/components/ch4.hh
+++ b/dumux/material/components/ch4.hh
@@ -4,13 +4,18 @@
* University of Stuttgart, Germany *
* email: <givenname>.<name>@iws.uni-stuttgart.de *
* *
- * This program is free software; you can redistribute it and/or modify *
+ * 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, as long as this copyright notice *
- * is included in its original form. *
+ * the Free Software Foundation, either version 2 of the License, or *
+ * (at your option) any later version. *
* *
- * This program is distributed WITHOUT ANY WARRANTY. *
+ * 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
diff --git a/dumux/material/components/component.hh b/dumux/material/components/component.hh
index 7284ffdcca9ba71d3e0eb856e445f6159bdb3d89..286853d1e8a1ae83632738cc600e83bf1552b692 100644
--- a/dumux/material/components/component.hh
+++ b/dumux/material/components/component.hh
@@ -5,13 +5,18 @@
* University of Stuttgart, Germany *
* email: <givenname>.<name>@iws.uni-stuttgart.de *
* *
- * This program is free software; you can redistribute it and/or modify *
+ * 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, as long as this copyright notice *
- * is included in its original form. *
+ * the Free Software Foundation, either version 2 of the License, or *
+ * (at your option) any later version. *
* *
- * This program is distributed WITHOUT ANY WARRANTY. *
+ * 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/>. *
*****************************************************************************/
/*!
diff --git a/dumux/material/components/h2.hh b/dumux/material/components/h2.hh
index f7eacaadc964625a00368ebb62b33439a7a96c43..b04440db9924d8922e739e09273ad602b94a51f9 100644
--- a/dumux/material/components/h2.hh
+++ b/dumux/material/components/h2.hh
@@ -4,13 +4,18 @@
* University of Stuttgart, Germany *
* email: <givenname>.<name>@iws.uni-stuttgart.de *
* *
- * This program is free software; you can redistribute it and/or modify *
+ * 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, as long as this copyright notice *
- * is included in its original form. *
+ * the Free Software Foundation, either version 2 of the License, or *
+ * (at your option) any later version. *
* *
- * This program is distributed WITHOUT ANY WARRANTY. *
+ * 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
diff --git a/dumux/material/components/h2o.hh b/dumux/material/components/h2o.hh
index 45046701a33137e0bdd080c2c3b50ba464550a9f..e5c38141bb4a7d879189660015091149b84c7e2c 100644
--- a/dumux/material/components/h2o.hh
+++ b/dumux/material/components/h2o.hh
@@ -5,13 +5,18 @@
* University of Stuttgart, Germany *
* email: <givenname>.<name>@iws.uni-stuttgart.de *
* *
- * This program is free software; you can redistribute it and/or modify *
+ * 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, as long as this copyright notice *
- * is included in its original form. *
+ * the Free Software Foundation, either version 2 of the License, or *
+ * (at your option) any later version. *
* *
- * This program is distributed WITHOUT ANY WARRANTY. *
+ * 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
diff --git a/dumux/material/components/iapws/common.hh b/dumux/material/components/iapws/common.hh
index 491d6654b67f9719d479591654bd08447c0a030d..5ac8560361f094659fa7d8d902faeb4a669f57fa 100644
--- a/dumux/material/components/iapws/common.hh
+++ b/dumux/material/components/iapws/common.hh
@@ -5,13 +5,18 @@
* University of Stuttgart, Germany *
* email: <givenname>.<name>@iws.uni-stuttgart.de *
* *
- * This program is free software; you can redistribute it and/or modify *
+ * 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, as long as this copyright notice *
- * is included in its original form. *
+ * the Free Software Foundation, either version 2 of the License, or *
+ * (at your option) any later version. *
* *
- * This program is distributed WITHOUT ANY WARRANTY. *
+ * 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
diff --git a/dumux/material/components/iapws/region1.hh b/dumux/material/components/iapws/region1.hh
index c1b1bd9e1562a98a1c951013d9ac72da66613e54..c08cdffda70eba189a6f6310ae19777ddf533186 100644
--- a/dumux/material/components/iapws/region1.hh
+++ b/dumux/material/components/iapws/region1.hh
@@ -5,13 +5,18 @@
* University of Stuttgart, Germany *
* email: <givenname>.<name>@iws.uni-stuttgart.de *
* *
- * This program is free software; you can redistribute it and/or modify *
+ * 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, as long as this copyright notice *
- * is included in its original form. *
+ * the Free Software Foundation, either version 2 of the License, or *
+ * (at your option) any later version. *
* *
- * This program is distributed WITHOUT ANY WARRANTY. *
+ * 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
diff --git a/dumux/material/components/iapws/region2.hh b/dumux/material/components/iapws/region2.hh
index 438a26716e23dcf4c5c4b7ede54dc064a99a2fd3..0f234bfd0523b42b42094fbf7528a4ae9c5ddd84 100644
--- a/dumux/material/components/iapws/region2.hh
+++ b/dumux/material/components/iapws/region2.hh
@@ -5,13 +5,18 @@
* University of Stuttgart, Germany *
* email: <givenname>.<name>@iws.uni-stuttgart.de *
* *
- * This program is free software; you can redistribute it and/or modify *
+ * 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, as long as this copyright notice *
- * is included in its original form. *
+ * the Free Software Foundation, either version 2 of the License, or *
+ * (at your option) any later version. *
* *
- * This program is distributed WITHOUT ANY WARRANTY. *
+ * 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/>. *
*****************************************************************************/
/*!
diff --git a/dumux/material/components/iapws/region4.hh b/dumux/material/components/iapws/region4.hh
index 305b3c6b03601eb1291ab6e0702f37aa81e98291..f7a470206635dcbc414e1e465d2bcb0203e9ae6e 100644
--- a/dumux/material/components/iapws/region4.hh
+++ b/dumux/material/components/iapws/region4.hh
@@ -5,13 +5,18 @@
* University of Stuttgart, Germany *
* email: <givenname>.<name>@iws.uni-stuttgart.de *
* *
- * This program is free software; you can redistribute it and/or modify *
+ * 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, as long as this copyright notice *
- * is included in its original form. *
+ * the Free Software Foundation, either version 2 of the License, or *
+ * (at your option) any later version. *
* *
- * This program is distributed WITHOUT ANY WARRANTY. *
+ * 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
diff --git a/dumux/material/components/n2.hh b/dumux/material/components/n2.hh
index dc2e363c55f151be695a8af46b05c3d2b29ef25f..11313fee2ab2a3647c4e5bb5fe3076cb6181d27d 100644
--- a/dumux/material/components/n2.hh
+++ b/dumux/material/components/n2.hh
@@ -5,13 +5,18 @@
* University of Stuttgart, Germany *
* email: <givenname>.<name>@iws.uni-stuttgart.de *
* *
- * This program is free software; you can redistribute it and/or modify *
+ * 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, as long as this copyright notice *
- * is included in its original form. *
+ * the Free Software Foundation, either version 2 of the License, or *
+ * (at your option) any later version. *
* *
- * This program is distributed WITHOUT ANY WARRANTY. *
+ * 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
diff --git a/dumux/material/components/o2.hh b/dumux/material/components/o2.hh
index 89cda25980581856678cb647a10c556e409fb497..8679cde32aa7228594ed947ab30a126a47df51b1 100644
--- a/dumux/material/components/o2.hh
+++ b/dumux/material/components/o2.hh
@@ -4,13 +4,18 @@
* University of Stuttgart, Germany *
* email: <givenname>.<name>@iws.uni-stuttgart.de *
* *
- * This program is free software; you can redistribute it and/or modify *
+ * 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, as long as this copyright notice *
- * is included in its original form. *
+ * the Free Software Foundation, either version 2 of the License, or *
+ * (at your option) any later version. *
* *
- * This program is distributed WITHOUT ANY WARRANTY. *
+ * 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
diff --git a/dumux/material/components/oil.hh b/dumux/material/components/oil.hh
index b9a56d5baaa936e0783424f7fa19f4f007add375..bac07f759cdab9fc223c5b45ee65eae7dc0090a0 100644
--- a/dumux/material/components/oil.hh
+++ b/dumux/material/components/oil.hh
@@ -4,13 +4,18 @@
* University of Stuttgart, Germany *
* email: <givenname>.<name>@iws.uni-stuttgart.de *
* *
- * This program is free software; you can redistribute it and/or modify *
+ * 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, as long as this copyright notice *
- * is included in its original form. *
+ * the Free Software Foundation, either version 2 of the License, or *
+ * (at your option) any later version. *
* *
- * This program is distributed WITHOUT ANY WARRANTY. *
+ * 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
diff --git a/dumux/material/components/simpleco2.hh b/dumux/material/components/simpleco2.hh
index 76512ee3ecd11360fe1265eb3726951e28da992b..a045f54c4b021da08e00377e7d65c4dad3ecd98e 100644
--- a/dumux/material/components/simpleco2.hh
+++ b/dumux/material/components/simpleco2.hh
@@ -5,13 +5,18 @@
* University of Stuttgart, Germany *
* email: <givenname>.<name>@iws.uni-stuttgart.de *
* *
- * This program is free software; you can redistribute it and/or modify *
+ * 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, as long as this copyright notice *
- * is included in its original form. *
+ * the Free Software Foundation, either version 2 of the License, or *
+ * (at your option) any later version. *
* *
- * This program is distributed WITHOUT ANY WARRANTY. *
+ * 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
diff --git a/dumux/material/components/simplednapl.hh b/dumux/material/components/simplednapl.hh
index 6a7c16e46ddfa2615a0977ce570c93f6424a2023..29f93ead8b26c9b203ea31715b578c9cf8802479 100644
--- a/dumux/material/components/simplednapl.hh
+++ b/dumux/material/components/simplednapl.hh
@@ -5,13 +5,18 @@
* University of Stuttgart, Germany *
* email: <givenname>.<name>@iws.uni-stuttgart.de *
* *
- * This program is free software; you can redistribute it and/or modify *
+ * 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, as long as this copyright notice *
- * is included in its original form. *
+ * the Free Software Foundation, either version 2 of the License, or *
+ * (at your option) any later version. *
* *
- * This program is distributed WITHOUT ANY WARRANTY. *
+ * 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
diff --git a/dumux/material/components/simpleh2o.hh b/dumux/material/components/simpleh2o.hh
index addb1503846655d5d04fa7b4f32fa5e29187211b..8fa8c18cd0078d6dd88661596da9793a561f9d4d 100644
--- a/dumux/material/components/simpleh2o.hh
+++ b/dumux/material/components/simpleh2o.hh
@@ -5,13 +5,18 @@
* University of Stuttgart, Germany *
* email: <givenname>.<name>@iws.uni-stuttgart.de *
* *
- * This program is free software; you can redistribute it and/or modify *
+ * 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, as long as this copyright notice *
- * is included in its original form. *
+ * the Free Software Foundation, either version 2 of the License, or *
+ * (at your option) any later version. *
* *
- * This program is distributed WITHOUT ANY WARRANTY. *
+ * 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
diff --git a/dumux/material/components/tabulatedcomponent.hh b/dumux/material/components/tabulatedcomponent.hh
index b5ef866d64b4b5780305897a4841a416729b72fa..149f76a5bb640a7ad4c13875be976c178c249328 100644
--- a/dumux/material/components/tabulatedcomponent.hh
+++ b/dumux/material/components/tabulatedcomponent.hh
@@ -5,13 +5,18 @@
* University of Stuttgart, Germany *
* email: <givenname>.<name>@iws.uni-stuttgart.de *
* *
- * This program is free software; you can redistribute it and/or modify *
+ * 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, as long as this copyright notice *
- * is included in its original form. *
+ * the Free Software Foundation, either version 2 of the License, or *
+ * (at your option) any later version. *
* *
- * This program is distributed WITHOUT ANY WARRANTY. *
+ * 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
diff --git a/dumux/material/components/unit.hh b/dumux/material/components/unit.hh
index aa6c788b4c13c9962229a431e5feedcee12fada6..7cf8697832a459a573d7cce2183f23471ee8bb90 100644
--- a/dumux/material/components/unit.hh
+++ b/dumux/material/components/unit.hh
@@ -5,13 +5,18 @@
* University of Stuttgart, Germany *
* email: <givenname>.<name>@iws.uni-stuttgart.de *
* *
- * This program is free software; you can redistribute it and/or modify *
+ * 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, as long as this copyright notice *
- * is included in its original form. *
+ * the Free Software Foundation, either version 2 of the License, or *
+ * (at your option) any later version. *
* *
- * This program is distributed WITHOUT ANY WARRANTY. *
+ * 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
diff --git a/dumux/material/fluidmatrixinteractions/2p/brookscorey.hh b/dumux/material/fluidmatrixinteractions/2p/brookscorey.hh
index b904a1a760a0692f5377a1b2b54cd8c6dd8524c9..32398353069f03287f53d932b3dbd1953424598e 100644
--- a/dumux/material/fluidmatrixinteractions/2p/brookscorey.hh
+++ b/dumux/material/fluidmatrixinteractions/2p/brookscorey.hh
@@ -5,13 +5,18 @@
* University of Stuttgart, Germany *
* email: <givenname>.<name>@iws.uni-stuttgart.de *
* *
- * This program is free software; you can redistribute it and/or modify *
+ * 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, as long as this copyright notice *
- * is included in its original form. *
+ * the Free Software Foundation, either version 2 of the License, or *
+ * (at your option) any later version. *
* *
- * This program is distributed WITHOUT ANY WARRANTY. *
+ * 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
diff --git a/dumux/material/fluidmatrixinteractions/2p/brookscoreyparams.hh b/dumux/material/fluidmatrixinteractions/2p/brookscoreyparams.hh
index d0f94d70ccd3f11ea9937739b18767168895712b..c79b392158cba58dbaafc6e0e3888be8a2160443 100644
--- a/dumux/material/fluidmatrixinteractions/2p/brookscoreyparams.hh
+++ b/dumux/material/fluidmatrixinteractions/2p/brookscoreyparams.hh
@@ -5,13 +5,18 @@
* University of Stuttgart, Germany *
* email: <givenname>.<name>@iws.uni-stuttgart.de *
* *
- * This program is free software; you can redistribute it and/or modify *
+ * 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, as long as this copyright notice *
- * is included in its original form. *
+ * the Free Software Foundation, either version 2 of the License, or *
+ * (at your option) any later version. *
* *
- * This program is distributed WITHOUT ANY WARRANTY. *
+ * 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/>. *
*****************************************************************************/
/*!
diff --git a/dumux/material/fluidmatrixinteractions/2p/efftoabslaw.hh b/dumux/material/fluidmatrixinteractions/2p/efftoabslaw.hh
index f68a7c2896de636928788e204c1f4d75b2bab57a..3cbbf10d6212d64207b48c3553c729e2db167047 100644
--- a/dumux/material/fluidmatrixinteractions/2p/efftoabslaw.hh
+++ b/dumux/material/fluidmatrixinteractions/2p/efftoabslaw.hh
@@ -5,13 +5,18 @@
* University of Stuttgart, Germany *
* email: <givenname>.<name>@iws.uni-stuttgart.de *
* *
- * This program is free software; you can redistribute it and/or modify *
+ * 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, as long as this copyright notice *
- * is included in its original form. *
+ * the Free Software Foundation, either version 2 of the License, or *
+ * (at your option) any later version. *
* *
- * This program is distributed WITHOUT ANY WARRANTY. *
+ * 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
diff --git a/dumux/material/fluidmatrixinteractions/2p/efftoabslawparams.hh b/dumux/material/fluidmatrixinteractions/2p/efftoabslawparams.hh
index dee286312026f945e46bd1dd238c949557ce6931..74968c268762965877bf3ed413921a8daf423d4f 100644
--- a/dumux/material/fluidmatrixinteractions/2p/efftoabslawparams.hh
+++ b/dumux/material/fluidmatrixinteractions/2p/efftoabslawparams.hh
@@ -5,13 +5,18 @@
* University of Stuttgart, Germany *
* email: <givenname>.<name>@iws.uni-stuttgart.de *
* *
- * This program is free software; you can redistribute it and/or modify *
+ * 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, as long as this copyright notice *
- * is included in its original form. *
+ * the Free Software Foundation, either version 2 of the License, or *
+ * (at your option) any later version. *
* *
- * This program is distributed WITHOUT ANY WARRANTY. *
+ * 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
diff --git a/dumux/material/fluidmatrixinteractions/2p/linearmaterial.hh b/dumux/material/fluidmatrixinteractions/2p/linearmaterial.hh
index ff625d0ea9282a973177667adb098dc4ae828d63..b9abbdd2bb492439cc22a4d11df10d4646b92f18 100644
--- a/dumux/material/fluidmatrixinteractions/2p/linearmaterial.hh
+++ b/dumux/material/fluidmatrixinteractions/2p/linearmaterial.hh
@@ -5,13 +5,18 @@
* University of Stuttgart, Germany *
* email: <givenname>.<name>@iws.uni-stuttgart.de *
* *
- * This program is free software; you can redistribute it and/or modify *
+ * 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, as long as this copyright notice *
- * is included in its original form. *
+ * the Free Software Foundation, either version 2 of the License, or *
+ * (at your option) any later version. *
* *
- * This program is distributed WITHOUT ANY WARRANTY. *
+ * 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
diff --git a/dumux/material/fluidmatrixinteractions/2p/linearmaterialparams.hh b/dumux/material/fluidmatrixinteractions/2p/linearmaterialparams.hh
index 27baac0bcd70031380d6c664f883f6e1e9d17251..613bf0e52636423d0dd69f2925a32f3b7aa5eb79 100644
--- a/dumux/material/fluidmatrixinteractions/2p/linearmaterialparams.hh
+++ b/dumux/material/fluidmatrixinteractions/2p/linearmaterialparams.hh
@@ -5,13 +5,18 @@
* University of Stuttgart, Germany *
* email: <givenname>.<name>@iws.uni-stuttgart.de *
* *
- * This program is free software; you can redistribute it and/or modify *
+ * 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, as long as this copyright notice *
- * is included in its original form. *
+ * the Free Software Foundation, either version 2 of the License, or *
+ * (at your option) any later version. *
* *
- * This program is distributed WITHOUT ANY WARRANTY. *
+ * 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
diff --git a/dumux/material/fluidmatrixinteractions/2p/regularizedbrookscorey.hh b/dumux/material/fluidmatrixinteractions/2p/regularizedbrookscorey.hh
index d0cf06f591e597018e90b2c680a0dfe34e9bfed3..89fd888d19f958e6a7ce6a6e13f853300e4222df 100644
--- a/dumux/material/fluidmatrixinteractions/2p/regularizedbrookscorey.hh
+++ b/dumux/material/fluidmatrixinteractions/2p/regularizedbrookscorey.hh
@@ -5,13 +5,18 @@
* University of Stuttgart, Germany *
* email: <givenname>.<name>@iws.uni-stuttgart.de *
* *
- * This program is free software; you can redistribute it and/or modify *
+ * 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, as long as this copyright notice *
- * is included in its original form. *
+ * the Free Software Foundation, either version 2 of the License, or *
+ * (at your option) any later version. *
* *
- * This program is distributed WITHOUT ANY WARRANTY. *
+ * 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
diff --git a/dumux/material/fluidmatrixinteractions/2p/regularizedbrookscoreyparams.hh b/dumux/material/fluidmatrixinteractions/2p/regularizedbrookscoreyparams.hh
index 749dae18e30b2ca8a0bc9d691eaffb2af330b7e5..bdfa321dfa13bd67ab394a88b98ec05af37307a5 100644
--- a/dumux/material/fluidmatrixinteractions/2p/regularizedbrookscoreyparams.hh
+++ b/dumux/material/fluidmatrixinteractions/2p/regularizedbrookscoreyparams.hh
@@ -5,13 +5,18 @@
* University of Stuttgart, Germany *
* email: <givenname>.<name>@iws.uni-stuttgart.de *
* *
- * This program is free software; you can redistribute it and/or modify *
+ * 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, as long as this copyright notice *
- * is included in its original form. *
+ * the Free Software Foundation, either version 2 of the License, or *
+ * (at your option) any later version. *
* *
- * This program is distributed WITHOUT ANY WARRANTY. *
+ * 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
diff --git a/dumux/material/fluidmatrixinteractions/2p/regularizedlinearmaterial.hh b/dumux/material/fluidmatrixinteractions/2p/regularizedlinearmaterial.hh
index 1e2c1b66395f586df47c515b6e6461ddcefda19a..a310dbcd972c453d4c230ace13faff41350532e6 100644
--- a/dumux/material/fluidmatrixinteractions/2p/regularizedlinearmaterial.hh
+++ b/dumux/material/fluidmatrixinteractions/2p/regularizedlinearmaterial.hh
@@ -4,13 +4,18 @@
* University of Stuttgart, Germany *
* email: <givenname>.<name>@iws.uni-stuttgart.de *
* *
- * This program is free software; you can redistribute it and/or modify *
+ * 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, as long as this copyright notice *
- * is included in its original form. *
+ * the Free Software Foundation, either version 2 of the License, or *
+ * (at your option) any later version. *
* *
- * This program is distributed WITHOUT ANY WARRANTY. *
+ * 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
diff --git a/dumux/material/fluidmatrixinteractions/2p/regularizedlinearmaterialparams.hh b/dumux/material/fluidmatrixinteractions/2p/regularizedlinearmaterialparams.hh
index d4d865fcb691577b35909174770adbac2ac9e8fc..703962042e87f764eab3b0937a79baf3188bcb6a 100644
--- a/dumux/material/fluidmatrixinteractions/2p/regularizedlinearmaterialparams.hh
+++ b/dumux/material/fluidmatrixinteractions/2p/regularizedlinearmaterialparams.hh
@@ -5,13 +5,18 @@
* University of Stuttgart, Germany *
* email: <givenname>.<name>@iws.uni-stuttgart.de *
* *
- * This program is free software; you can redistribute it and/or modify *
+ * 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, as long as this copyright notice *
- * is included in its original form. *
+ * the Free Software Foundation, either version 2 of the License, or *
+ * (at your option) any later version. *
* *
- * This program is distributed WITHOUT ANY WARRANTY. *
+ * 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
diff --git a/dumux/material/fluidmatrixinteractions/2p/regularizedvangenuchten.hh b/dumux/material/fluidmatrixinteractions/2p/regularizedvangenuchten.hh
index a481b0aeaf7dc4b9d5ba8735b04d4750369d73a1..96cb3064e486b0512a3cde3fb2569267aa758086 100644
--- a/dumux/material/fluidmatrixinteractions/2p/regularizedvangenuchten.hh
+++ b/dumux/material/fluidmatrixinteractions/2p/regularizedvangenuchten.hh
@@ -5,13 +5,18 @@
* University of Stuttgart, Germany *
* email: <givenname>.<name>@iws.uni-stuttgart.de *
* *
- * This program is free software; you can redistribute it and/or modify *
+ * 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, as long as this copyright notice *
- * is included in its original form. *
+ * the Free Software Foundation, either version 2 of the License, or *
+ * (at your option) any later version. *
* *
- * This program is distributed WITHOUT ANY WARRANTY. *
+ * 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
diff --git a/dumux/material/fluidmatrixinteractions/2p/regularizedvangenuchtenparams.hh b/dumux/material/fluidmatrixinteractions/2p/regularizedvangenuchtenparams.hh
index 5728c5100fed53bbd8b73140ad043c6417238726..bba4ec6e1cdfe1ef1d948254db8b9b6ab37af7d5 100644
--- a/dumux/material/fluidmatrixinteractions/2p/regularizedvangenuchtenparams.hh
+++ b/dumux/material/fluidmatrixinteractions/2p/regularizedvangenuchtenparams.hh
@@ -5,13 +5,18 @@
* University of Stuttgart, Germany *
* email: <givenname>.<name>@iws.uni-stuttgart.de *
* *
- * This program is free software; you can redistribute it and/or modify *
+ * 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, as long as this copyright notice *
- * is included in its original form. *
+ * the Free Software Foundation, either version 2 of the License, or *
+ * (at your option) any later version. *
* *
- * This program is distributed WITHOUT ANY WARRANTY. *
+ * 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
diff --git a/dumux/material/fluidmatrixinteractions/2p/vangenuchten.hh b/dumux/material/fluidmatrixinteractions/2p/vangenuchten.hh
index f9fb3ad0c307325e4373b526b1952acf54b10223..9dad9305d0a529349b6cc70e3ea1675a91de17aa 100644
--- a/dumux/material/fluidmatrixinteractions/2p/vangenuchten.hh
+++ b/dumux/material/fluidmatrixinteractions/2p/vangenuchten.hh
@@ -5,13 +5,18 @@
* University of Stuttgart, Germany *
* email: <givenname>.<name>@iws.uni-stuttgart.de *
* *
- * This program is free software; you can redistribute it and/or modify *
+ * 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, as long as this copyright notice *
- * is included in its original form. *
+ * the Free Software Foundation, either version 2 of the License, or *
+ * (at your option) any later version. *
* *
- * This program is distributed WITHOUT ANY WARRANTY. *
+ * 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
diff --git a/dumux/material/fluidmatrixinteractions/2p/vangenuchtenparams.hh b/dumux/material/fluidmatrixinteractions/2p/vangenuchtenparams.hh
index 24ea9271c10b9b65ffbe05d54b1caa173e9df3fe..ba0874f643e6b924438c7307ece8e05255b341db 100644
--- a/dumux/material/fluidmatrixinteractions/2p/vangenuchtenparams.hh
+++ b/dumux/material/fluidmatrixinteractions/2p/vangenuchtenparams.hh
@@ -5,13 +5,18 @@
* University of Stuttgart, Germany *
* email: <givenname>.<name>@iws.uni-stuttgart.de *
* *
- * This program is free software; you can redistribute it and/or modify *
+ * 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, as long as this copyright notice *
- * is included in its original form. *
+ * the Free Software Foundation, either version 2 of the License, or *
+ * (at your option) any later version. *
* *
- * This program is distributed WITHOUT ANY WARRANTY. *
+ * 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
diff --git a/dumux/material/fluidstate.hh b/dumux/material/fluidstate.hh
index dc560d5ad2d9e2d5333b501159c62d56cbd4aeed..a55b370fb2c2c1bddcbe53a4a12434cb12798e16 100644
--- a/dumux/material/fluidstate.hh
+++ b/dumux/material/fluidstate.hh
@@ -5,13 +5,18 @@
* University of Stuttgart, Germany *
* email: <givenname>.<name>@iws.uni-stuttgart.de *
* *
- * This program is free software; you can redistribute it and/or modify *
+ * 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, as long as this copyright notice *
- * is included in its original form. *
+ * the Free Software Foundation, either version 2 of the License, or *
+ * (at your option) any later version. *
* *
- * This program is distributed WITHOUT ANY WARRANTY. *
+ * 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
diff --git a/dumux/material/fluidsystems/2p_system.hh b/dumux/material/fluidsystems/2p_system.hh
index 583f121575e735b9c9b2d962b3747747bc9ff834..ec287eb5d2eb3a9f077c2b2b3691d29f7869c38c 100644
--- a/dumux/material/fluidsystems/2p_system.hh
+++ b/dumux/material/fluidsystems/2p_system.hh
@@ -5,13 +5,18 @@
* University of Stuttgart, Germany *
* email: <givenname>.<name>@iws.uni-stuttgart.de *
* *
- * This program is free software; you can redistribute it and/or modify *
+ * 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, as long as this copyright notice *
- * is included in its original form. *
+ * the Free Software Foundation, either version 2 of the License, or *
+ * (at your option) any later version. *
* *
- * This program is distributed WITHOUT ANY WARRANTY. *
+ * 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
diff --git a/dumux/material/fluidsystems/defaultcomponents.hh b/dumux/material/fluidsystems/defaultcomponents.hh
index 165a9b12fcbc5a85618e7571f83187ed79bf9b8f..fcceeb112ba52e6c99b88b4c01761919c10d6f3c 100644
--- a/dumux/material/fluidsystems/defaultcomponents.hh
+++ b/dumux/material/fluidsystems/defaultcomponents.hh
@@ -6,13 +6,18 @@
* University of Stuttgart, Germany *
* email: <givenname>.<name>@iws.uni-stuttgart.de *
* *
- * This program is free software; you can redistribute it and/or modify *
+ * 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, as long as this copyright notice *
- * is included in its original form. *
+ * the Free Software Foundation, either version 2 of the License, or *
+ * (at your option) any later version. *
* *
- * This program is distributed WITHOUT ANY WARRANTY. *
+ * 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
diff --git a/dumux/material/fluidsystems/gasphase.hh b/dumux/material/fluidsystems/gasphase.hh
index 93a9eaa27e17423fcb38edc7c76dd25ce6338c3a..eb8c1487bac391ea1b97c1fd3ec692342c9fb1eb 100644
--- a/dumux/material/fluidsystems/gasphase.hh
+++ b/dumux/material/fluidsystems/gasphase.hh
@@ -4,13 +4,18 @@
* University of Stuttgart, Germany *
* email: <givenname>.<name>@iws.uni-stuttgart.de *
* *
- * This program is free software; you can redistribute it and/or modify *
+ * 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, as long as this copyright notice *
- * is included in its original form. *
+ * the Free Software Foundation, either version 2 of the License, or *
+ * (at your option) any later version. *
* *
- * This program is distributed WITHOUT ANY WARRANTY. *
+ * 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
diff --git a/dumux/material/fluidsystems/h2o_n2_system.hh b/dumux/material/fluidsystems/h2o_n2_system.hh
index f88a56e7496959bbdf2476d51ede2843f5e71ca9..c07790dd836419bb85b95f048f1f99899f79d665 100644
--- a/dumux/material/fluidsystems/h2o_n2_system.hh
+++ b/dumux/material/fluidsystems/h2o_n2_system.hh
@@ -5,13 +5,18 @@
* University of Stuttgart, Germany *
* email: <givenname>.<name>@iws.uni-stuttgart.de *
* *
- * This program is free software; you can redistribute it and/or modify *
+ * 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, as long as this copyright notice *
- * is included in its original form. *
+ * the Free Software Foundation, either version 2 of the License, or *
+ * (at your option) any later version. *
* *
- * This program is distributed WITHOUT ANY WARRANTY. *
+ * 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
diff --git a/dumux/material/fluidsystems/isfluid_trail_system.hh b/dumux/material/fluidsystems/isfluid_trail_system.hh
index a1431ed654d511e649eb3e094dcd8c5684249440..fdc1e6aa8677a532a2757bc4dd9d91f211cfd38f 100644
--- a/dumux/material/fluidsystems/isfluid_trail_system.hh
+++ b/dumux/material/fluidsystems/isfluid_trail_system.hh
@@ -4,13 +4,18 @@
* University of Stuttgart, Germany *
* email: <givenname>.<name>@iws.uni-stuttgart.de *
* *
- * This program is free software; you can redistribute it and/or modify *
+ * 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, as long as this copyright notice *
- * is included in its original form. *
+ * the Free Software Foundation, either version 2 of the License, or *
+ * (at your option) any later version. *
* *
- * This program is distributed WITHOUT ANY WARRANTY. *
+ * 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
diff --git a/dumux/material/fluidsystems/liquidphase.hh b/dumux/material/fluidsystems/liquidphase.hh
index ad523aa44e5509824415e7dfb9ea75d6ca4fee0f..1fdb8a6e408d8589da5730c5f5fd6365de738f00 100644
--- a/dumux/material/fluidsystems/liquidphase.hh
+++ b/dumux/material/fluidsystems/liquidphase.hh
@@ -4,13 +4,18 @@
* University of Stuttgart, Germany *
* email: <givenname>.<name>@iws.uni-stuttgart.de *
* *
- * This program is free software; you can redistribute it and/or modify *
+ * 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, as long as this copyright notice *
- * is included in its original form. *
+ * the Free Software Foundation, either version 2 of the License, or *
+ * (at your option) any later version. *
* *
- * This program is distributed WITHOUT ANY WARRANTY. *
+ * 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
diff --git a/dumux/material/idealgas.hh b/dumux/material/idealgas.hh
index 2c3e9c7d109575d9b3d9f9516f42d6bff99095ef..510033a026615f7ecdbbc4ffd58dd1ec2c437795 100644
--- a/dumux/material/idealgas.hh
+++ b/dumux/material/idealgas.hh
@@ -5,13 +5,18 @@
* University of Stuttgart, Germany *
* email: <givenname>.<name>@iws.uni-stuttgart.de *
* *
- * This program is free software; you can redistribute it and/or modify *
+ * 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, as long as this copyright notice *
- * is included in its original form. *
+ * the Free Software Foundation, either version 2 of the License, or *
+ * (at your option) any later version. *
* *
- * This program is distributed WITHOUT ANY WARRANTY. *
+ * 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
diff --git a/dumux/material/settablephase.hh b/dumux/material/settablephase.hh
index a1b46cb35ce2270339d14663bf1e81d7da2dbb42..2d0152dfed49cd4ad3b3fbf18b3ad9e6ec9b7def 100644
--- a/dumux/material/settablephase.hh
+++ b/dumux/material/settablephase.hh
@@ -5,13 +5,18 @@
* University of Stuttgart, Germany *
* email: <givenname>.<name>@iws.uni-stuttgart.de *
* *
- * This program is free software; you can redistribute it and/or modify *
+ * 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, as long as this copyright notice *
- * is included in its original form. *
+ * the Free Software Foundation, either version 2 of the License, or *
+ * (at your option) any later version. *
* *
- * This program is distributed WITHOUT ANY WARRANTY. *
+ * 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
diff --git a/dumux/material/spatialparameters/boxspatialparameters.hh b/dumux/material/spatialparameters/boxspatialparameters.hh
index b95bacc44aa57af6ce679ca17b8679693a1a12d3..52c627e6b206cfc96707ded63c0eccf5d7ecf0d7 100644
--- a/dumux/material/spatialparameters/boxspatialparameters.hh
+++ b/dumux/material/spatialparameters/boxspatialparameters.hh
@@ -5,13 +5,18 @@
* University of Stuttgart, Germany *
* email: <givenname>.<name>@iws.uni-stuttgart.de *
* *
- * This program is free software; you can redistribute it and/or modify *
+ * 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, as long as this copyright notice *
- * is included in its original form. *
+ * the Free Software Foundation, either version 2 of the License, or *
+ * (at your option) any later version. *
* *
- * This program is distributed WITHOUT ANY WARRANTY. *
+ * 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
diff --git a/dumux/nonlinear/newtoncontroller.hh b/dumux/nonlinear/newtoncontroller.hh
index ccf77d366ad9f2e004aff0ad47218c6e0b760611..4dfe3a9e04bea33d71a7db118b13a7a1d6da271e 100644
--- a/dumux/nonlinear/newtoncontroller.hh
+++ b/dumux/nonlinear/newtoncontroller.hh
@@ -6,13 +6,18 @@
* University of Stuttgart, Germany *
* email: <givenname>.<name>@iws.uni-stuttgart.de *
* *
- * This program is free software; you can redistribute it and/or modify *
+ * 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, as long as this copyright notice *
- * is included in its original form. *
+ * the Free Software Foundation, either version 2 of the License, or *
+ * (at your option) any later version. *
* *
- * This program is distributed WITHOUT ANY WARRANTY. *
+ * 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
diff --git a/dumux/nonlinear/newtonmethod.hh b/dumux/nonlinear/newtonmethod.hh
index 68b3979e4bcaf2ed0bd5498f2ffd84f7f44457d4..1774073fa0e9908ee6ed06b5e10e2446e8b6857c 100644
--- a/dumux/nonlinear/newtonmethod.hh
+++ b/dumux/nonlinear/newtonmethod.hh
@@ -5,13 +5,18 @@
* University of Stuttgart, Germany *
* email: <givenname>.<name>@iws.uni-stuttgart.de *
* *
- * This program is free software; you can redistribute it and/or modify *
+ * 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, as long as this copyright notice *
- * is included in its original form. *
+ * the Free Software Foundation, either version 2 of the License, or *
+ * (at your option) any later version. *
* *
- * This program is distributed WITHOUT ANY WARRANTY. *
+ * 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
diff --git a/test/boxmodels/1p/1ptestproblem.hh b/test/boxmodels/1p/1ptestproblem.hh
index 8b3587038c8d54c958b548610a5b7973d54e9dea..5afe5cc9eba19ba6371e6b2a029835251027a54d 100644
--- a/test/boxmodels/1p/1ptestproblem.hh
+++ b/test/boxmodels/1p/1ptestproblem.hh
@@ -6,13 +6,18 @@
* University of Stuttgart, Germany *
* email: <givenname>.<name>@iws.uni-stuttgart.de *
* *
- * This program is free software; you can redistribute it and/or modify *
+ * 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, as long as this copyright notice *
- * is included in its original form. *
+ * the Free Software Foundation, either version 2 of the License, or *
+ * (at your option) any later version. *
* *
- * This program is distributed WITHOUT ANY WARRANTY. *
+ * 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
diff --git a/test/boxmodels/1p/1ptestspatialparameters.hh b/test/boxmodels/1p/1ptestspatialparameters.hh
index 0918dcdb733489af3ae010d83bfff0d661792440..918061c4581e596b4e02e8b91df0159741777076 100644
--- a/test/boxmodels/1p/1ptestspatialparameters.hh
+++ b/test/boxmodels/1p/1ptestspatialparameters.hh
@@ -5,13 +5,18 @@
* University of Stuttgart, Germany *
* email: <givenname>.<name>@iws.uni-stuttgart.de *
* *
- * This program is free software; you can redistribute it and/or modify *
+ * 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, as long as this copyright notice *
- * is included in its original form. *
+ * the Free Software Foundation, either version 2 of the License, or *
+ * (at your option) any later version. *
* *
- * This program is distributed WITHOUT ANY WARRANTY. *
+ * 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
diff --git a/test/boxmodels/1p/test_1p.cc b/test/boxmodels/1p/test_1p.cc
index ea2fa62b0b091b65108164012c3b0aacd3ea31b2..01244c92cef401fda120145b7fddd3cc3a97d098 100644
--- a/test/boxmodels/1p/test_1p.cc
+++ b/test/boxmodels/1p/test_1p.cc
@@ -6,13 +6,18 @@
* University of Stuttgart, Germany *
* email: <givenname>.<name>@iws.uni-stuttgart.de *
* *
- * This program is free software; you can redistribute it and/or modify *
+ * 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, as long as this copyright notice *
- * is included in its original form. *
+ * the Free Software Foundation, either version 2 of the License, or *
+ * (at your option) any later version. *
* *
- * This program is distributed WITHOUT ANY WARRANTY. *
+ * 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
diff --git a/test/boxmodels/1p2c/test_1p2c.cc b/test/boxmodels/1p2c/test_1p2c.cc
index a12aef12e877bec4ac323ccca7c52e32ea7cd767..7fed06ab6f99713f9ff8929abaf4be9f7113db1a 100644
--- a/test/boxmodels/1p2c/test_1p2c.cc
+++ b/test/boxmodels/1p2c/test_1p2c.cc
@@ -7,13 +7,18 @@
* University of Stuttgart, Germany *
* email: <givenname>.<name>@iws.uni-stuttgart.de *
* *
- * This program is free software; you can redistribute it and/or modify *
+ * 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, as long as this copyright notice *
- * is included in its original form. *
+ * the Free Software Foundation, either version 2 of the License, or *
+ * (at your option) any later version. *
* *
- * This program is distributed WITHOUT ANY WARRANTY. *
+ * 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
diff --git a/test/boxmodels/1p2c/tissue_tumor_problem.hh b/test/boxmodels/1p2c/tissue_tumor_problem.hh
index 23b773e89371a115aec78bdc19136e0656353487..14b59b445959cfae60294e5de10bf86c9b837a15 100644
--- a/test/boxmodels/1p2c/tissue_tumor_problem.hh
+++ b/test/boxmodels/1p2c/tissue_tumor_problem.hh
@@ -7,13 +7,18 @@
* University of Stuttgart, Germany *
* email: <givenname>.<name>@iws.uni-stuttgart.de *
* *
- * This program is free software; you can redistribute it and/or modify *
+ * 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, as long as this copyright notice *
- * is included in its original form. *
+ * the Free Software Foundation, either version 2 of the License, or *
+ * (at your option) any later version. *
* *
- * This program is distributed WITHOUT ANY WARRANTY. *
+ * 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
diff --git a/test/boxmodels/1p2c/tissue_tumor_spatialparameters.hh b/test/boxmodels/1p2c/tissue_tumor_spatialparameters.hh
index 8cc5de79fe5d27e297377c8d30af0fc304df98ed..7cbb9492bd9f7c32976ef72055fa57d7da8ae0af 100644
--- a/test/boxmodels/1p2c/tissue_tumor_spatialparameters.hh
+++ b/test/boxmodels/1p2c/tissue_tumor_spatialparameters.hh
@@ -6,13 +6,18 @@
* University of Stuttgart, Germany *
* email: <givenname>.<name>@iws.uni-stuttgart.de *
* *
- * This program is free software; you can redistribute it and/or modify *
+ * 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, as long as this copyright notice *
- * is included in its original form. *
+ * the Free Software Foundation, either version 2 of the License, or *
+ * (at your option) any later version. *
* *
- * This program is distributed WITHOUT ANY WARRANTY. *
+ * 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
diff --git a/test/boxmodels/2p/lensproblem.hh b/test/boxmodels/2p/lensproblem.hh
index adc53b9df127838c0bc6dad7be378c8e3e8d6ec4..55e6e546645c0c38d15ae5570dc2ec3877028b96 100644
--- a/test/boxmodels/2p/lensproblem.hh
+++ b/test/boxmodels/2p/lensproblem.hh
@@ -7,13 +7,18 @@
* University of Stuttgart, Germany *
* email: <givenname>.<name>@iws.uni-stuttgart.de *
* *
- * This program is free software; you can redistribute it and/or modify *
+ * 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, as long as this copyright notice *
- * is included in its original form. *
+ * the Free Software Foundation, either version 2 of the License, or *
+ * (at your option) any later version. *
* *
- * This program is distributed WITHOUT ANY WARRANTY. *
+ * 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
diff --git a/test/boxmodels/2p/lensspatialparameters.hh b/test/boxmodels/2p/lensspatialparameters.hh
index 7812b97ea451afa0773c4115848fee9bc0e2c821..03a4013333d12bb583a308ddb7d2e1178ad310c5 100644
--- a/test/boxmodels/2p/lensspatialparameters.hh
+++ b/test/boxmodels/2p/lensspatialparameters.hh
@@ -8,13 +8,18 @@
* University of Stuttgart, Germany *
* email: <givenname>.<name>@iws.uni-stuttgart.de *
* *
- * This program is free software; you can redistribute it and/or modify *
+ * 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, as long as this copyright notice *
- * is included in its original form. *
+ * the Free Software Foundation, either version 2 of the License, or *
+ * (at your option) any later version. *
* *
- * This program is distributed WITHOUT ANY WARRANTY. *
+ * 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
diff --git a/test/boxmodels/2p/test_2p.cc b/test/boxmodels/2p/test_2p.cc
index 622cc76598ecce627822d06336d6c86a028a1274..86c7b85a45e3f9171c737068d19f965cb2061e92 100644
--- a/test/boxmodels/2p/test_2p.cc
+++ b/test/boxmodels/2p/test_2p.cc
@@ -7,13 +7,18 @@
* University of Stuttgart, Germany *
* email: <givenname>.<name>@iws.uni-stuttgart.de *
* *
- * This program is free software; you can redistribute it and/or modify *
+ * 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, as long as this copyright notice *
- * is included in its original form. *
+ * the Free Software Foundation, either version 2 of the License, or *
+ * (at your option) any later version. *
* *
- * This program is distributed WITHOUT ANY WARRANTY. *
+ * 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
diff --git a/test/boxmodels/2p2c/injectionproblem.hh b/test/boxmodels/2p2c/injectionproblem.hh
index c56f53b3cff4304bf4446d45e0f2bc247a887357..2424da524f6f244d0d227a21f582a5b76032d086 100644
--- a/test/boxmodels/2p2c/injectionproblem.hh
+++ b/test/boxmodels/2p2c/injectionproblem.hh
@@ -7,13 +7,18 @@
* University of Stuttgart, Germany *
* email: <givenname>.<name>@iws.uni-stuttgart.de *
* *
- * This program is free software; you can redistribute it and/or modify *
+ * 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, as long as this copyright notice *
- * is included in its original form. *
+ * the Free Software Foundation, either version 2 of the License, or *
+ * (at your option) any later version. *
* *
- * This program is distributed WITHOUT ANY WARRANTY. *
+ * 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
diff --git a/test/boxmodels/2p2c/injectionspatialparameters.hh b/test/boxmodels/2p2c/injectionspatialparameters.hh
index 38ecf667f55d1efda2599370b0b6c61da850b70b..79e7a23c94bdd48fa0230a0c2da9bed508f11b01 100644
--- a/test/boxmodels/2p2c/injectionspatialparameters.hh
+++ b/test/boxmodels/2p2c/injectionspatialparameters.hh
@@ -6,13 +6,18 @@
* University of Stuttgart, Germany *
* email: <givenname>.<name>@iws.uni-stuttgart.de *
* *
- * This program is free software; you can redistribute it and/or modify *
+ * 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, as long as this copyright notice *
- * is included in its original form. *
+ * the Free Software Foundation, either version 2 of the License, or *
+ * (at your option) any later version. *
* *
- * This program is distributed WITHOUT ANY WARRANTY. *
+ * 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
diff --git a/test/boxmodels/2p2c/test_2p2c.cc b/test/boxmodels/2p2c/test_2p2c.cc
index accd725a830c9bce7025b1141b38e701561d20ea..05d1c1ccdd3ad4f1408496b20aba46aa55a8c29f 100644
--- a/test/boxmodels/2p2c/test_2p2c.cc
+++ b/test/boxmodels/2p2c/test_2p2c.cc
@@ -5,13 +5,18 @@
* University of Stuttgart, Germany *
* email: <givenname>.<name>@iws.uni-stuttgart.de *
* *
- * This program is free software; you can redistribute it and/or modify *
+ * 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, as long as this copyright notice *
- * is included in its original form. *
+ * the Free Software Foundation, either version 2 of the License, or *
+ * (at your option) any later version. *
* *
- * This program is distributed WITHOUT ANY WARRANTY. *
+ * 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
diff --git a/test/boxmodels/2p2cni/test_2p2cni.cc b/test/boxmodels/2p2cni/test_2p2cni.cc
index f552fb6c7d35471de886210faa72f5e11a59f863..76b5ffb3e820a112eadf91b69993b7749c086873 100644
--- a/test/boxmodels/2p2cni/test_2p2cni.cc
+++ b/test/boxmodels/2p2cni/test_2p2cni.cc
@@ -8,13 +8,18 @@
* University of Stuttgart, Germany *
* email: <givenname>.<name>@iws.uni-stuttgart.de *
* *
- * This program is free software; you can redistribute it and/or modify *
+ * 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, as long as this copyright notice *
- * is included in its original form. *
+ * the Free Software Foundation, either version 2 of the License, or *
+ * (at your option) any later version. *
* *
- * This program is distributed WITHOUT ANY WARRANTY. *
+ * 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
diff --git a/test/boxmodels/2p2cni/waterairproblem.hh b/test/boxmodels/2p2cni/waterairproblem.hh
index 63f4b2651923323ab930953449f976789ab3a6a4..bd50e90580e0aaed4ebb357321f7c97f156e0887 100644
--- a/test/boxmodels/2p2cni/waterairproblem.hh
+++ b/test/boxmodels/2p2cni/waterairproblem.hh
@@ -6,13 +6,18 @@
* University of Stuttgart, Germany *
* email: <givenname>.<name>@iws.uni-stuttgart.de *
* *
- * This program is free software; you can redistribute it and/or modify *
+ * 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, as long as this copyright notice *
- * is included in its original form. *
+ * the Free Software Foundation, either version 2 of the License, or *
+ * (at your option) any later version. *
* *
- * This program is distributed WITHOUT ANY WARRANTY. *
+ * 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
diff --git a/test/boxmodels/2p2cni/waterairspatialparameters.hh b/test/boxmodels/2p2cni/waterairspatialparameters.hh
index a3d41703132544ad1d11b7e2a1d859be4b9eeb65..b525b1e63902ef477f323752b42f816eabf22833 100644
--- a/test/boxmodels/2p2cni/waterairspatialparameters.hh
+++ b/test/boxmodels/2p2cni/waterairspatialparameters.hh
@@ -6,13 +6,18 @@
* University of Stuttgart, Germany *
* email: <givenname>.<name>@iws.uni-stuttgart.de *
* *
- * This program is free software; you can redistribute it and/or modify *
+ * 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, as long as this copyright notice *
- * is included in its original form. *
+ * the Free Software Foundation, either version 2 of the License, or *
+ * (at your option) any later version. *
* *
- * This program is distributed WITHOUT ANY WARRANTY. *
+ * 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
diff --git a/test/boxmodels/2pni/injectionproblem2pni.hh b/test/boxmodels/2pni/injectionproblem2pni.hh
index c4b2db1d439efd4db23e35f9129487b661bf62cc..82078c813177b55ac58af1a23243bf19d3e3796a 100644
--- a/test/boxmodels/2pni/injectionproblem2pni.hh
+++ b/test/boxmodels/2pni/injectionproblem2pni.hh
@@ -6,13 +6,18 @@
* University of Stuttgart, Germany *
* email: <givenname>.<name>@iws.uni-stuttgart.de *
* *
- * This program is free software; you can redistribute it and/or modify *
+ * 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, as long as this copyright notice *
- * is included in its original form. *
+ * the Free Software Foundation, either version 2 of the License, or *
+ * (at your option) any later version. *
* *
- * This program is distributed WITHOUT ANY WARRANTY. *
+ * 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
diff --git a/test/boxmodels/2pni/test_2pni.cc b/test/boxmodels/2pni/test_2pni.cc
index 1d1d316ad06b4b62b6f659763dbe5ef733136ab1..a1fc1c3651a610e54e10126666fb97c336f5cebe 100644
--- a/test/boxmodels/2pni/test_2pni.cc
+++ b/test/boxmodels/2pni/test_2pni.cc
@@ -7,13 +7,18 @@
* University of Stuttgart, Germany *
* email: <givenname>.<name>@iws.uni-stuttgart.de *
* *
- * This program is free software; you can redistribute it and/or modify *
+ * 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, as long as this copyright notice *
- * is included in its original form. *
+ * the Free Software Foundation, either version 2 of the License, or *
+ * (at your option) any later version. *
* *
- * This program is distributed WITHOUT ANY WARRANTY. *
+ * 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
diff --git a/test/boxmodels/richards/richardslensproblem.hh b/test/boxmodels/richards/richardslensproblem.hh
index 7980fe3ebfd728e48c5d0105e59beaa482dc551b..5a008c23281d375aa460d7878420fb504154ee4f 100644
--- a/test/boxmodels/richards/richardslensproblem.hh
+++ b/test/boxmodels/richards/richardslensproblem.hh
@@ -5,13 +5,18 @@
* University of Stuttgart, Germany *
* email: <givenname>.<name>@iws.uni-stuttgart.de *
* *
- * This program is free software; you can redistribute it and/or modify *
+ * 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, as long as this copyright notice *
- * is included in its original form. *
+ * the Free Software Foundation, either version 2 of the License, or *
+ * (at your option) any later version. *
* *
- * This program is distributed WITHOUT ANY WARRANTY. *
+ * 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
diff --git a/test/boxmodels/richards/richardslensspatialparameters.hh b/test/boxmodels/richards/richardslensspatialparameters.hh
index e672a7517734cdfe8e89c4bdf95fcaf7cad96bbd..4800208213ccc0f54d85345ef64d769b715057fe 100644
--- a/test/boxmodels/richards/richardslensspatialparameters.hh
+++ b/test/boxmodels/richards/richardslensspatialparameters.hh
@@ -8,13 +8,18 @@
* University of Stuttgart, Germany *
* email: <givenname>.<name>@iws.uni-stuttgart.de *
* *
- * This program is free software; you can redistribute it and/or modify *
+ * 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, as long as this copyright notice *
- * is included in its original form. *
+ * the Free Software Foundation, either version 2 of the License, or *
+ * (at your option) any later version. *
* *
- * This program is distributed WITHOUT ANY WARRANTY. *
+ * 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
diff --git a/test/boxmodels/richards/test_richards.cc b/test/boxmodels/richards/test_richards.cc
index 0ccf21c14db10239a59c59f727b00d77d4b29160..974e8c16070b741030f20bc219c0fc47b4a47082 100644
--- a/test/boxmodels/richards/test_richards.cc
+++ b/test/boxmodels/richards/test_richards.cc
@@ -5,13 +5,18 @@
* University of Stuttgart, Germany *
* email: <givenname>.<name>@iws.uni-stuttgart.de *
* *
- * This program is free software; you can redistribute it and/or modify *
+ * 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, as long as this copyright notice *
- * is included in its original form. *
+ * the Free Software Foundation, either version 2 of the License, or *
+ * (at your option) any later version. *
* *
- * This program is distributed WITHOUT ANY WARRANTY. *
+ * 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
diff --git a/test/common/pardiso/test_pardiso.cc b/test/common/pardiso/test_pardiso.cc
index 299915b06f33f9973930159ef2644d4ed9163b74..f9d9e1bf2e897ee7703993e61287ae5186068523 100644
--- a/test/common/pardiso/test_pardiso.cc
+++ b/test/common/pardiso/test_pardiso.cc
@@ -5,13 +5,18 @@
* University of Stuttgart, Germany *
* email: andreas.lauser _at_ iws.uni-stuttgart.de *
* *
- * This program is free software; you can redistribute it and/or modify *
+ * 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, as long as this copyright notice *
- * is included in its original form. *
+ * the Free Software Foundation, either version 2 of the License, or *
+ * (at your option) any later version. *
* *
- * This program is distributed WITHOUT ANY WARRANTY. *
+ * 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
diff --git a/test/common/propertysystem/test_propertysystem.cc b/test/common/propertysystem/test_propertysystem.cc
index ec777b1a8693bf01a1dd6af521686c59d51946cd..a1849769cbf454ee7eeb896d05ef393a5dcd6793 100644
--- a/test/common/propertysystem/test_propertysystem.cc
+++ b/test/common/propertysystem/test_propertysystem.cc
@@ -5,13 +5,18 @@
* University of Stuttgart, Germany *
* email: andreas.lauser _at_ iws.uni-stuttgart.de *
* *
- * This program is free software; you can redistribute it and/or modify *
+ * 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, as long as this copyright notice *
- * is included in its original form. *
+ * the Free Software Foundation, either version 2 of the License, or *
+ * (at your option) any later version. *
* *
- * This program is distributed WITHOUT ANY WARRANTY. *
+ * 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
diff --git a/test/common/spline/test_spline.cc b/test/common/spline/test_spline.cc
index 0383a9c480fc0359ffcaede58b79ec3c062b3c5a..508d865d736ecdcdb13a9e78f742d4fcca7f9a56 100644
--- a/test/common/spline/test_spline.cc
+++ b/test/common/spline/test_spline.cc
@@ -5,13 +5,18 @@
* University of Stuttgart, Germany *
* email: <givenname>.<name>@iws.uni-stuttgart.de *
* *
- * This program is free software; you can redistribute it and/or modify *
+ * 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, as long as this copyright notice *
- * is included in its original form. *
+ * the Free Software Foundation, either version 2 of the License, or *
+ * (at your option) any later version. *
* *
- * This program is distributed WITHOUT ANY WARRANTY. *
+ * 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
diff --git a/test/decoupled/1p/benchmarkresult.hh b/test/decoupled/1p/benchmarkresult.hh
index 36cfccdad100008d84f3c3fac8a970fad690ce91..df5c2b8d4a5bca29b4f83c3666b8dc47d1685f5f 100644
--- a/test/decoupled/1p/benchmarkresult.hh
+++ b/test/decoupled/1p/benchmarkresult.hh
@@ -5,13 +5,18 @@
* University of Stuttgart, Germany *
* email: <givenname>.<name>@iws.uni-stuttgart.de *
* *
-* 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, as long as this copyright notice *
-* is included in its original form. *
-* *
-* This program is distributed WITHOUT ANY WARRANTY. *
+ * 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
diff --git a/test/decoupled/1p/test_1p.cc b/test/decoupled/1p/test_1p.cc
index a7e87af79fde698aa04a5e6c540d9f71b5cf2e9b..91600a0993b8b1f22e665446688391c252295cee 100644
--- a/test/decoupled/1p/test_1p.cc
+++ b/test/decoupled/1p/test_1p.cc
@@ -7,13 +7,18 @@
* University of Stuttgart, Germany *
* email: <givenname>.<name>@iws.uni-stuttgart.de *
* *
- * This program is free software; you can redistribute it and/or modify *
+ * 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, as long as this copyright notice *
- * is included in its original form. *
+ * the Free Software Foundation, either version 2 of the License, or *
+ * (at your option) any later version. *
* *
- * This program is distributed WITHOUT ANY WARRANTY. *
+ * 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
diff --git a/test/decoupled/1p/test_1p_problem.hh b/test/decoupled/1p/test_1p_problem.hh
index 69942ff056bce57065b24d6f96ada0df28eb8241..be314a8ed62534c671956bf9d001513316c22472 100644
--- a/test/decoupled/1p/test_1p_problem.hh
+++ b/test/decoupled/1p/test_1p_problem.hh
@@ -7,13 +7,18 @@
* University of Stuttgart, Germany *
* email: <givenname>.<name>@iws.uni-stuttgart.de *
* *
-* 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, as long as this copyright notice *
-* is included in its original form. *
-* *
-* This program is distributed WITHOUT ANY WARRANTY. *
+ * 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
diff --git a/test/decoupled/1p/test_diffusion.cc b/test/decoupled/1p/test_diffusion.cc
index d557532db2a07e19e279175e616a1f9cc5a96172..3cb5cac9f45eeb2ca3305b757bc3394b7d330e85 100644
--- a/test/decoupled/1p/test_diffusion.cc
+++ b/test/decoupled/1p/test_diffusion.cc
@@ -7,13 +7,18 @@
* University of Stuttgart, Germany *
* email: <givenname>.<name>@iws.uni-stuttgart.de *
* *
- * This program is free software; you can redistribute it and/or modify *
+ * 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, as long as this copyright notice *
- * is included in its original form. *
+ * the Free Software Foundation, either version 2 of the License, or *
+ * (at your option) any later version. *
* *
- * This program is distributed WITHOUT ANY WARRANTY. *
+ * 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
diff --git a/test/decoupled/1p/test_diffusion_problem.hh b/test/decoupled/1p/test_diffusion_problem.hh
index 04a0a4835e6546f9c4c500893a3ff914a9f5d971..0272e9623ad098061287c202b9a0fafa4e84afc0 100644
--- a/test/decoupled/1p/test_diffusion_problem.hh
+++ b/test/decoupled/1p/test_diffusion_problem.hh
@@ -7,13 +7,18 @@
* University of Stuttgart, Germany *
* email: <givenname>.<name>@iws.uni-stuttgart.de *
* *
-* 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, as long as this copyright notice *
-* is included in its original form. *
-* *
-* This program is distributed WITHOUT ANY WARRANTY. *
+ * 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
diff --git a/test/decoupled/1p/test_diffusion_spatialparams.hh b/test/decoupled/1p/test_diffusion_spatialparams.hh
index bba645c1174b5483ccf01f56950aaa40766d5565..50cc38496689338d44bde2743e500011698719c7 100644
--- a/test/decoupled/1p/test_diffusion_spatialparams.hh
+++ b/test/decoupled/1p/test_diffusion_spatialparams.hh
@@ -5,13 +5,18 @@
* University of Stuttgart, Germany *
* email: <givenname>.<name>@iws.uni-stuttgart.de *
* *
- * This program is free software; you can redistribute it and/or modify *
+ * 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, as long as this copyright notice *
- * is included in its original form. *
+ * the Free Software Foundation, either version 2 of the License, or *
+ * (at your option) any later version. *
* *
- * This program is distributed WITHOUT ANY WARRANTY. *
+ * 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
diff --git a/test/decoupled/2p/test_impes.cc b/test/decoupled/2p/test_impes.cc
index d180413dd62faac028637e584cd905c3da28eb88..e925d269c42115ca53369e61bcc7bb6575c21e89 100644
--- a/test/decoupled/2p/test_impes.cc
+++ b/test/decoupled/2p/test_impes.cc
@@ -7,13 +7,18 @@
* University of Stuttgart, Germany *
* email: <givenname>.<name>@iws.uni-stuttgart.de *
* *
- * This program is free software; you can redistribute it and/or modify *
+ * 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, as long as this copyright notice *
- * is included in its original form. *
+ * the Free Software Foundation, either version 2 of the License, or *
+ * (at your option) any later version. *
* *
- * This program is distributed WITHOUT ANY WARRANTY. *
+ * 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
diff --git a/test/decoupled/2p/test_impes_problem.hh b/test/decoupled/2p/test_impes_problem.hh
index e67c926f11539c2a0479fa9a18cec8dfcd9dbe29..f0b334c87d9876606280070695582f40e1a4d93a 100644
--- a/test/decoupled/2p/test_impes_problem.hh
+++ b/test/decoupled/2p/test_impes_problem.hh
@@ -7,13 +7,18 @@
* University of Stuttgart, Germany *
* email: <givenname>.<name>@iws.uni-stuttgart.de *
* *
- * This program is free software; you can redistribute it and/or modify *
+ * 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, as long as this copyright notice *
- * is included in its original form. *
+ * the Free Software Foundation, either version 2 of the License, or *
+ * (at your option) any later version. *
* *
- * This program is distributed WITHOUT ANY WARRANTY. *
+ * 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
diff --git a/test/decoupled/2p/test_impes_spatialparams.hh b/test/decoupled/2p/test_impes_spatialparams.hh
index 02548691ade578044d20650636accd51221bac3e..d6d9e4b544b4cc73adc995cdf5222922a9781121 100644
--- a/test/decoupled/2p/test_impes_spatialparams.hh
+++ b/test/decoupled/2p/test_impes_spatialparams.hh
@@ -5,13 +5,18 @@
* University of Stuttgart, Germany *
* email: <givenname>.<name>@iws.uni-stuttgart.de *
* *
- * This program is free software; you can redistribute it and/or modify *
+ * 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, as long as this copyright notice *
- * is included in its original form. *
+ * the Free Software Foundation, either version 2 of the License, or *
+ * (at your option) any later version. *
* *
- * This program is distributed WITHOUT ANY WARRANTY. *
+ * 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
diff --git a/test/decoupled/2p/test_transport.cc b/test/decoupled/2p/test_transport.cc
index 0c3c824021091d6d9fee2d4da96b99d36ed3ec05..7c147a5a99bba54b23771d10d23bb5a2b8efc632 100644
--- a/test/decoupled/2p/test_transport.cc
+++ b/test/decoupled/2p/test_transport.cc
@@ -7,13 +7,18 @@
* University of Stuttgart, Germany *
* email: <givenname>.<name>@iws.uni-stuttgart.de *
* *
- * This program is free software; you can redistribute it and/or modify *
+ * 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, as long as this copyright notice *
- * is included in its original form. *
+ * the Free Software Foundation, either version 2 of the License, or *
+ * (at your option) any later version. *
* *
- * This program is distributed WITHOUT ANY WARRANTY. *
+ * 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
diff --git a/test/decoupled/2p/test_transport_problem.hh b/test/decoupled/2p/test_transport_problem.hh
index a011e789194b4ef24387f830485db7f5b39143cc..8695f6efd8556dce6176beb83a6cbaa9e83553ac 100644
--- a/test/decoupled/2p/test_transport_problem.hh
+++ b/test/decoupled/2p/test_transport_problem.hh
@@ -7,13 +7,18 @@
* University of Stuttgart, Germany *
* email: <givenname>.<name>@iws.uni-stuttgart.de *
* *
- * This program is free software; you can redistribute it and/or modify *
+ * 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, as long as this copyright notice *
- * is included in its original form. *
+ * the Free Software Foundation, either version 2 of the License, or *
+ * (at your option) any later version. *
* *
- * This program is distributed WITHOUT ANY WARRANTY. *
+ * 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
diff --git a/test/decoupled/2p/test_transport_spatialparams.hh b/test/decoupled/2p/test_transport_spatialparams.hh
index 2f788409da45037dc1ece580da513a3e551cd51c..c2d944d46a1f39ea8e5b2bfc113a7e1c12b83c21 100644
--- a/test/decoupled/2p/test_transport_spatialparams.hh
+++ b/test/decoupled/2p/test_transport_spatialparams.hh
@@ -5,13 +5,18 @@
* University of Stuttgart, Germany *
* email: <givenname>.<name>@iws.uni-stuttgart.de *
* *
- * This program is free software; you can redistribute it and/or modify *
+ * 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, as long as this copyright notice *
- * is included in its original form. *
+ * the Free Software Foundation, either version 2 of the License, or *
+ * (at your option) any later version. *
* *
- * This program is distributed WITHOUT ANY WARRANTY. *
+ * 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
diff --git a/test/decoupled/2p2c/test_dec2p2c.cc b/test/decoupled/2p2c/test_dec2p2c.cc
index 7924bb725a402357e8a0a2542f5d78ef66e61579..c3dfc2412fb588b79b5e79b61249e398242b8641 100644
--- a/test/decoupled/2p2c/test_dec2p2c.cc
+++ b/test/decoupled/2p2c/test_dec2p2c.cc
@@ -7,13 +7,18 @@
* University of Stuttgart, Germany *
* email: <givenname>.<name>@iws.uni-stuttgart.de *
* *
- * This program is free software; you can redistribute it and/or modify *
+ * 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, as long as this copyright notice *
- * is included in its original form. *
+ * the Free Software Foundation, either version 2 of the License, or *
+ * (at your option) any later version. *
* *
- * This program is distributed WITHOUT ANY WARRANTY. *
+ * 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
diff --git a/test/decoupled/2p2c/test_dec2p2c_spatialparams.hh b/test/decoupled/2p2c/test_dec2p2c_spatialparams.hh
index a13b767192a09828abff4b8c218fec317a6561f4..7289c4eb747560c07e124d783a6f77237b3471c9 100644
--- a/test/decoupled/2p2c/test_dec2p2c_spatialparams.hh
+++ b/test/decoupled/2p2c/test_dec2p2c_spatialparams.hh
@@ -5,13 +5,18 @@
* University of Stuttgart, Germany *
* email: <givenname>.<name>@iws.uni-stuttgart.de *
* *
- * This program is free software; you can redistribute it and/or modify *
+ * 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, as long as this copyright notice *
- * is included in its original form. *
+ * the Free Software Foundation, either version 2 of the License, or *
+ * (at your option) any later version. *
* *
- * This program is distributed WITHOUT ANY WARRANTY. *
+ * 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
diff --git a/test/decoupled/2p2c/test_dec2p2cproblem.hh b/test/decoupled/2p2c/test_dec2p2cproblem.hh
index 96c2faf7a0a2914d11532efb77b8a093545a9281..a45c5f11209458108a9c8ebf4f9c7cc6a4ab7ced 100644
--- a/test/decoupled/2p2c/test_dec2p2cproblem.hh
+++ b/test/decoupled/2p2c/test_dec2p2cproblem.hh
@@ -7,13 +7,18 @@
* University of Stuttgart, Germany *
* email: <givenname>.<name>@iws.uni-stuttgart.de *
* *
- * This program is free software; you can redistribute it and/or modify *
+ * 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, as long as this copyright notice *
- * is included in its original form. *
+ * the Free Software Foundation, either version 2 of the License, or *
+ * (at your option) any later version. *
* *
- * This program is distributed WITHOUT ANY WARRANTY. *
+ * 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
diff --git a/test/decoupled/2p2c/test_multiphysics2p2c.cc b/test/decoupled/2p2c/test_multiphysics2p2c.cc
index 2a3e9444b7311984172459a4e2671e14bd4c4329..b1e5144dd435b6a33a1e255055a18fe3c727f448 100644
--- a/test/decoupled/2p2c/test_multiphysics2p2c.cc
+++ b/test/decoupled/2p2c/test_multiphysics2p2c.cc
@@ -7,13 +7,18 @@
* University of Stuttgart, Germany *
* email: <givenname>.<name>@iws.uni-stuttgart.de *
* *
- * This program is free software; you can redistribute it and/or modify *
+ * 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, as long as this copyright notice *
- * is included in its original form. *
+ * the Free Software Foundation, either version 2 of the License, or *
+ * (at your option) any later version. *
* *
- * This program is distributed WITHOUT ANY WARRANTY. *
+ * 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
diff --git a/test/decoupled/2p2c/test_multiphysics2p2cproblem.hh b/test/decoupled/2p2c/test_multiphysics2p2cproblem.hh
index 177e7052a32476e8429ffcba13b7ce1b9ceb8bce..607d276869352c9da934ad830c918e92b371d5d8 100644
--- a/test/decoupled/2p2c/test_multiphysics2p2cproblem.hh
+++ b/test/decoupled/2p2c/test_multiphysics2p2cproblem.hh
@@ -7,13 +7,18 @@
* University of Stuttgart, Germany *
* email: <givenname>.<name>@iws.uni-stuttgart.de *
* *
- * This program is free software; you can redistribute it and/or modify *
+ * 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, as long as this copyright notice *
- * is included in its original form. *
+ * the Free Software Foundation, either version 2 of the License, or *
+ * (at your option) any later version. *
* *
- * This program is distributed WITHOUT ANY WARRANTY. *
+ * 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
diff --git a/test/material/tabulation/test_tabulation.cc b/test/material/tabulation/test_tabulation.cc
index 56ba0b78519b5c7488f22bff9d6cd5a7014bcfec..61bb842dc82195aec73b6208e23af6e5f27522da 100644
--- a/test/material/tabulation/test_tabulation.cc
+++ b/test/material/tabulation/test_tabulation.cc
@@ -5,13 +5,18 @@
* University of Stuttgart, Germany *
* email: <givenname>.<name>@iws.uni-stuttgart.de *
* *
- * This program is free software; you can redistribute it and/or modify *
+ * 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, as long as this copyright notice *
- * is included in its original form. *
+ * the Free Software Foundation, either version 2 of the License, or *
+ * (at your option) any later version. *
* *
- * This program is distributed WITHOUT ANY WARRANTY. *
+ * 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
diff --git a/tutorial/tutorial_coupled.cc b/tutorial/tutorial_coupled.cc
index 5a847e74252ba859e746a6429751ee9ad3be58f6..e26763fa7f47ce270752a2485be90eda41919f5c 100644
--- a/tutorial/tutorial_coupled.cc
+++ b/tutorial/tutorial_coupled.cc
@@ -7,13 +7,18 @@
* University of Stuttgart, Germany *
* email: <givenname>.<name>@iws.uni-stuttgart.de *
* *
- * This program is free software; you can redistribute it and/or modify *
+ * 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, as long as this copyright notice *
- * is included in its original form. *
+ * the Free Software Foundation, either version 2 of the License, or *
+ * (at your option) any later version. *
* *
- * This program is distributed WITHOUT ANY WARRANTY. *
+ * 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
diff --git a/tutorial/tutorial_decoupled.cc b/tutorial/tutorial_decoupled.cc
index fa40d17bbe2d664939dbb0947e2ae6615b7033f1..fbfbf744be6c494b992d60600d084263e10d0c23 100644
--- a/tutorial/tutorial_decoupled.cc
+++ b/tutorial/tutorial_decoupled.cc
@@ -7,13 +7,18 @@
* University of Stuttgart, Germany *
* email: <givenname>.<name>@iws.uni-stuttgart.de *
* *
- * This program is free software; you can redistribute it and/or modify *
+ * 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, as long as this copyright notice *
- * is included in its original form. *
+ * the Free Software Foundation, either version 2 of the License, or *
+ * (at your option) any later version. *
* *
- * This program is distributed WITHOUT ANY WARRANTY. *
+ * 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
diff --git a/tutorial/tutorialproblem_coupled.hh b/tutorial/tutorialproblem_coupled.hh
index 1bb98cc3f45c3980290091eec10dc306c854ebf5..202759b1299689cde82567b7df0c84bc9a78d593 100644
--- a/tutorial/tutorialproblem_coupled.hh
+++ b/tutorial/tutorialproblem_coupled.hh
@@ -6,13 +6,18 @@
* University of Stuttgart, Germany *
* email: <givenname>.<name>@iws.uni-stuttgart.de *
* *
- * This program is free software; you can redistribute it and/or modify *
+ * 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, as long as this copyright notice *
- * is included in its original form. *
+ * the Free Software Foundation, either version 2 of the License, or *
+ * (at your option) any later version. *
* *
- * This program is distributed WITHOUT ANY WARRANTY. *
+ * 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
diff --git a/tutorial/tutorialproblem_decoupled.hh b/tutorial/tutorialproblem_decoupled.hh
index 3c77df509da25cf9174c9321d7de9d3e7451c729..55585b623216901f08d8d520bb53d64405fe341c 100644
--- a/tutorial/tutorialproblem_decoupled.hh
+++ b/tutorial/tutorialproblem_decoupled.hh
@@ -7,13 +7,18 @@
* University of Stuttgart, Germany *
* email: <givenname>.<name>@iws.uni-stuttgart.de *
* *
-* 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, as long as this copyright notice *
-* is included in its original form. *
-* *
-* This program is distributed WITHOUT ANY WARRANTY. *
+ * 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
diff --git a/tutorial/tutorialspatialparameters_coupled.hh b/tutorial/tutorialspatialparameters_coupled.hh
index 2c8dd227a2df876714a9c83872d4ac1996cec373..8ad60dcaf3f5f15c9d0125ce55384109447c1cda 100644
--- a/tutorial/tutorialspatialparameters_coupled.hh
+++ b/tutorial/tutorialspatialparameters_coupled.hh
@@ -5,13 +5,18 @@
* University of Stuttgart, Germany *
* email: <givenname>.<name>@iws.uni-stuttgart.de *
* *
- * This program is free software; you can redistribute it and/or modify *
+ * 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, as long as this copyright notice *
- * is included in its original form. *
+ * the Free Software Foundation, either version 2 of the License, or *
+ * (at your option) any later version. *
* *
- * This program is distributed WITHOUT ANY WARRANTY. *
+ * 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
diff --git a/tutorial/tutorialspatialparameters_decoupled.hh b/tutorial/tutorialspatialparameters_decoupled.hh
index bc021ae22ed5ab6cb290f12f15170e2bdf6051cc..da1490b02d466c8cfbf55ceaefd8ca076b742af8 100644
--- a/tutorial/tutorialspatialparameters_decoupled.hh
+++ b/tutorial/tutorialspatialparameters_decoupled.hh
@@ -5,13 +5,18 @@
* University of Stuttgart, Germany *
* email: <givenname>.<name>@iws.uni-stuttgart.de *
* *
- * This program is free software; you can redistribute it and/or modify *
+ * 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, as long as this copyright notice *
- * is included in its original form. *
+ * the Free Software Foundation, either version 2 of the License, or *
+ * (at your option) any later version. *
* *
- * This program is distributed WITHOUT ANY WARRANTY. *
+ * 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