Changeset 1076 for XIOS/trunk/src/transformation
- Timestamp:
- 03/16/17 15:04:53 (7 years ago)
- Location:
- XIOS/trunk/src/transformation
- Files:
-
- 21 edited
Legend:
- Unmodified
- Added
- Removed
-
XIOS/trunk/src/transformation/Functions/average_reduction.cpp
r1043 r1076 30 30 const double* dataInput, 31 31 CArray<double,1>& dataOut, 32 std::vector<bool>& flagInitial, 33 const double& defaultValue)32 std::vector<bool>& flagInitial, 33 bool ignoreMissingValue) 34 34 { 35 if (resetWeight_) { weights_.resize(flagInitial.size()); weights_ = 1.0; resetWeight_ = false; } 36 bool hasMissingValue = NumTraits<double>::isnan(defaultValue); 35 if (resetWeight_) { weights_.resize(flagInitial.size()); weights_ = 1.0; resetWeight_ = false; } 37 36 38 if ( hasMissingValue)37 if (ignoreMissingValue) 39 38 { 40 39 int nbLocalIndex = localIndex.size(); -
XIOS/trunk/src/transformation/Functions/average_reduction.hpp
r1018 r1076 26 26 const double* dataInput, 27 27 CArray<double,1>& dataOut, 28 std::vector<bool>& flagInitial, 29 const double& defaultValue);28 std::vector<bool>& flagInitial, 29 bool ignoreMissingValue); 30 30 31 31 virtual void updateData(CArray<double,1>& dataOut); -
XIOS/trunk/src/transformation/Functions/extract.cpp
r1018 r1076 30 30 CArray<double,1>& dataOut, 31 31 std::vector<bool>& flagInitial, 32 const double& defaultValue)32 bool ignoreMissingValue) 33 33 { 34 34 int nbLocalIndex = localIndex.size(); -
XIOS/trunk/src/transformation/Functions/extract.hpp
r1018 r1076 27 27 CArray<double,1>& dataOut, 28 28 std::vector<bool>& flagInitial, 29 const double& defaultValue);29 bool ignoreMissingValue); 30 30 31 31 virtual ~CExtractReductionAlgorithm() {} -
XIOS/trunk/src/transformation/Functions/max_reduction.cpp
r1043 r1076 31 31 CArray<double,1>& dataOut, 32 32 std::vector<bool>& flagInitial, 33 const double& defaultValue) 34 { 35 bool hasMissingValue = NumTraits<double>::isnan(defaultValue); 36 37 if (hasMissingValue) 33 bool ignoreMissingValue) 34 { 35 if (ignoreMissingValue) 38 36 { 39 37 int nbLocalIndex = localIndex.size(); -
XIOS/trunk/src/transformation/Functions/max_reduction.hpp
r1018 r1076 27 27 CArray<double,1>& dataOut, 28 28 std::vector<bool>& flagInitial, 29 const double& defaultValue);29 bool ignoreMissingValue); 30 30 31 31 virtual ~CMaxReductionAlgorithm() {} -
XIOS/trunk/src/transformation/Functions/min_reduction.cpp
r1043 r1076 31 31 CArray<double,1>& dataOut, 32 32 std::vector<bool>& flagInitial, 33 const double& defaultValue)33 bool ignoreMissingValue) 34 34 { 35 bool hasMissingValue = NumTraits<double>::isnan(defaultValue); 36 37 if (hasMissingValue) 35 if (ignoreMissingValue) 38 36 { 39 37 int nbLocalIndex = localIndex.size(); -
XIOS/trunk/src/transformation/Functions/min_reduction.hpp
r1018 r1076 26 26 const double* dataInput, 27 27 CArray<double,1>& dataOut, 28 std::vector<bool>& flagInitial, 29 const double& defaultValue);28 std::vector<bool>& flagInitial, 29 bool ignoreMissingValue); 30 30 31 31 virtual ~CMinReductionAlgorithm() {} -
XIOS/trunk/src/transformation/Functions/reduction.hpp
r1018 r1076 45 45 const double* dataInput, 46 46 CArray<double,1>& dataOut, 47 std::vector<bool>& flagInitial, 48 const double& defaultValue) = 0;47 std::vector<bool>& flagInitial, 48 bool ignoreMissingValue) = 0; 49 49 /*! 50 50 Update local data -
XIOS/trunk/src/transformation/Functions/sum_reduction.cpp
r1043 r1076 31 31 CArray<double,1>& dataOut, 32 32 std::vector<bool>& flagInitial, 33 const double& defaultValue)33 bool ignoreMissingValue) 34 34 { 35 bool hasMissingValue = NumTraits<double>::isnan(defaultValue); 36 37 if (hasMissingValue) 35 if (ignoreMissingValue) 38 36 { 39 37 int nbLocalIndex = localIndex.size(); -
XIOS/trunk/src/transformation/Functions/sum_reduction.hpp
r1018 r1076 27 27 CArray<double,1>& dataOut, 28 28 std::vector<bool>& flagInitial, 29 const double& defaultValue);29 bool ignoreMissingValue); 30 30 31 31 virtual ~CSumReductionAlgorithm() {} -
XIOS/trunk/src/transformation/axis_algorithm_extract_domain.cpp
r1018 r1076 68 68 const double* dataInput, 69 69 CArray<double,1>& dataOut, 70 std::vector<bool>& flagInitial, 71 const double& defaultValue)70 std::vector<bool>& flagInitial, 71 bool ignoreMissingValue) 72 72 { 73 reduction_->apply(localIndex, dataInput, dataOut, flagInitial, defaultValue);73 reduction_->apply(localIndex, dataInput, dataOut, flagInitial, ignoreMissingValue); 74 74 } 75 75 -
XIOS/trunk/src/transformation/axis_algorithm_extract_domain.hpp
r933 r1076 33 33 const double* dataInput, 34 34 CArray<double,1>& dataOut, 35 std::vector<bool>& flagInitial, 36 const double& defaultValue);35 std::vector<bool>& flagInitial, 36 bool ignoreMissingValue); 37 37 38 38 virtual ~CAxisAlgorithmExtractDomain(); -
XIOS/trunk/src/transformation/axis_algorithm_reduce_domain.cpp
r1018 r1076 76 76 const double* dataInput, 77 77 CArray<double,1>& dataOut, 78 std::vector<bool>& flagInitial, 79 const double& defaultValue)78 std::vector<bool>& flagInitial, 79 bool ignoreMissingValue) 80 80 { 81 reduction_->apply(localIndex, dataInput, dataOut, flagInitial, defaultValue);81 reduction_->apply(localIndex, dataInput, dataOut, flagInitial, ignoreMissingValue); 82 82 } 83 83 -
XIOS/trunk/src/transformation/axis_algorithm_reduce_domain.hpp
r979 r1076 32 32 const double* dataInput, 33 33 CArray<double,1>& dataOut, 34 std::vector<bool>& flagInitial, 35 const double& defaultValue);34 std::vector<bool>& flagInitial, 35 bool ignoreMissingValue); 36 36 37 37 virtual void updateData(CArray<double,1>& dataOut); -
XIOS/trunk/src/transformation/generic_algorithm_transformation.cpp
r1018 r1076 30 30 CArray<double,1>& dataOut, 31 31 std::vector<bool>& flagInitial, 32 const double& defaultValue)33 { 34 int nbLocalIndex = localIndex.size(); 35 bool hasMissingValue = NumTraits<double>::isnan(defaultValue);36 if ( hasMissingValue)32 bool ignoreMissingValue) 33 { 34 int nbLocalIndex = localIndex.size(); 35 double defaultValue = std::numeric_limits<double>::quiet_NaN(); 36 if (ignoreMissingValue) 37 37 { 38 38 for (int idx = 0; idx < nbLocalIndex; ++idx) -
XIOS/trunk/src/transformation/generic_algorithm_transformation.hpp
r979 r1076 63 63 \param [in/out] dataOut Array contains local data 64 64 \param [in/out] flagInitial vector of boolean to mark the local index already initialized. True means there is a need for initalization 65 \param [in] ignoreMissingValue don't count missing value in operation if this flag is true 65 66 */ 66 67 virtual void apply(const std::vector<std::pair<int,double> >& localIndex, 67 68 const double* dataInput, 68 69 CArray<double,1>& dataOut, 69 std::vector<bool>& flagInitial, 70 const double& defaultValue);70 std::vector<bool>& flagInitial, 71 bool ignoreMissingValue); 71 72 72 73 /*! -
XIOS/trunk/src/transformation/scalar_algorithm_extract_axis.cpp
r1018 r1076 55 55 const double* dataInput, 56 56 CArray<double,1>& dataOut, 57 std::vector<bool>& flagInitial, 58 const double& defaultValue)57 std::vector<bool>& flagInitial, 58 bool ignoreMissingValue) 59 59 { 60 reduction_->apply(localIndex, dataInput, dataOut, flagInitial, defaultValue);60 reduction_->apply(localIndex, dataInput, dataOut, flagInitial, ignoreMissingValue); 61 61 } 62 62 -
XIOS/trunk/src/transformation/scalar_algorithm_extract_axis.hpp
r980 r1076 32 32 const double* dataInput, 33 33 CArray<double,1>& dataOut, 34 std::vector<bool>& flagInitial, 35 const double& defaultValue);34 std::vector<bool>& flagInitial, 35 bool ignoreMissingValue); 36 36 37 37 virtual ~CScalarAlgorithmExtractAxis(); -
XIOS/trunk/src/transformation/scalar_algorithm_reduce_domain.cpp
r1018 r1076 81 81 const double* dataInput, 82 82 CArray<double,1>& dataOut, 83 std::vector<bool>& flagInitial, 84 const double& defaultValue)83 std::vector<bool>& flagInitial, 84 bool ignoreMissingValue) 85 85 { 86 reduction_->apply(localIndex, dataInput, dataOut, flagInitial, defaultValue);86 reduction_->apply(localIndex, dataInput, dataOut, flagInitial, ignoreMissingValue); 87 87 } 88 88 -
XIOS/trunk/src/transformation/scalar_algorithm_reduce_domain.hpp
r979 r1076 32 32 const double* dataInput, 33 33 CArray<double,1>& dataOut, 34 std::vector<bool>& flagInitial, 35 const double& defaultValue);34 std::vector<bool>& flagInitial, 35 bool ignoreMissingValue); 36 36 37 37 virtual void updateData(CArray<double,1>& dataOut);
Note: See TracChangeset
for help on using the changeset viewer.