Passed Options and Functions classes to common package.

impls/common/Options.hpp

+/*
+
+Copyright (c) 2013 Centre for Water Systems,
+                   University of Exeter
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+
+*/
+
+#ifndef _CA_OPTIONS_HPP_
+#define _CA_OPTIONS_HPP_
+
+//! \file Options.hpp 
+//! Contains the list of implementation specific Options
+//! \author Michele  Guidolin, University of Exeter, 
+//! contact: m.guidolin [at] exeter.ac.uk 
+//! \date 2012-07
+
+
+#include"Common.hpp"
+
+
+namespace CA {
+
+
+  //! Return a list of implementation specific Options  
+  inline Options options()
+  {
+    return Options();
+  }
+
+}
+
+#endif// _CA_BASETYPES_HPP_

impls/hexagonal-cell/1-levels/simple/Functions.hpp

 /*
 
-Copyright (c) 2013 Centre for Water Systems,
-                   University of Exeter
+Copyright (c) 2016 EAWAG - Swiss Federal Institute of Water Science
+                           and Technology
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -23,11 +23,13 @@ THE SOFTWARE.
 
 */
 
-//! \file ca.hpp 
-//! Contains the classes and methods to make CA functions.
-//! \author Michele Guidolin, University of Exeter, 
-//! contact: m.guidolin [at] exeter.ac.uk 
-//! \date 2011-07
 
-// This class is the same of the simple implementation
-#include"../simple/Functions.hpp"
+
+//! \file Functions.hpp
+//! \author Luís de Sousa, EAWAG,
+//! contact: luis.desousa [at] eawag.ch
+//! \date 2016-03
+
+
+#include"../../../common/Functions.hpp"
+

impls/hexagonal-cell/1-levels/simple/Options.hpp

 /*
 
-Copyright (c) 2016 Centre for Water Systems,
-                   University of Exeter
+Copyright (c) 2016 EAWAG - Swiss Federal Institute of Water Science
+                           and Technology
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -27,10 +27,10 @@ THE SOFTWARE.
 
 //! \file Options.hpp 
 //! Contains the list of implementation specific Options
-//! \author Mike  Gibson, University of Exeter, 
-//! contact: m.gibson [at] exeter.ac.uk 
-//! \date 2016-01
+//! \author Luís de Sousa, EAWAG,
+//! contact: luis.desousa [at] eawag.ch
+//! \date 2016-03
 
 
-#include"../../../square-cell/vn-neighbours/1-levels/simple/Options.hpp"
+#include"../../../common/Options.hpp"
 

impls/square-cell/vn-neighbours/1-levels/openmp/Functions.hpp

 /*
 
-Copyright (c) 2013 Centre for Water Systems,
-                   University of Exeter
+Copyright (c) 2016 EAWAG - Swiss Federal Institute of Water Science
+                           and Technology
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -23,11 +23,13 @@ THE SOFTWARE.
 
 */
 
+#ifndef _CA_FUNCTIONS_HPP_
+#define _CA_FUNCTIONS_HPP_
+
 //! \file ca.hpp 
 //! Contains the classes and methods to make CA functions.
-//! \author Michele Guidolin, University of Exeter, 
-//! contact: m.guidolin [at] exeter.ac.uk 
-//! \date 2011-07
+//! \author Luís de Sousa, EAWAG,
+//! contact: luis.desousa [at] eawag.ch
+//! \date 2016-03
 
-// This class is the same of the simple implementation
-#include"../simple/Functions.hpp"
+#include"../../../common/Functions.hpp"

impls/square-cell/vn-neighbours/1-levels/openmp/Options.hpp

 /*
 
-Copyright (c) 2013 Centre for Water Systems,
-                   University of Exeter
+Copyright (c) 2016 EAWAG - Swiss Federal Institute of Water Science
+                           and Technology
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -28,23 +28,8 @@ THE SOFTWARE.
 
 //! \file Options.hpp 
 //! Contains the list of implementation specific Options
-//! \author Michele  Guidolin, University of Exeter, 
-//! contact: m.guidolin [at] exeter.ac.uk 
-//! \date 2012-07
+//! \author Luís de Sousa, EAWAG,
+//! contact: luis.desousa [at] eawag.ch
+//! \date 2016-03
 
-
-#include"Common.hpp"
-
-
-namespace CA {
-
-
-  //! Return a list of implementation specific Options  
-  inline Options options()
-  {
-    return Options();
-  }
-
-}
-
-#endif// _CA_BASETYPES_HPP_
+#include"../../../common/Options.hpp"

impls/square-cell/vn-neighbours/1-levels/simple/Options.hpp

 /*
 
-Copyright (c) 2013 Centre for Water Systems,
-                   University of Exeter
+Copyright (c) 2016 EAWAG - Swiss Federal Institute of Water Science
+                           and Technology
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -28,23 +28,8 @@ THE SOFTWARE.
 
 //! \file Options.hpp 
 //! Contains the list of implementation specific Options
-//! \author Michele  Guidolin, University of Exeter, 
-//! contact: m.guidolin [at] exeter.ac.uk 
-//! \date 2012-07
+//! \author Luís de Sousa, EAWAG,
+//! contact: luis.desousa [at] eawag.ch
+//! \date 2016-03
 
-
-#include"Common.hpp"
-
-
-namespace CA {
-
-
-  //! Return a list of implementation specific Options  
-  inline Options options()
-  {
-    return Options();
-  }
-
-}
-
-#endif// _CA_BASETYPES_HPP_
+#include"../../../common/Options.hpp"