using water content instead of saturation

dune/dorie/interface/coupled_simulation.hh

@@ -15,7 +15,7 @@ private:
   using TransportSimulationTraits = Dune::Dorie::TransportSimulationTraits<
                     BaseTraits,
                     typename RichardsSimulationTraits::GFWaterFluxReconstruction,
-                    typename RichardsSimulationTraits::GFSaturation
+                    typename RichardsSimulationTraits::GFWaterContent
                   >;
 public:
   using RichardsSimulation = Dune::Dorie::RichardsSimulation<RichardsSimulationTraits>;
@@ -40,7 +40,7 @@ private:
   using TransportSimulationTraits = typename TransportSimulation::Traits;
 
   using GridMapper = typename Traits::GridMapper;
-  using GFSaturationPtr = std::shared_ptr<typename RichardsSimulationTraits::GFSaturation>;
+  using GFSaturationPtr = std::shared_ptr<typename RichardsSimulationTraits::GFWaterContent>;
   using GFWaterFluxPtr = std::shared_ptr<typename RichardsSimulationTraits::GFWaterFluxReconstruction>;
   using TimeField = typename Traits::TimeField;
   using TimeInterval = typename Traits::TimeInterval;

dune/dorie/interface/richards_simulation.hh

@@ -353,11 +353,11 @@ public:
 	 */
 	void virtual write_data() const override;
 
-	std::shared_ptr<GFSaturation> get_saturation()
+	std::shared_ptr<GFWaterContent> get_saturation()
 	{
 		update_adapters();
-		assert(satdgf);
-		return satdgf;
+		assert(waterdgf);
+		return waterdgf;
 	}
 
 	std::shared_ptr<GFWaterFluxReconstruction> get_waterflux()