Skip to content
Snippets Groups Projects
Commit bc4b892b authored by wenqing's avatar wenqing
Browse files

[Mat] Removed some keyword documentations and fixed a compilation error

for xcode
parent 4b4755be
No related branches found
No related tags found
No related merge requests found
/*! /**
\file createViscosityModel.cpp * \brief A function for creating viscosity model
*
\copyright * \copyright
Copyright (c) 2012-2016, OpenGeoSys Community (http://www.opengeosys.org) * Copyright (c) 2012-2016, OpenGeoSys Community (http://www.opengeosys.org)
Distributed under a Modified BSD License. * Distributed under a Modified BSD License.
See accompanying file LICENSE.txt or * See accompanying file LICENSE.txt or
http://www.opengeosys.org/project/license * http://www.opengeosys.org/project/license
*/ *
* \file createViscosityModel.cpp
*
*/
#include "createViscosityModel.h" #include "createViscosityModel.h"
...@@ -21,11 +24,11 @@ namespace MaterialLib ...@@ -21,11 +24,11 @@ namespace MaterialLib
{ {
namespace Fluid namespace Fluid
{ {
/*! /**
\param config ConfigTree object which contains the input data * \param config ConfigTree object which contains the input data
including <type>fluid</type> and it has * including <type>fluid</type> and it has
a tag of <viscosity> * a tag of <viscosity>
*/ */
static std::unique_ptr<FluidProperty> createLinearPressureDependentViscosity( static std::unique_ptr<FluidProperty> createLinearPressureDependentViscosity(
BaseLib::ConfigTree const& config) BaseLib::ConfigTree const& config)
{ {
...@@ -40,11 +43,11 @@ static std::unique_ptr<FluidProperty> createLinearPressureDependentViscosity( ...@@ -40,11 +43,11 @@ static std::unique_ptr<FluidProperty> createLinearPressureDependentViscosity(
new LinearPressureDependentViscosity(parameters)); new LinearPressureDependentViscosity(parameters));
} }
/*! /**
\param config ConfigTree object which contains the input data * \param config ConfigTree object which contains the input data
including <type>fluid</type> and it has * including <type>fluid</type> and it has
a tag of <viscosity> * a tag of <viscosity>
*/ */
static std::unique_ptr<FluidProperty> createTemperatureDependentViscosity( static std::unique_ptr<FluidProperty> createTemperatureDependentViscosity(
BaseLib::ConfigTree const& config) BaseLib::ConfigTree const& config)
{ {
...@@ -69,19 +72,15 @@ std::unique_ptr<FluidProperty> createViscosityModel( ...@@ -69,19 +72,15 @@ std::unique_ptr<FluidProperty> createViscosityModel(
return std::unique_ptr<FluidProperty>(new ConstantFluidProperty( return std::unique_ptr<FluidProperty>(new ConstantFluidProperty(
//! \ogs_file_param{material__fluid__viscosity__Constant__value} //! \ogs_file_param{material__fluid__viscosity__Constant__value}
config.getConfigParameter<double>("value"))); config.getConfigParameter<double>("value")));
//! \ogs_file_param{material__fluid__viscosity__LinearPressure}
else if (type == "LinearPressure") else if (type == "LinearPressure")
return createLinearPressureDependentViscosity(config); return createLinearPressureDependentViscosity(config);
//! \ogs_file_param{material__fluid__viscosity__TemperatureDependent}
else if (type == "TemperatureDependent") else if (type == "TemperatureDependent")
return createTemperatureDependentViscosity(config); return createTemperatureDependentViscosity(config);
//! \ogs_file_param{material__fluid__viscosity__Vogels}
else if (type == "Vogels") else if (type == "Vogels")
{ {
auto const fluid_type = auto const fluid_type =
//! \ogs_file_param{material__fluid__viscosity__Vogels__fluid_type} //! \ogs_file_param{material__fluid__viscosity__Vogels__fluid_type}
config.getConfigParameter<std::string>("liquid_type"); config.getConfigParameter<std::string>("liquid_type");
//! \ogs_file_param{material__fluid__viscosity__Vogels__Water}
if (fluid_type == "Water") if (fluid_type == "Water")
{ {
const VogelsViscosityConstantsWater constants; const VogelsViscosityConstantsWater constants;
...@@ -89,7 +88,6 @@ std::unique_ptr<FluidProperty> createViscosityModel( ...@@ -89,7 +88,6 @@ std::unique_ptr<FluidProperty> createViscosityModel(
new VogelsLiquidDynamicViscosity<VogelsViscosityConstantsWater>( new VogelsLiquidDynamicViscosity<VogelsViscosityConstantsWater>(
constants)); constants));
} }
//! \ogs_file_param{material__fluid__viscosity__Vogels__CO2}
else if (fluid_type == "CO2") else if (fluid_type == "CO2")
{ {
const VogelsViscosityConstantsCO2 constants; const VogelsViscosityConstantsCO2 constants;
...@@ -97,7 +95,6 @@ std::unique_ptr<FluidProperty> createViscosityModel( ...@@ -97,7 +95,6 @@ std::unique_ptr<FluidProperty> createViscosityModel(
new VogelsLiquidDynamicViscosity<VogelsViscosityConstantsCO2>( new VogelsLiquidDynamicViscosity<VogelsViscosityConstantsCO2>(
constants)); constants));
} }
//! \ogs_file_param{material__fluid__viscosity__Vogels__CH4}
else if (fluid_type == "CH4") else if (fluid_type == "CH4")
{ {
const VogelsViscosityConstantsCH4 constants; const VogelsViscosityConstantsCH4 constants;
......
/*! /**
\file createViscosityModel.h * \brief A function for creating viscosity model
*
* \copyright
* Copyright (c) 2012-2016, OpenGeoSys Community (http://www.opengeosys.org)
* Distributed under a Modified BSD License.
* See accompanying file LICENSE.txt or
* http://www.opengeosys.org/project/license
*
* \file createViscosityModel.h
*
*/
\copyright
Copyright (c) 2012-2016, OpenGeoSys Community (http://www.opengeosys.org)
Distributed under a Modified BSD License.
See accompanying file LICENSE.txt or
http://www.opengeosys.org/project/license
*/
#ifndef CREATE_VISCOSITY_MODEL_H_ #ifndef CREATE_VISCOSITY_MODEL_H_
#define CREATE_VISCOSITY_MODEL_H_ #define CREATE_VISCOSITY_MODEL_H_
......
/*! /**
\file TestFluidViscosity.cpp * \brief Test viscosity models
\brief Test classes for fluid viscosity models. *
* \copyright
* Copyright (c) 2012-2016, OpenGeoSys Community (http://www.opengeosys.org)
* Distributed under a Modified BSD License.
* See accompanying file LICENSE.txt or
* http://www.opengeosys.org/project/license
*
* \file TestFluidViscosity.cpp
*
*/
\copyright
Copyright (c) 2012-2015, OpenGeoSys Community (http://www.opengeosys.org)
Distributed under a Modified BSD License.
See accompanying file LICENSE.txt or
http://www.opengeosys.org/project/license
*/
#include <gtest/gtest.h> #include <gtest/gtest.h>
#include <memory> #include <memory>
#include <cmath>
#include "TestTools.h" #include "TestTools.h"
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment