fix typo in subtract word

lutraconsulting · Apr 17, 2019 · f262c88 · f262c88
1 parent e8c6ab8
commit f262c88
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/mdal/frmts/mdal_xdmf.cpp b/mdal/frmts/mdal_xdmf.cpp
@@ -152,8 +152,8 @@ size_t MDAL::XdmfFunctionDataset::scalarData( size_t indexStart, size_t count, d
   assert( group()->isScalar() ); //checked in C API interface
   assert( mType != FunctionType::Join );
 
-  if ( mType == FunctionType::Substract )
-    return substractFunction( indexStart, count, buffer );
+  if ( mType == FunctionType::Subtract )
+    return subtractFunction( indexStart, count, buffer );
 
   if ( mType == FunctionType::Flow )
     return flowFunction( indexStart, count, buffer );
@@ -176,7 +176,7 @@ size_t MDAL::XdmfFunctionDataset::activeData( size_t indexStart, size_t count, i
   return count;
 }
 
-size_t MDAL::XdmfFunctionDataset::substractFunction( size_t indexStart, size_t count, double *buffer )
+size_t MDAL::XdmfFunctionDataset::subtractFunction( size_t indexStart, size_t count, double *buffer )
 {
   std::vector<double> buf( 2 * count, std::numeric_limits<double>::quiet_NaN() );
   size_t copyVals = extractRawData( indexStart, count, 2, buf );
@@ -487,11 +487,11 @@ MDAL::DatasetGroups MDAL::DriverXdmf::parseXdmfXml( )
         else if ( function == "$0-$1" )
         {
           reversed = true;
-          type = XdmfFunctionDataset::Substract;
+          type = XdmfFunctionDataset::Subtract;
         }
         else if ( function == "$1-$0" )
         {
-          type = XdmfFunctionDataset::Substract;
+          type = XdmfFunctionDataset::Subtract;
         }
         else if ( ( function == "JOIN($0,$1,0*$1)" ) || ( function == "JOIN($0,$1,0)" ) )
         {

diff --git a/mdal/frmts/mdal_xdmf.hpp b/mdal/frmts/mdal_xdmf.hpp
@@ -86,7 +86,7 @@ namespace MDAL
    * Currently we do not use any fancy bison/flex based
    * expression parsing, just supporting few types of
    * most common function types:
-   *   - substraction (A-B)
+   *   - subtraction (A-B)
    *   - join ( [A, B] vector)
    *   - magnitude
    *
@@ -105,7 +105,7 @@ namespace MDAL
       enum FunctionType
       {
         Join = 1, //!< vector: [$0, $1] from 2 scalars
-        Substract, //!< scalar: $1 - $0, e.g. calculate relative depth
+        Subtract, //!< scalar: $1 - $0, e.g. calculate relative depth
         Flow, //!< scalar: flow velocity (abs) = sqrt($0/($2-$3)*$0/($2-$3) + $1/($2-$3)*$1/($2-$3))
       };
 
@@ -126,7 +126,7 @@ namespace MDAL
       size_t activeData( size_t indexStart, size_t count, int *buffer ) override;
 
     private:
-      size_t substractFunction( size_t indexStart, size_t count, double *buffer );
+      size_t subtractFunction( size_t indexStart, size_t count, double *buffer );
       size_t flowFunction( size_t indexStart, size_t count, double *buffer );
       size_t joinFunction( size_t indexStart, size_t count, double *buffer );
       size_t extractRawData( size_t indexStart, size_t count, size_t nDatasets, std::vector<double> &buf );