less include in headers

modules/shallowWater/dgConservationLawShallowWater2d.h

@@ -4,7 +4,6 @@
 #include "functionGeneric.h"
 #include "function.h"
 #include "dgDofContainer.h"
-#include "slimMovingBathWettingDrying.h"
 
 void roeSolver(double uL, double uR, double vL, double vR, double HL, double HR,
                double &uStar, double &vStar, double &HStar, double &AStar, double g,
@@ -95,8 +94,7 @@ class dgConservationLawShallowWater2d : public dgConservationLawFunction {
   /**set the function to evaluate the wind induced surface stress term \f{eqnarray*}\frac{du}{dt} &=& s(0)\\ \frac{dv}{dt} &=& s(1)\f} */
   inline void setWindStress(const functor *windStress) { _windStress = windStress;}
   /**set the function to evaluate the bathymetry h (H = h+eta) */
-  inline void setBathymetry(functor *bathymetry) { _bathymetry= bathymetry; }
-  inline void setBathymetryConst(const functor *bathymetry) { _bathymetry= bathymetry; }
+  inline void setBathymetry(const functor *bathymetry) { _bathymetry= bathymetry; }
   /**set the function to evaluate the gradient of the bathymetry: grad(h) */
   inline void setBathymetryGradient(functor *bathymetryGradient) { _bathymetryGradient = bathymetryGradient;}
   /**set the function to evaluate the diffusion term */

modules/shallowWater/dgConservationLawShallowWaterTracer2d.cpp

@@ -8,6 +8,7 @@
 #include <string.h>
 #include <algorithm>
 #include "functorMember.h"
+#include "slimMovingBathWettingDrying.h"
 
 
 //*************************************

modules/slim3d/slim3dEquations.cpp

+#include "dgConservationLawShallowWater2d.h"
 #include "slim3dEquations.h"
 #include "slim3dSolver.h"
 #include "functionGeneric.h"
@@ -964,7 +965,7 @@ void slim3dSolverEquations::initialize()
 
   sw2DEq->setLaxFriedrichs(true);
   sw2DEq->setFrom3D(true);
-  sw2DEq->setBathymetryConst(bathCGMin2d);
+  sw2DEq->setBathymetry(bathCGMin2d);
   sw2DEq->setSource(uvCorr2d);
   sw2DEq->setRhoSurf(rhoSurf2d);
   sw2DEq->setRhoSurfGrad(rhoSurfGrad2d);

modules/slim3d/slim3dEquations.h

@@ -12,10 +12,10 @@
 #include "dgMesh2MeshProjection.h"
 #include "dgEddyTransportFlux.h"
 #include "dgLimiter.h"
-#include "dgConservationLawShallowWater2d.h"
 
 class dgSW3dVerticalModel;
 class dgSW3dTurbulenceGOTM;
+class dgConservationLawShallowWater2d;
 
 class slim3dSolver;
 /** A class that contains all the functions needed by the 3d shallow water equations solver. *

modules/slim3d/slim3dTimeIntegrator.cpp

@@ -6,6 +6,7 @@
 #include "dgSW3dTurbulenceGOTM.h"
 #include "functionGeneric.h"
 #include "dgTimer.h"
+#include "dgConservationLawShallowWater2d.h"
 
 class slim3dTimeIntegrator::tracerDeviationChecker {
   dgDofContainer* _dof;