From 3d6cd925ff35c780e7e09f792070286a0e205ec6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Sch=C3=A4fer?= <schafjan@fjfi.cvut.cz>
Date: Sun, 12 Nov 2017 22:54:14 +0100
Subject: [PATCH] pokracovani v smoothheaviside
---
src/TNL/Functions/TestFunction_impl.h | 4 ++--
src/TNL/Operators/Analytic/SmoothHeaviside.h | 12 +++++++++++-
2 files changed, 13 insertions(+), 3 deletions(-)
diff --git a/src/TNL/Functions/TestFunction_impl.h b/src/TNL/Functions/TestFunction_impl.h
index 545129c135..8df8f71919 100644
--- a/src/TNL/Functions/TestFunction_impl.h
+++ b/src/TNL/Functions/TestFunction_impl.h
@@ -336,9 +336,9 @@ setup( const Config::ParameterContainer& parameters,
if( testFunction == "smooth-heaviside-of-vector-norm" )
{
typedef VectorNorm< Dimension, Real > FunctionType;
- typedef SmoothHeaviside< Dimension, Real > OperatorType;
+ typedef SmoothHeaviside< FunctionType > OperatorType;
functionType = vectorNorm;
- operatorType = SmoothHeaviside;
+ operatorType = smoothHeaviside;
return ( setupFunction< FunctionType >( parameters, prefix + "vector-norm-" ) &&
setupOperator< OperatorType >( parameters, prefix + "smooth-heaviside-" ) );
}
diff --git a/src/TNL/Operators/Analytic/SmoothHeaviside.h b/src/TNL/Operators/Analytic/SmoothHeaviside.h
index 060057bff7..489d7852ae 100644
--- a/src/TNL/Operators/Analytic/SmoothHeaviside.h
+++ b/src/TNL/Operators/Analytic/SmoothHeaviside.h
@@ -32,8 +32,18 @@ class SmoothHeaviside : public Functions::Domain< Function::getDomainDimenions()
SmoothHeaviside()
: sharpness( 1.0 ){}
+ static void configSetup( Config::ConfigDescription& config,
+ const String& prefix = "" )
+ {
+ config.addEntry< double >( prefix + "sharpness", "Outer multiplicator of the Heaviside operator - -1.0 turns the function graph upside/down.", 1.0 );
+ }
+
bool setup( const Config::ParameterContainer& parameters,
- const String& prefix = "" ){};
+ const String& prefix = "" )
+ {
+ this->sharpness = parameters.getParameter< double >( prefix + "sharpness" );
+ return true;
+ }
void setSharpness( const RealType& sharpness )
--
GitLab