Salome HOME
projects
/
modules
/
hydro.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
debug of tests for DTM
[modules/hydro.git]
/
src
/
HYDROData
/
HYDROData_LinearInterpolator.cxx
diff --git
a/src/HYDROData/HYDROData_LinearInterpolator.cxx
b/src/HYDROData/HYDROData_LinearInterpolator.cxx
index fedb3f12b8b9066f03c68817876060a042fa9167..aea863d188b14afb8b845cee2a97b1018660e788 100644
(file)
--- a/
src/HYDROData/HYDROData_LinearInterpolator.cxx
+++ b/
src/HYDROData/HYDROData_LinearInterpolator.cxx
@@
-1,8
+1,4
@@
-// Copyright (C) 2007-2015 CEA/DEN, EDF R&D, OPEN CASCADE
-//
-// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
-//
+// Copyright (C) 2014-2015 EDF-R&D
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public
// License as published by the Free Software Foundation; either
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public
// License as published by the Free Software Foundation; either
@@
-21,7
+17,8
@@
//
#include "HYDROData_LinearInterpolator.h"
//
#include "HYDROData_LinearInterpolator.h"
-
+#include <cstdlib>
+#include <cmath>
HYDROData_LinearInterpolator::HYDROData_LinearInterpolator()
{
HYDROData_LinearInterpolator::HYDROData_LinearInterpolator()
{
@@
-31,9
+28,9
@@
HYDROData_LinearInterpolator::~HYDROData_LinearInterpolator()
{
}
{
}
-
std::s
tring HYDROData_LinearInterpolator::GetDescription() const
+
TCollection_AsciiS
tring HYDROData_LinearInterpolator::GetDescription() const
{
{
-
std::s
tring aDescription( "Simple linear interpolator" );
+
TCollection_AsciiS
tring aDescription( "Simple linear interpolator" );
return aDescription;
}
return aDescription;
}
@@
-44,8
+41,8
@@
void HYDROData_LinearInterpolator::Calculate()
ClearResults();
// Check input data
ClearResults();
// Check input data
- std::vector<double> aProfile1 = GetFirstProfile();
- std::vector<double> aProfile2 = GetSecondProfile();
+ std::vector<double> aProfile1 = GetFirstProfile
Coords
();
+ std::vector<double> aProfile2 = GetSecondProfile
Coords
();
int aNbProfilesToCompute = GetNbProfilesToCompute();
int aSize1 = aProfile1.size();
int aNbProfilesToCompute = GetNbProfilesToCompute();
int aSize1 = aProfile1.size();
@@
-107,4
+104,4
@@
void HYDROData_LinearInterpolator::Calculate()
}
SetErrorCode( aStatus );
}
SetErrorCode( aStatus );
-}
\ No newline at end of file
+}