diff --git a/CMakeLists.txt b/CMakeLists.txt index a929b731f..d0b116b5b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -166,11 +166,7 @@ if(ENABLE_ECL_INPUT) examples/test_util/EGrid.cpp examples/test_util/ERft.cpp examples/test_util/ERst.cpp - examples/test_util/ESmry.cpp - examples/test_util/summaryComparator.cpp - examples/test_util/summaryIntegrationTest.cpp - examples/test_util/summaryRegressionTest.cpp) - target_link_libraries(testutil ecl) + examples/test_util/ESmry.cpp) foreach(target compareECL convertECL) add_executable(${target} examples/test_util/${target}.cpp) target_link_libraries(${target} testutil opmcommon) @@ -180,8 +176,8 @@ if(ENABLE_ECL_INPUT) # Add the tests set(_libs testutil opmcommon ${Boost_UNIT_TEST_FRAMEWORK_LIBRARY}) - foreach(test test_compareSummary test_EclFilesComparator test_EclIO - test_EclRegressionTest test_EGrid test_ERft test_ERst test_ESmry) + foreach(test test_EclFilesComparator test_EclIO test_EclRegressionTest + test_EGrid test_ERft test_ERst test_ESmry) opm_add_test(${test} CONDITION ENABLE_ECL_INPUT LIBRARIES ${_libs} WORKING_DIRECTORY ${PROJECT_BINARY_DIR}/tests) diff --git a/examples/test_util/summaryComparator.cpp b/examples/test_util/summaryComparator.cpp deleted file mode 100644 index 531ce3293..000000000 --- a/examples/test_util/summaryComparator.cpp +++ /dev/null @@ -1,240 +0,0 @@ -/* - Copyright 2016 Statoil ASA. - This file is part of the Open Porous Media project (OPM). - - OPM is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - OPM is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with OPM. If not, see . - */ - -#include "summaryComparator.hpp" -#include -#include -#include -#include -#include -#include -#include - -SummaryComparator::SummaryComparator(const std::string& basename1, - const std::string& basename2, - double absoluteTol, double relativeTol){ - ecl_sum1 = ecl_sum_fread_alloc_case(basename1.c_str(), ":"); - ecl_sum2 = ecl_sum_fread_alloc_case(basename2.c_str(), ":"); - if (ecl_sum1 == nullptr || ecl_sum2 == nullptr) { - OPM_THROW(std::runtime_error, "Not able to open files"); - } - absoluteTolerance = absoluteTol; - relativeTolerance = relativeTol; - keys1 = stringlist_alloc_new(); - keys2 = stringlist_alloc_new(); - ecl_sum_select_matching_general_var_list( ecl_sum1 , "*" , this->keys1); - stringlist_sort(this->keys1 , nullptr ); - ecl_sum_select_matching_general_var_list( ecl_sum2 , "*" , this->keys2); - stringlist_sort(this->keys2 , nullptr ); - - if(stringlist_get_size(keys1) <= stringlist_get_size(keys2)){ - this->keysShort = this->keys1; - this->keysLong = this->keys2; - }else{ - this->keysShort = this->keys2; - this->keysLong = this->keys1; - } -} - - -SummaryComparator::~SummaryComparator(){ - ecl_sum_free(ecl_sum1); - ecl_sum_free(ecl_sum2); - stringlist_free(keys1); - stringlist_free(keys2); -} - - -Deviation SummaryComparator::calculateDeviations(double val1, double val2){ - double absDev; - Deviation deviation; - absDev = std::abs(val1 - val2); - deviation.abs = absDev; - if (val1 != 0 || val2 != 0) { - deviation.rel = absDev/double(std::max(std::abs(val1), std::abs(val2))); - } - return deviation; -} - - -void SummaryComparator::setTimeVecs(std::vector &timeVec1, - std::vector &timeVec2){ - timeVec1.reserve(ecl_sum_get_data_length(ecl_sum1)); - for (int time_index = 0; time_index < ecl_sum_get_data_length(ecl_sum1); time_index++){ - timeVec1.push_back(ecl_sum_iget_sim_days(ecl_sum1 , time_index )); - } - timeVec2.reserve(ecl_sum_get_data_length(ecl_sum2)); - for (int time_index = 0; time_index < ecl_sum_get_data_length(ecl_sum2); time_index++){ - timeVec2.push_back(ecl_sum_iget_sim_days(ecl_sum2 , time_index )); - } -} - - -void SummaryComparator::getDataVecs(std::vector &dataVec1, - std::vector &dataVec2, - const char* keyword){ - dataVec1.reserve(ecl_sum_get_data_length(ecl_sum1)); - for (int time_index = 0; time_index < ecl_sum_get_data_length(ecl_sum1); time_index++){ - dataVec1.push_back(ecl_sum_iget(ecl_sum1, time_index, ecl_sum_get_general_var_params_index( ecl_sum1 , keyword ))); - } - dataVec2.reserve(ecl_sum_get_data_length(ecl_sum2)); - for (int time_index = 0; time_index < ecl_sum_get_data_length(ecl_sum2); time_index++){ - - dataVec2.push_back(ecl_sum_iget(ecl_sum2, time_index, ecl_sum_get_general_var_params_index( ecl_sum2 , keyword ))); - } -} - - -void SummaryComparator::setDataSets(const std::vector& timeVec1, - const std::vector& timeVec2){ - if(timeVec1.size() < timeVec2.size()){ - ecl_sum_fileShort = this->ecl_sum1; - ecl_sum_fileLong = this->ecl_sum2; - } - else{ - ecl_sum_fileShort = this->ecl_sum2; - ecl_sum_fileLong = this->ecl_sum1; - } -} - - -void SummaryComparator::chooseReference(const std::vector& timeVec1, - const std::vector& timeVec2, - const std::vector& dataVec1, - const std::vector& dataVec2){ - if(timeVec1.size() <= timeVec2.size()){ - referenceVec = &timeVec1; // time vector - referenceDataVec = &dataVec1; //data vector - checkVec = &timeVec2; - checkDataVec = &dataVec2; - } - else{ - referenceVec = &timeVec2; - referenceDataVec = &dataVec2; - checkVec = &timeVec1; - checkDataVec = &dataVec1; - } -} - - -void SummaryComparator::getDeviation(size_t refIndex, size_t &checkIndex, Deviation &dev){ - if((*referenceVec)[refIndex] == (*checkVec)[checkIndex]){ - dev = SummaryComparator::calculateDeviations((*referenceDataVec)[refIndex], (*checkDataVec)[checkIndex]); - checkIndex++; - return; - } - else if((*referenceVec)[refIndex]<(*checkVec)[checkIndex]){ - double value = SummaryComparator::unitStep((*checkDataVec)[checkIndex]); - /*Must be a little careful here. Flow writes out old value first, - than changes value. Say there should be a change in production rate from A to B at timestep 300. - Then the data of time step 300 is A and the next timestep will have value B. Must use the upper limit. */ - dev = SummaryComparator::calculateDeviations((*referenceDataVec)[refIndex], value); - checkIndex++; - return; - } - else{ - checkIndex++; - getDeviation(refIndex, checkIndex , dev); - } - if(checkIndex == checkVec->size() -1 ){ - return; - } -} - - -void SummaryComparator::printUnits(){ - std::vector timeVec1, timeVec2; - setTimeVecs(timeVec1, timeVec2); // Sets the time vectors, they are equal for all keywords (WPOR:PROD01 etc) - setDataSets(timeVec1, timeVec2); - for (int jvar = 0; jvar < stringlist_get_size(keysLong); jvar++){ - std::cout << stringlist_iget(keysLong, jvar) << " unit: " << ecl_sum_get_unit(ecl_sum_fileShort, stringlist_iget(keysLong, jvar)) << std::endl; - } -} - - -//Called only when the keywords are equal in the getDeviations()-function -const char* SummaryComparator::getUnit(const char* keyword){ - return ecl_sum_get_unit(ecl_sum_fileShort, keyword); -} - - -void SummaryComparator::printKeywords(){ - int ivar = 0; - std::vector noMatchString; - std::cout << "Keywords that are common for the files:" << std::endl; - while(ivar < stringlist_get_size(keysLong)){ - const char* keyword = stringlist_iget(keysLong, ivar); - if (stringlist_contains(keysLong, keyword) && stringlist_contains(keysShort, keyword)){ - std::cout << keyword << std::endl; - ivar++; - } - else{ - noMatchString.push_back(keyword); - ivar++; - } - } - if(noMatchString.size() == 0){ - std::cout << "No keywords were different" << std::endl; - return; - } - std::cout << "Keywords that are different: " << std::endl; - for (const auto& it : noMatchString) std::cout << it << std::endl; - - std::cout << "\nOf the " << stringlist_get_size(keysLong) << " keywords " << stringlist_get_size(keysLong)-noMatchString.size() << " were equal and " << noMatchString.size() << " were different" << std::endl; -} - - -void SummaryComparator::printDataOfSpecificKeyword(const std::vector& timeVec1, - const std::vector& timeVec2, - const char* keyword){ - std::vector dataVec1, dataVec2; - - getDataVecs(dataVec1,dataVec2,keyword); - chooseReference(timeVec1, timeVec2,dataVec1,dataVec2); - size_t ivar = 0; - size_t jvar = 0; - const char separator = ' '; - const int numWidth = 14; - std::cout << std::left << std::setw(numWidth) << std::setfill(separator) << "Time"; - std::cout << std::left << std::setw(numWidth) << std::setfill(separator) << "Ref data"; - std::cout << std::left << std::setw(numWidth) << std::setfill(separator) << "Check data" << std::endl; - - while(ivar < referenceVec->size()){ - if(ivar == referenceVec->size() || jvar == checkVec->size() ){ - break; - } - if((*referenceVec)[ivar] == (*checkVec)[jvar]){ - std::cout << std::left << std::setw(numWidth) << std::setfill(separator) << (*referenceVec)[ivar]; - std::cout << std::left << std::setw(numWidth) << std::setfill(separator) << (*referenceDataVec)[ivar]; - std::cout << std::left << std::setw(numWidth) << std::setfill(separator) << (*checkDataVec)[jvar] << std::endl; - ivar++; - jvar++; - }else if((*referenceVec)[ivar] < (*checkVec)[jvar]){ - std::cout << std::left << std::setw(numWidth) << std::setfill(separator) << (*referenceVec)[ivar]; - std::cout << std::left << std::setw(numWidth) << std::setfill(separator) << (*referenceDataVec)[ivar]; - std::cout << std::left << std::setw(numWidth) << std::setfill(separator) << "" << std::endl; - ivar++; - } - else{ - std::cout << std::left << std::setw(numWidth) << std::setfill(separator) << (*checkVec)[jvar]; - std::cout << std::left << std::setw(numWidth) << std::setfill(separator) << ""; - std::cout << std::left << std::setw(numWidth) << std::setfill(separator) << (*checkDataVec)[jvar] << std::endl; - jvar++; - } - } -} diff --git a/examples/test_util/summaryComparator.hpp b/examples/test_util/summaryComparator.hpp deleted file mode 100644 index 4446e98c5..000000000 --- a/examples/test_util/summaryComparator.hpp +++ /dev/null @@ -1,182 +0,0 @@ -/* - Copyright 2016 Statoil ASA. - - This file is part of the Open Porous Media project (OPM). - - OPM is free software: you can redistribute it and/or modify it under - the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - OPM is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with OPM. If not, see . - */ - -#ifndef SUMMARYCOMPARATOR_HPP -#define SUMMARYCOMPARATOR_HPP - -#include "Deviation.hpp" -#include -#include -#include -#include -#include -#include - - -// helper macro to handle error throws or not -#define HANDLE_ERROR(type, message) \ - { \ - if (throwOnError) \ - OPM_THROW(type, message); \ - else \ - std::cerr << message << std::endl; \ - } - - -//! \brief Prototyping struct, encapsuling the stringlist libraries. -struct stringlist_struct; -typedef struct stringlist_struct stringlist_type; - -//! \brief Prototyping struct, encapsuling the ert libraries. -struct ecl_sum_struct; -typedef struct ecl_sum_struct ecl_sum_type; - - -class SummaryComparator { - private: - double absoluteTolerance = 0; //!< The maximum absolute deviation that is allowed between two values. - double relativeTolerance = 0; //!< The maximum relative deviation that is allowed between twi values. - protected: - ecl_sum_type * ecl_sum1 = nullptr; //!< Struct that contains file1 - ecl_sum_type * ecl_sum2 = nullptr; //!< Struct that contains file2 - ecl_sum_type * ecl_sum_fileShort = nullptr; //!< For keeping track of the file with most/fewest timesteps - ecl_sum_type * ecl_sum_fileLong = nullptr; //!< For keeping track of the file with most/fewest timesteps - stringlist_type* keys1 = nullptr; //!< For storing all the keywords of file1 - stringlist_type* keys2 = nullptr; //!< For storing all the keywords of file2 - stringlist_type * keysShort = nullptr; //!< For keeping track of the file with most/fewest keywords - stringlist_type * keysLong = nullptr; //!< For keeping track of the file with most/fewest keywords - const std::vector * referenceVec = nullptr; //!< For storing the values of each time step for the file containing the fewer time steps. - const std::vector * referenceDataVec = nullptr; //!< For storing the data corresponding to each time step for the file containing the fewer time steps. - const std::vector * checkVec = nullptr; //!< For storing the values of each time step for the file containing the more time steps. - const std::vector * checkDataVec = nullptr; //!< For storing the data values corresponding to each time step for the file containing the more time steps. - bool printKeyword = false; //!< Boolean value for choosing whether to print the keywords or not - bool printSpecificKeyword = false; //!< Boolean value for choosing whether to print the vectors of a keyword or not - bool throwOnError = true; //!< Throw on first error - bool analysis = false; //!< Perform error analysis - std::map> deviations; - - //! \brief Calculate deviation between two data values and stores it in a Deviation struct. - //! \param[in] refIndex Index in reference data - //! \param[in] checkindex Index in data to be checked. - //! \param[out] dev Holds the result from the comparison on return. - //! \details Uses the #referenceVec as basis, and checks its values against the values in #checkDataVec. The function is reccursive, and will update the iterative index j of the #checkVec until #checkVec[j] >= #referenceVec[i]. \n When #referenceVec and #checkVec have the same time value (i.e. #referenceVec[i] == #checkVec[j]) a direct comparison is used, \n when this is not the case, when #referenceVec[i] do not excist as an element in #checkVec, a value is generated, either by the principle of unit step or by interpolation. - void getDeviation(size_t refIndex, size_t &checkIndex, Deviation &dev); - - //! \brief Figure out which data file contains the most / less timesteps and assign member variable pointers accordingly. - //! \param[in] timeVec1 Data from first file - //! \param[in] timeVec2 Data from second file - //! \details Figure out which data file that contains the more/fewer time steps and assigns the private member variable pointers #ecl_sum_fileShort / #ecl_sum_fileLong to the correct data sets #ecl_sum1 / #ecl_sum2. - void setDataSets(const std::vector& timeVec1, - const std::vector& timeVec2); - - //! \brief Reads in the time values of each time step. - //! \param[in] timeVec1 Vector for storing the time steps from file1 - //! \param[in] timeVec2 Vector for storing the time steps from file2 - void setTimeVecs(std::vector &timeVec1,std::vector &timeVec2); - - //! \brief Read the data for one specific keyword into two separate vectors. - //! \param[in] dataVec1 Vector for storing the data for one specific keyword from file1 - //! \param[in] dataVec2 Vector for storing the data for one specific keyword from file2 - //! \details The two data files do not necessarily have the same amount of data values, but the values must correspond to the same interval in time. Thus possible to interpolate values. - void getDataVecs(std::vector &dataVec1, - std::vector &dataVec2, const char* keyword); - - //! \brief Sets one data set as a basis and the other as values to check against. - //! \param[in] timeVec1 Used to figure out which dataset that have the more/fewer time steps. - //! \param[in] timeVec2 Used to figure out which dataset that have the more/fewer time steps. - //! \param[in] dataVec1 For assiging the the correct pointer to the data vector. - //! \param[in] dataVec2 For assiging the the correct pointer to the data vector. - //! \details Figures out which time vector that contains the fewer elements. Sets this as #referenceVec and its corresponding data as #referenceDataVec. \n The remaining data set is set as #checkVec (the time vector) and #checkDataVec. - void chooseReference(const std::vector &timeVec1, - const std::vector &timeVec2, - const std::vector &dataVec1, - const std::vector &dataVec2); - - //! \brief Returns the relative tolerance. - double getRelTolerance(){return this->relativeTolerance;} - - //! \brief Returns the absolute tolerance. - double getAbsTolerance(){return this->absoluteTolerance;} - - //! \brief Returns the unit of the values of a keyword - //! \param[in] keyword The keyword of interest. - //! \param[out] ret The unit of the keyword as a const char*. - const char* getUnit(const char* keyword); - - //! \brief Prints the units of the files. - void printUnits(); - - //! \brief Prints the keywords of the files. - //! \details The function prints first the common keywords, than the keywords that are different. - void printKeywords(); - - //! \brief Prints the summary vectors from the two files. - //! \details The function requires that the summary vectors of the specific file have been read into the member variables referenceVec etc. - void printDataOfSpecificKeyword(const std::vector& timeVec1, - const std::vector& timeVec2, - const char* keyword); - - public: - //! \brief Creates an SummaryComparator class object - //! \param[in] basename1 Path to file1 without extension. - //! \param[in] basename1 Path to file2 without extension. - //! \param[in] absoluteTolerance The absolute tolerance which is to be used in the test. - //! \param[in] relativeTolerance The relative tolerance which is to be used in the test. - //! \details The constructor creates an object of the class, and openes the files, an exception is thrown if the opening of the files fails. \n It creates stringlists, in which keywords are to be stored, and figures out which keylist that contains the more/less keywords. \n Also the private member variables aboluteTolerance and relativeTolerance are set. - SummaryComparator(const std::string& basename1, - const std::string& basename2, - double absoluteTolerance, double relativeTolerance); - - //! \brief Destructor - //! \details The destructor takes care of the allocated memory in which data has been stored. - ~SummaryComparator(); - - //! \brief Calculates the deviation between two values - //! \param[in] val1 The first value of interest. - //! \param[in] val2 The second value if interest. - //! \param[out] ret Returns a Deviation struct. - //! \details The function takes two values, calculates the absolute and relative deviation and returns the result as a Deviation struct. - static Deviation calculateDeviations( double val1, double val2); - - //! \brief Sets the private member variable printKeywords - //! \param[in] boolean Boolean value - //! \details The function sets the private member variable printKeywords. When it is true the function printKeywords will be called. - void setPrintKeywords(bool boolean){this->printKeyword = boolean;} - - //! \brief Sets the private member variable printSpecificKeyword - //! \param[in] boolean Boolean value - //! \details The function sets the private member variable printSpecificKeyword. When true, the summary vector of the keyword for both files will be printed. - void setPrintSpecificKeyword(bool boolean){this->printSpecificKeyword = boolean;} - - //! \brief Unit step function - //! \param[in] value The input value should be the last know value - //! \param[out] ret Return the unit-step-function value. - //! \details In this case: The unit step function is used when the data from the two data set, which is to be compared, don't match in time. \n The unit step function is then to be called on the #checkDataVec 's value at the last time step which is before the time of comparison. - - //! \brief Returns a value based on the unit step principle. - static double unitStep(double value){return value;} - - //! \brief Set whether to throw on errors or not. - void throwOnErrors(bool dothrow) { throwOnError = dothrow; } - - //! \brief Set whether or not to perform error analysis. - void doAnalysis(bool analyse) { analysis = analyse; } -}; - -#endif diff --git a/examples/test_util/summaryIntegrationTest.cpp b/examples/test_util/summaryIntegrationTest.cpp deleted file mode 100644 index ce88ea47c..000000000 --- a/examples/test_util/summaryIntegrationTest.cpp +++ /dev/null @@ -1,386 +0,0 @@ -/* - Copyright 2016 Statoil ASA. - - This file is part of the Open Porous Media project (OPM). - - OPM is free software: you can redistribute it and/or modify it under the terms of - the GNU General Public License as published by the Free Software Foundation, either - version 3 of the License, or (at your option) any later version. - - OPM is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with OPM. If not, see . - */ - - -#include "summaryIntegrationTest.hpp" -#include -#include -#include -#include - - -void SummaryIntegrationTest::getIntegrationTest(){ - std::vector timeVec1, timeVec2; - setTimeVecs(timeVec1, timeVec2); // Sets the time vectors, they are equal for all keywords (WPOR:PROD01 etc) - setDataSets(timeVec1, timeVec2); - - int ivar = 0; - if(!allowDifferentAmountOfKeywords){ - if(stringlist_get_size(keysShort) != stringlist_get_size(keysLong)){ - OPM_THROW(std::invalid_argument, "Different ammont of keywords in the two summary files."); - } - } - if(printKeyword){ - printKeywords(); - return; - } - - std::string keywordWithGreatestErrorRatio; - double greatestRatio = 0; - - //Iterates over all keywords from the restricted file, use iterator "ivar". Searches for a match in the file with more keywords, use the itarator "jvar". - while(ivar < stringlist_get_size(keysShort)){ - const char* keyword = stringlist_iget(keysShort, ivar); - - if(oneOfTheMainVariables){ - std::string keywordString(keyword); - std::string substr = keywordString.substr(0,4); - if(substr!= mainVariable){ - ivar++; - continue; - } - } - for (int jvar = 0; jvar < stringlist_get_size(keysLong); jvar++){ - - if (strcmp(keyword, stringlist_iget(keysLong, jvar)) == 0){ //When the keywords are equal, proceed in comparing summary files. - /* if(!checkUnits(keyword)){ - OPM_THROW(std::runtime_error, "For keyword " << keyword << " the unit of the two files is not equal. Not possible to compare."); - } //Comparing the unit of the two vectors.*/ - checkForKeyword(timeVec1, timeVec2, keyword); - if(findVectorWithGreatestErrorRatio){ - WellProductionVolume volume = getSpecificWellVolume(timeVec1,timeVec2, keyword); - findGreatestErrorRatio(volume,greatestRatio, keyword, keywordWithGreatestErrorRatio); - } - break; - } - //will only enter here if no keyword match - if(jvar == stringlist_get_size(keysLong)-1){ - if(!allowDifferentAmountOfKeywords){ - OPM_THROW(std::invalid_argument, "No match on keyword"); - } - } - } - ivar++; - } - if(findVectorWithGreatestErrorRatio){ - std::cout << "The keyword " << keywordWithGreatestErrorRatio << " had the greatest error ratio, which was " << greatestRatio << std::endl; - } - if((findVolumeError || oneOfTheMainVariables) && !findVectorWithGreatestErrorRatio){ - evaluateWellProductionVolume(); - } - if(allowSpikes){ - std::cout << "checkWithSpikes succeeded." << std::endl; - } -} - - -void SummaryIntegrationTest::getIntegrationTest(const char* keyword){ - if(stringlist_contains(keysShort,keyword) && stringlist_contains(keysLong, keyword)){ - std::vector timeVec1, timeVec2; - setTimeVecs(timeVec1, timeVec2); // Sets the time vectors, they are equal for all keywords (WPOR:PROD01 etc) - setDataSets(timeVec1, timeVec2); - - if(printSpecificKeyword){ - printDataOfSpecificKeyword(timeVec1, timeVec2, keyword); - } - if(findVolumeError){ - WellProductionVolume volume = getSpecificWellVolume(timeVec1, timeVec2, keyword); - if(volume.error == 0){ - std::cout << "For keyword " << keyword << " the total production volume is 0" << std::endl; - } - else{ - std::cout << "For keyword " << keyword << " the total production volume is "<< volume.total; - std::cout << ", the error volume is " << volume.error << " the error ratio is " << volume.error/volume.total << std::endl; - } - } - checkForKeyword(timeVec1, timeVec2, keyword); - return; - } - OPM_THROW(std::invalid_argument, "The keyword used is not common for the two files."); -} - - -void SummaryIntegrationTest::checkForKeyword(const std::vector& timeVec1, - const std::vector& timeVec2, - const char* keyword){ - std::vector dataVec1, dataVec2; - getDataVecs(dataVec1,dataVec2,keyword); - chooseReference(timeVec1, timeVec2,dataVec1,dataVec2); - if(allowSpikes){ - checkWithSpikes(keyword); - } - if(findVolumeError ||oneOfTheMainVariables ){ - volumeErrorCheck(keyword); - } -} - - -int SummaryIntegrationTest::checkDeviation(const Deviation& deviation){ - double absTol = getAbsTolerance(); - double relTol = getRelTolerance(); - if (deviation.rel> relTol && deviation.abs > absTol){ - return 1; - } - return 0; -} - - -void SummaryIntegrationTest::findGreatestErrorRatio(const WellProductionVolume& volume, - double &greatestRatio, - const char* currentKeyword, - std::string &greatestErrorRatio){ - if (volume.total != 0 && (volume.total - volume.error > getAbsTolerance()) ){ - if(volume.error/volume.total > greatestRatio){ - greatestRatio = volume.error/volume.total; - std::string currentKeywordStr(currentKeyword); - greatestErrorRatio = currentKeywordStr; - } - } -} - - -void SummaryIntegrationTest::volumeErrorCheck(const char* keyword){ - const ecl::smspec_node * node = ecl_sum_get_general_var_node (ecl_sum_fileShort ,keyword);//doesn't matter which ecl_sum_file one uses, the kewyord SHOULD be equal in terms of smspec data. - if (node->is_historical()) - return; - - if (!mainVariable.empty()){ - std::string keywordString(keyword); - std::string firstFour = keywordString.substr(0,4); - - if(mainVariable == firstFour && firstFour == "WOPR"){ - if(firstFour == "WOPR"){ - WellProductionVolume result = getWellProductionVolume(keyword); - WOP += result; - return; - } - } - if(mainVariable == firstFour && firstFour == "WWPR"){ - if(firstFour == "WWPR"){ - WellProductionVolume result = getWellProductionVolume(keyword); - WWP += result; - return; - } - } - if(mainVariable == firstFour && firstFour == "WGPR"){ - if(firstFour == "WGPR"){ - WellProductionVolume result = getWellProductionVolume(keyword); - WGP += result; - return; - } - } - if(mainVariable == firstFour && firstFour == "WBHP"){ - if(firstFour == "WBHP"){ - WellProductionVolume result = getWellProductionVolume(keyword); - WBHP += result; - return; - } - } - } - updateVolumeError(keyword); -} - - -void SummaryIntegrationTest::updateVolumeError(const char* keyword){ - std::string keywordString(keyword); - std::string firstFour = keywordString.substr(0,4); - - if(firstFour == "WOPR"){ - WellProductionVolume result = getWellProductionVolume(keyword); - WOP += result; - } - if(firstFour == "WWPR"){ - WellProductionVolume result = getWellProductionVolume(keyword); - WWP += result; - } - if(firstFour == "WGPR"){ - WellProductionVolume result = getWellProductionVolume(keyword); - WGP += result; - - } - if(firstFour == "WBHP"){ - WellProductionVolume result = getWellProductionVolume(keyword); - WBHP += result; - } -} - - -WellProductionVolume SummaryIntegrationTest::getWellProductionVolume(const char * keyword){ - double total = integrate(*referenceVec, *referenceDataVec); - double error = integrateError(*referenceVec, *referenceDataVec, - *checkVec, *checkDataVec); - WellProductionVolume wPV; - wPV.total = total; - wPV.error = error; - if(wPV.total != 0 && wPV.total-wPV.error > getAbsTolerance()){ - if( (wPV.error/wPV.total > getRelTolerance()) && throwExceptionForTooGreatErrorRatio){ - OPM_THROW(std::runtime_error, "For the keyword "<< keyword << " the error ratio was " << wPV.error/wPV.total << " which is greater than the tolerance " << getRelTolerance()); - } - } - return wPV; -} - - -void SummaryIntegrationTest::evaluateWellProductionVolume(){ - if(mainVariable.empty()){ - double ratioWOP, ratioWWP, ratioWGP, ratioWBHP; - ratioWOP = WOP.error/WOP.total; - ratioWWP = WWP.error/WWP.total; - ratioWGP = WGP.error/WGP.total; - ratioWBHP = WBHP.error/WBHP.total; - std::cout << "\n The total oil volume is " << WOP.total << ". The error volume is "<< WOP.error << ". The error ratio is " << ratioWOP << std::endl; - std::cout << "\n The total water volume is " << WWP.total << ". The error volume is "<< WWP.error << ". The error ratio is " << ratioWWP << std::endl; - std::cout << "\n The total gas volume is " << WGP.total <<". The error volume is "<< WGP.error << ". The error ratio is " << ratioWGP << std::endl; - std::cout << "\n The total area under the WBHP curve is " << WBHP.total << ". The area under the error curve is "<< WBHP.error << ". The error ratio is " << ratioWBHP << std::endl << std::endl; - } - if(mainVariable == "WOPR"){ - std::cout << "\nThe total oil volume is " << WOP.total << ". The error volume is "<< WOP.error << ". The error ratio is " << WOP.error/WOP.total << std::endl<< std::endl; - } - if(mainVariable == "WWPR"){ - std::cout << "\nThe total water volume is " << WWP.total << ". The error volume is "<< WWP.error << ". The error ratio is " << WWP.error/WWP.total << std::endl<< std::endl; - } - if(mainVariable == "WGPR"){ - std::cout << "\nThe total gas volume is " << WGP.total <<". The error volume is "<< WGP.error << ". The error ratio is " << WGP.error/WGP.total << std::endl<< std::endl; - } - if(mainVariable == "WBHP"){ - std::cout << "\nThe total area under the WBHP curve " << WBHP.total << ". The area under the error curve is "<< WBHP.error << ". The error ratio is " << WBHP.error/WBHP.total << std::endl << std::endl; - } -} - - -void SummaryIntegrationTest::checkWithSpikes(const char* keyword){ - int errorOccurrences = 0; - size_t jvar = 0 ; - bool spikeCurrent = false; - Deviation deviation; - - for (size_t ivar = 0; ivar < referenceVec->size(); ivar++){ - int errorOccurrencesPrev = errorOccurrences; - bool spikePrev = spikeCurrent; - getDeviation(ivar,jvar, deviation); - errorOccurrences += checkDeviation(deviation); - if (errorOccurrences != errorOccurrencesPrev){ - spikeCurrent = true; - } else{ - spikeCurrent = false; - } - if(spikePrev&&spikeCurrent){ - std::cout << "For keyword " << keyword << " at time step " << (*referenceVec)[ivar] < this->spikeLimit){ - std::cout << "For keyword " << keyword << std::endl; - OPM_THROW(std::invalid_argument, "For keyword " << keyword << " too many spikes in the vector. Integration test fails."); - } - } -} - - -WellProductionVolume -SummaryIntegrationTest::getSpecificWellVolume(const std::vector& timeVec1, - const std::vector& timeVec2, - const char* keyword){ - std::vector dataVec1, dataVec2; - getDataVecs(dataVec1,dataVec2,keyword); - chooseReference(timeVec1, timeVec2,dataVec1,dataVec2); - return getWellProductionVolume(keyword); -} - - -double SummaryIntegrationTest::integrate(const std::vector& timeVec, - const std::vector& dataVec){ - double totalSum = 0; - if(timeVec.size() != dataVec.size()){ - OPM_THROW(std::runtime_error, "The size of the time vector does not match the size of the data vector."); - } - for(size_t i = 0; i < timeVec.size()-1; i++){ - double width = timeVec[i+1] - timeVec[i]; - double height = dataVec[i+1]; - totalSum += getRectangleArea(height, width); - } - return totalSum; -} - - -double SummaryIntegrationTest::integrateError(const std::vector& timeVec1, - const std::vector& dataVec1, - const std::vector& timeVec2, - const std::vector& dataVec2){ - // When the data corresponds to a rate the integration will become a Riemann - // sum. This function calculates the Riemann sum of the error. The reason why - // a Riemann sum is used is because of the way the data is written to file. - // When a change occur (e.g. change of a rate), the data (value and time) is - // written to file, THEN the change happens in the simulator, i.e., we will - // notice the change at the next step. - // - // Keep in mind that the summary vector is NOT a continuous curve, only points - // of data (time, value). We have to guess what happens between the data - // points, we do this by saying: "There are no change, the only change happens - // at the data points." As stated above, the value of this constant "height" of - // the rectangle corresponds to the value of the last time step. Thus we have - // to use the "right hand side value of the rectangle as height - // - // someDataVector[ivar] instead of someDataVector[ivar-1] - // - // (which intuition is saying is the correct value to use). - - if(timeVec1.size() != dataVec1.size() || timeVec2.size() != dataVec2.size() ){ - OPM_THROW(std::runtime_error, "The size of the time vector does not match the size of the data vector."); - } - double errorSum = 0; - double rightEdge, leftEdge, width; - size_t i = 1; - size_t j = 1; - leftEdge = timeVec1[0]; - while(i < timeVec1.size()){ - if(j == timeVec2.size() ){ - break; - } - if(timeVec1[i] == timeVec2[j]){ - rightEdge = timeVec1[i]; - width = rightEdge - leftEdge; - double dev = std::fabs(dataVec1[i] - dataVec2[j]); - errorSum += getRectangleArea(dev, width); - leftEdge = rightEdge; - i++; - j++; - continue; - } - if(timeVec1[i] < timeVec2[j]){ - rightEdge = timeVec1[i]; - width = rightEdge - leftEdge; - double value = unitStep(dataVec2[j]); - double dev = std::fabs(dataVec1[i]-value); - errorSum += getRectangleArea(dev, width); - leftEdge = rightEdge; - i++; - continue; - } - if(timeVec2[j] < timeVec1[i]){ - rightEdge = timeVec2[j]; - width = rightEdge - leftEdge; - double value = unitStep(dataVec1[i]); - double dev = std::fabs(dataVec2[j]-value); - errorSum += getRectangleArea(dev, width); - leftEdge = rightEdge; - j++; - continue; - } - } - return errorSum; -} diff --git a/examples/test_util/summaryIntegrationTest.hpp b/examples/test_util/summaryIntegrationTest.hpp deleted file mode 100644 index 96d339aa3..000000000 --- a/examples/test_util/summaryIntegrationTest.hpp +++ /dev/null @@ -1,217 +0,0 @@ -/* - Copyright 2016 Statoil ASA. - - This file is part of the Open Porous Media project (OPM). - - OPM is free software: you can redistribute it and/or modify it under - the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - OPM is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with OPM. If not, see . - */ - -#include "summaryComparator.hpp" - -//! \brief Struct for storing the total area under a graph. -//! \details Used when plotting summary vector against time. In most cases this represents a volume. -struct WellProductionVolume{ - double total=0; //!< The total area under the graph when plotting the summary vector against time. In most cases the total production volume. - double error=0; //!< The total area under the graph when plotting the deviation vector against time. In most cases the total error volume. - - //! \brief Overloaded operator - //! \param[in] rhs WellProductionVolume struct - WellProductionVolume& operator+=(const WellProductionVolume& rhs){ - this->total += rhs.total; - this->error += rhs.error; - return *this; - } -}; - -//! \details The class inherits from the SummaryComparator class, which takes care of all file reading. \n The IntegrationTest class compares values from the two different files and throws exceptions when the deviation is unsatisfying. -class SummaryIntegrationTest: public SummaryComparator { - private: - bool allowSpikes = false; //!< Boolean value, when true checkForSpikes is included as a sub test in the integration test. By default: false. - bool findVolumeError = false; //!< Boolean value, when true volumeErrorCheck() is included as a sub test in the integration test. By default: false. - bool allowDifferentAmountOfKeywords = true; //!< Boolean value, when false the integration test will check wheter the two files have the same amount of keywords. \nIf they don't, an exception will be thrown. By default: true. - bool findVectorWithGreatestErrorRatio = false; //!< Boolean value, when true the integration test will find the vector that has the greatest error ratio. By default: false. - bool oneOfTheMainVariables = false; //!< Boolean value, when true the integration test will only check for one of the primary variables (WOPR, WGPR, WWPR. WBHP), which will be specified by user. By default: false. - bool throwExceptionForTooGreatErrorRatio = true; //!< Boolean value, when true any volume error ratio that exceeds the relativeTolerance will cause an exception to be thrown. By default: true. - std::string mainVariable; //!< String variable, where the name of the main variable of interest (one of WOPR, WBHP, WWPR, WGPR) is stored. Can be empty. - int spikeLimit = 13370; //!< The limit for how many spikes to allow in the data set of a certain keyword. By default: Set to a high number, \n should not trig the (if spikeOccurrences > spikeLimit){ // throw exception }. - - WellProductionVolume WOP; //!< WellProductionVolume struct for storing the total production volume and total error volume of all the keywords which start with WOPR - WellProductionVolume WWP; //!< WellProductionVolume struct for storing the total production volume and total error volume of all the keywords which start with WWPR - WellProductionVolume WGP;//!< WellProductionVolume struct for storing the total production volume and total error volume of all the keywords which start with WGPR - WellProductionVolume WBHP; //!< WellProductionVolume struct for storing the value of the area under the graph when plotting summary vector/deviation vector against time.This is for keywords starting with WBHP. \nNote: the name of the struct may be misleading, this is not an actual volume. - - - //! \brief The function gathers the correct data for comparison for a specific keyword - //! \param[in] timeVec1 A std::vector that contains the time steps of file 1. - //! \param[in] timeVec2 A std::vector that contains the time steps of file 2. - //! \param[in] keyword The keyword of interest - //! \details The function requires an outer loop which iterates over the keywords of the files. It prepares an integration test by gathering the data, stroing it into two vectors, \n deciding which is to be used as a reference/basis and calling the test function. - void checkForKeyword(const std::vector& timeVec1, - const std::vector& timeVec2, const char* keyword); - - //! \brief The function compares the volume error to the total production volume of a certain type of keyword. - //! param[in] keyword The keyword of interest. - //! \details The function takes in a keyword and checks if it is of interest. Only keywords which say something about the well oil production, well water production, \n well gas production and the well BHP are of interest. The function sums up the total production in the cases where it is possible, \n and sums up the error volumes by a trapezoid integration method. The resulting values are stored in member variable structs of type WellProductionVolume, and double variables. For proper use of the function all the keywords of the file should be checked. This is satisfied if it is called by checkForKeyword. - void volumeErrorCheck(const char* keyword); - - //! \brief The function calculates the total production volume and total error volume of a specific keyword - //! \param[in] timeVec1 A std::vector that contains the time steps of file 1. - //! \param[in] timeVec2 A std::vector that contains the time steps of file 2. - //! \param[in] keyword The keyword of interest - //! \param[out] ret Returns a WellProductionWolume struct - //! \details The function reads the data from the two files into the member variable vectors (of the super class). It returns a WellProductionVolume struct calculated from the vectors corresponding to the keyword. - WellProductionVolume getSpecificWellVolume(const std::vector& timeVec1, - const std::vector& timeVec2, - const char* keyword); - - //! \brief The function is a regression test which allows spikes. - //! \param[in] keyword The keyword of interest, the keyword the summary vectors "belong" to. - //! \details The function requires the protected member variables referenceVec, referenceDataVec, checkVec and checkDataVec to be stored with data, which is staisfied if it is called by checkForKeyword. \n It compares the two vectors value by value, and if the deviation is unsatisfying, the errorOccurrenceCounter is incremented. If the errorOccurrenceCounter becomes greater than the errorOccurrenceLimit, \n a exception is thrown. The function will allow spike values, however, if two values in a row exceed the deviation limit, they are no longer spikes, and an exception is thrown. - void checkWithSpikes(const char* keyword); - - //! \brief Caluculates a deviation, throws exceptions and writes and error message. - //! \param[in] deviation Deviation struct - //! \param[out] int Returns 0/1, depending on wheter the deviation exceeded the limit or not. - //! \details The function checks the values of the Deviation struct against the absolute and relative tolerance, which are private member values of the super class. \n When comparing against the relative tolerance an additional term is added, the absolute deviation has to be greater than 1e-6 for the function to throw an exception. \n When the deviations are too great, the function returns 1. - int checkDeviation(const Deviation& deviation); - - //! \brief Calculates the keyword's total production volume and error volume - //! \param[in] keyword The keyword of interest. - //! \param[out] wellProductionVolume A struct containing the total production volume and the total error volume. - //! \details The function calculates the total production volume and total error volume of a keyword, by the trapezoid integral method. \n The function throws and exception if the total error volume is negative. The function returns the results as a struct. - WellProductionVolume getWellProductionVolume(const char* keyword); - - //! \brief The function function works properly when the private member variables are set (after running the integration test which findVolumeError = true). \n It prints out the total production volume, the total error volume and the error ratio. - void evaluateWellProductionVolume(); - - //! \brief The function calculates the total production volume and total error volume - //! \param keyword The keyword of interest - //! \details The function uses the data that is stored in the member variable vectors. It calculates the total production volume \n and the total error volume of the specified keyword, and adds the result to the private member WellProductionVolume variables of the class. - void updateVolumeError(const char* keyword); - - //! \brief Finds the keyword which has the greates error volume ratio - //! \param[in] volume WellProductionVolume struct which contains the data used for comparison - //! \param[in] greatestRatio Double value taken in by reference. Stores the greatest error ratio value. - //! \param[in] currentKeyword The keyword that is under evaluation - //! \param[in] greatestErrorRatio String which contains the name of the keyword which has the greatest error ratio - //! \details The function requires an outer loop which iterates over the keywords in the files, and calls the function for each keyword. \nThe valiables double greatestRatio and std::string keywordWithTheGreatestErrorRatio must be declared outside the loop. \nWhen the current error ratio is greater than the value stored in greatestRatio, the gratestRatio value is updated with the current error ratio. - void findGreatestErrorRatio(const WellProductionVolume& volume, - double &greatestRatio, - const char* currentKeyword, - std::string &greatestErrorRatio); - -#if 0 - //! \brief Checks whether the unit of the two data vectors is the same - //! \param[in] keyword The keyword of interest - //! \param[out] boolean True/false, depending on whether the units are equal or not - bool checkUnits(const char* keyword); -#endif - public: - //! \brief Constructor, creates an object of IntegrationTest class. - //! \param[in] basename1 Path to file1 without extension. - //! \param[in] basename1 Path to file2 without extension. - //! \param[in] atol The absolute tolerance which is to be used in the test. - //! \param[in] rtol The relative tolerance which is to be used in the test. - //! \details The constructor calls the constructor of the super class. - SummaryIntegrationTest(const std::string& basename1, - const std::string& basename2, - double atol, double rtol) : - SummaryComparator(basename1, basename2, atol, rtol) {} - - //! \brief This function sets the private member variable allowSpikes. - //! \param[in] allowSpikes Boolean value - //! \details When allowSpikes is true, the integration test checkWithSpikes is excecuted. - void setAllowSpikes(bool allowSpikesArg){this->allowSpikes = allowSpikesArg;} - - //! \brief This function sets the private member variable findVolumeError. - //! \param[in] findVolumeError Boolean value - //! \details When findVolumeError is true, the integration test volumeErrorCheck and the function evaluateWellProductionVolume are excecuted. - void setFindVolumeError(bool findVolumeErrorArg){this->findVolumeError = findVolumeErrorArg;} - - //! \brief This function sets the private member variable oneOfTheMainVariables - //! \param[in] oneOfTheMainVariables Boolean value - //! \details When oneOfTheMainVariables is true, the integration test runs the substest volumeErrorCheckForOneSpecificVariable. - void setOneOfTheMainVariables(bool oneOfTheMainVariablesArg){this->oneOfTheMainVariables = oneOfTheMainVariablesArg;} - - //! \brief This function sets the member variable string #mainVariable - //! \param[in] mainVar This is the string should contain one of the main variables. e.g. WOPR - void setMainVariable(std::string mainVar){this->mainVariable = mainVar;} - - //! \brief This function sets the private member variable spikeLimit. - //! \param[in] lim The value which the spike limit is to be given. - void setSpikeLimit(int lim){this->spikeLimit = lim;} - - //! \brief This function sets the private member variable findVectorWithGreatestErrorRatio - //! \param[in] findVolumeError Boolean value - //! \details When findVectorWithGreatestErrorRatio is true, the integration test will print the vector with the greatest error ratio. - void setFindVectorWithGreatestErrorRatio(bool boolean){this->findVectorWithGreatestErrorRatio = boolean;} - - //! \brief This function sets the private member variable allowDifferentAmountsOfKeywords - //! \param[in] boolean Boolean value - //! \details When allowDifferentAmountOfKeywords is false, the amount of kewyord in the two files will be compared. \nIf the number of keywords are different an exception will be thrown. - void setAllowDifferentAmountOfKeywords(bool boolean){this->allowDifferentAmountOfKeywords = boolean;} - - //! \brief This function sets the private member variable throwExceptionForTooGreatErrorRatio - //! \param[in] boolean Boolean value - //! \details When throwExceptionForTooGreatErrorRatio is false, the function getWellProductionVolume will throw an exception. - void setThrowExceptionForTooGreatErrorRatio(bool boolean){this->throwExceptionForTooGreatErrorRatio = boolean;} - - //! \brief This function executes a integration test for all the keywords. If the two files do not match in amount of keywords, an exception is thrown. \n Uses the boolean member variables to know which tests to execute. - void getIntegrationTest(); - - //! \brief This function executes a integration test for one specific keyword. If one or both of the files do not have the keyword, an exception is thorwn. \n Uses the boolean member variables to know which tests to execute. - void getIntegrationTest(const char* keyword); - - //! \brief This function calculates the area of an rectangle of height height and width time-timePrev - //! \param[in] height The height of the rectangle. See important statement of use below. - //! \param[in] width The width of the rectangle - //! \param[out] area Returns the area of the rectangle - //! \details This function is simple. When using it on a summary vector (data values plotted againt time), calculating the area between the two points i and i+1 note this:\nThe width is time_of_i+1 - time_of_i, the height is data_of_i+1 NOT data_of_i. The upper limit must be used. - static double getRectangleArea(double height, double width){return height*width;} - - //! \brief This function calculates the area under a graph by doing a Riemann sum - //! \param[in] timeVec Contains the time values - //! \param[in] dataVec Contains the data values - //! \details The function does a Riemann sum integration of the graph formed - //! by the points (timeVec[i] , dataVec[i]). - //! In the case of a summary vector, the summary vector of quantity - //! corresponding to a rate, is a piecewise continus function consisting - //! of unit step functions. Thus the Riemann sum will become an - //! exact expression for the integral of the graph. - //! Important: For the data values correspoding to time i and i-1, - //! the fixed value of the height of the rectangles in the Riemann sum - //! is set by the data value i. The upper limit must be used. - static double integrate(const std::vector& timeVec, - const std::vector& dataVec); - - //! \brief This function calculates the Riemann sum of the error between two graphs. - //! \param[in] timeVec1 Contains the time values of graph 1 - //! \param[in] dataVec1 Contains the data values of graph 1 - //! \param[in] timeVec2 Contains the time values of graph 2 - //! \param[in] dataVec2 Contains the data values of graph 2 - //! \details This function takes in two graphs and returns the integrated error. - //! In case of ecl summary vectors: if the vectors correspond to a - //! quantity which is a rate, the vectors will be piecewise - //! continous unit step functions. In this case the error will also - //! be a piecewise continous unit step function. The function uses - //! a Riemann sum when calculating the integral. Thus the integral - //! will become exact. Important: For the data values corresponding - //! to time i and i-1, the fixed value of the height of the rectangles - //! in the Riemann sum is set by the data value i. - //! The upper limit must be used. - static double integrateError(const std::vector& timeVec1, - const std::vector& dataVec1, - const std::vector& timeVec2, - const std::vector& dataVec2); -}; diff --git a/examples/test_util/summaryRegressionTest.cpp b/examples/test_util/summaryRegressionTest.cpp deleted file mode 100644 index d653eb260..000000000 --- a/examples/test_util/summaryRegressionTest.cpp +++ /dev/null @@ -1,178 +0,0 @@ -/* - Copyright 2016 Statoil ASA. - This file is part of the Open Porous Media project (OPM). - - OPM is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - OPM is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with OPM. If not, see . - */ - -#include "summaryRegressionTest.hpp" -#include -#include -#include -#include - -void SummaryRegressionTest::getRegressionTest(){ - std::vector timeVec1, timeVec2; - setTimeVecs(timeVec1, timeVec2); // Sets the time vectors, they are equal for all keywords (WPOR:PROD01 etc) - setDataSets(timeVec1, timeVec2); //Figures which dataset that contains more/less values pr keyword vector. - std::cout << "Comparing " << timeVec1.size() << " steps." << std::endl; - int ivar = 0; - if((! this->allowDifferentNumberOfKeywords) && - (stringlist_get_size(keysShort) != stringlist_get_size(keysLong))) - { - int missing_count = 0; - std::cout << "Keywords missing from one case: " << std::endl; - - for (int i=0; i < stringlist_get_size( keysLong); i++) { - const char * key = stringlist_iget( keysLong , i ); - if (!stringlist_contains( keysShort , key)) { - std::cout << key << " "; - - missing_count++; - if ((missing_count % 8) == 0) - std::cout << std::endl; - } - } - std::cout << std::endl; - - HANDLE_ERROR(std::runtime_error, "Different amount of keywords in the two summary files."); - } - if(printKeyword){ - printKeywords(); - } - - - //Iterates over all keywords from the restricted file, use iterator "ivar". Searches for a match in the file with more keywords, use the iterator "jvar". - bool throwAtEnd = false; - while(ivar < stringlist_get_size(keysShort)){ - const char* keyword = stringlist_iget(keysShort, ivar); - std::string keywordString(keyword); - for (int jvar = 0; jvar < stringlist_get_size(keysLong); jvar++){ - if (strcmp(keyword, stringlist_iget(keysLong, jvar)) == 0){ //When the keywords are equal, proceed in comparing summary files. - if (isRestartFile && keywordString.substr(3,1)=="T"){ - break; - } - throwAtEnd |= !checkForKeyword(timeVec1, timeVec2, keyword); - break; - } - //will only enter here if no keyword match - if(jvar == stringlist_get_size(keysLong)-1){ - std::cout << "Could not find keyword: " << stringlist_iget(keysShort, ivar) << std::endl; - OPM_THROW(std::runtime_error, "No match on keyword"); - } - } - ivar++; - } - if (analysis) { - std::cout << deviations.size() << " summary keyword" - << (deviations.size() > 1 ? "s":"") << " exhibit failures" << std::endl; - size_t len = ecl_sum_get_data_length(ecl_sum1); - for (const auto& iter : deviations) { - std::cout << "\t" << iter.first << std::endl; - std::cout << "\t\tFails for " << iter.second.size() << " / " << len << " steps." << std::endl; - std::cout.precision(7); - double absErr = std::max_element(iter.second.begin(), iter.second.end(), - [](const Deviation& a, const Deviation& b) - { - return a.abs < b.abs; - })->abs; - double relErr = std::max_element(iter.second.begin(), iter.second.end(), - [](const Deviation& a, const Deviation& b) - { - return a.rel < b.rel; - })->rel; - std::cout << "\t\tLargest absolute error: " - << std::scientific << absErr << std::endl; - std::cout << "\t\tLargest relative error: " - << std::scientific << relErr << std::endl; - } - } - if (throwAtEnd) - OPM_THROW(std::runtime_error, "Regression test failed."); - else if (deviations.empty()) - std::cout << "Regression test succeeded." << std::endl; -} - - - -void SummaryRegressionTest::getRegressionTest(const char* keyword){ - std::vector timeVec1, timeVec2; - setTimeVecs(timeVec1, timeVec2); // Sets the time vectors, they are equal for all keywords (WPOR:PROD01 etc) - setDataSets(timeVec1, timeVec2); //Figures which dataset that contains more/less values pr keyword vector. - std::string keywordString(keyword); - if(stringlist_contains(keysShort,keyword) && stringlist_contains(keysLong, keyword)){ - if (isRestartFile && keywordString.substr(3,1)=="T"){ - return; - } - if (checkForKeyword(timeVec1, timeVec2, keyword)) - std::cout << "Regression test succeeded." << std::endl; - else - OPM_THROW(std::runtime_error, "Regression test failed"); - - return; - } - std::cout << "The keyword suggested, " << keyword << ", is not supported by one or both of the summary files. Please use a different keyword." << std::endl; - OPM_THROW(std::runtime_error, "Input keyword from user does not exist in/is not common for the two summary files."); -} - - - -bool SummaryRegressionTest::checkDeviation(Deviation deviation, const char* keyword, int refIndex, int checkIndex){ - double absTol = getAbsTolerance(); - double relTol = getRelTolerance(); - - if (deviation.rel > relTol && deviation.abs > absTol){ - if (analysis) { - deviations[keyword].push_back(deviation); - } else { - std::cout << "For keyword " << keyword << std::endl; - std::cout << "(days, reference value) and (days, check value) = (" << (*referenceVec)[refIndex] << ", " << (*referenceDataVec)[refIndex] - << ") and (" << (*checkVec)[checkIndex-1] << ", " << (*checkDataVec)[checkIndex-1] << ")\n"; - // -1 in [checkIndex -1] because checkIndex is updated after leaving getDeviation function - std::cout << "The absolute deviation is " << deviation.abs << ". The tolerance limit is " << absTol << std::endl; - std::cout << "The relative deviation is " << deviation.rel << ". The tolerance limit is " << relTol << std::endl; - HANDLE_ERROR(std::runtime_error, "Deviation exceed the limit."); - } - return false; - } - return true; -} - - - -bool SummaryRegressionTest::checkForKeyword(std::vector& timeVec1, std::vector& timeVec2, const char* keyword){ - std::vector dataVec1, dataVec2; - getDataVecs(dataVec1,dataVec2,keyword); - chooseReference(timeVec1, timeVec2,dataVec1,dataVec2); - return startTest(keyword); -} - - - -bool SummaryRegressionTest::startTest(const char* keyword){ - size_t jvar = 0; - Deviation deviation; - bool result = true; - for (size_t ivar = 0; ivar < referenceVec->size(); ivar++){ - getDeviation(ivar, jvar, deviation);//Reads from the protected member variables in the super class. - result = checkDeviation(deviation, keyword,ivar, jvar); - } - - return result; -} - -void SummaryRegressionTest::setAllowDifferentNumberOfKeywords(const bool allow) -{ - this->allowDifferentNumberOfKeywords = allow; -} diff --git a/examples/test_util/summaryRegressionTest.hpp b/examples/test_util/summaryRegressionTest.hpp deleted file mode 100644 index 285da6ea3..000000000 --- a/examples/test_util/summaryRegressionTest.hpp +++ /dev/null @@ -1,87 +0,0 @@ -/* - Copyright 2016 Statoil ASA. - - This file is part of the Open Porous Media project (OPM). - - OPM is free software: you can redistribute it and/or modify it under - the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - OPM is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with OPM. If not, see . - */ - -#ifndef SUMMARYREGRESSIONTEST_HPP -#define SUMMARYREGRESSIONTEST_HPP - -#include "summaryComparator.hpp" - -//! \details The class inherits from the SummaryComparator class, which takes care of all file reading. \n The RegressionTest class compares the values from the two different files and throws exceptions when the deviation is unsatisfying. -class SummaryRegressionTest: public SummaryComparator { - private: - //! \brief Gathers the correct data for comparison for a specific keyword - //! \param[in] timeVec1 The time steps of file 1. - //! \param[in] timeVec2 The time steps of file 2. - //! \param[in] keyword The keyword of interest - //! \details The function prepares a regression test by gathering the data, stroing it into two vectors, \n deciding which is to be used as a reference/basis and calling the test function. - //! \return True if check passed, false otherwise. - bool checkForKeyword(std::vector& timeVec1, std::vector& timeVec2, const char* keyword); - - //! \brief The regression test - //! \param[in] keyword The keyword common for both the files. The vectors associated with the keyword are used for comparison. - //! \details Start test uses the private member variables, pointers of std::vector type, which are set to point to the correct vectors in SummaryComparison::chooseReference(...). \n The function iterates over the referenceVev/basis and for each iteration it calculates the deviation with SummaryComparison::getDeviation(..) and stors it in a Deviation struct. \n SummaryComparison::getDeviation takes the int jvar as an reference input, and using it as an iterative index for the values which are to be compared with the basis. \n Thus, by updating the jvar variable every time a deviation is calculated, one keep track jvar and do not have to iterate over already checked values. - bool startTest(const char* keyword); - - //! \brief Caluculates a deviation, throws exceptions and writes and error message. - //! \param[in] deviation Deviation struct - //! \param[in] keyword The keyword that the data that are being compared belongs to. - //! \param[in] refIndex The report step of which the deviation originates from in #referenceDataVec. - //! \param[in] checkIndex The report step of which the deviation originates from in #checkDataVec. - //! \details The function checks the values of the Deviation struct against the absolute and relative tolerance, which are private member values of the super class. \n When comparing against the relative tolerance an additional term is added, the absolute deviation has to be greater than 1e-6 for the function to throw an exception. \n When the deviations are too great, the function writes out which keyword, and at what report step the deviation is too great before optionally throwing an exception. - //! \return True if check passed, false otherwise. - bool checkDeviation(Deviation deviation, const char* keyword, int refIndex, int checkIndex); - - bool isRestartFile = false; //!< Private member variable, when true the files that are being compared is a restart file vs a normal file - - /// Whether or not to require that the two files have the same - /// number of keywords. Throw exception if not. - /// Default value: false (don't allow different number of keywords). - bool allowDifferentNumberOfKeywords = false; - - public: - //! \brief Constructor, creates an object of RefressionTest class. - //! \param[in] basename1 Path to file1 without extension. - //! \param[in] basename1 Path to file2 without extension. - //! \param[in] relativeTol The relative tolerance which is to be used in the test. - //! \param[in] absoluteTol The absolute tolerance which is to be used in the test. - //! \details The constructor calls the constructor of the super class. - SummaryRegressionTest(const std::string& basename1, - const std::string& basename2, - double relativeTol, double absoluteTol) : - SummaryComparator(basename1, basename2, relativeTol, absoluteTol) {} - - //! \details The function executes a regression test for all the keywords. If the two files do not match in amount of keywords, an exception is thrown. - void getRegressionTest(); - - //! \details The function executes a regression test for one specific keyword. If one or both of the files do not have the keyword, an exception is thrown. - void getRegressionTest(const char* keyword);///< Regression test for a certain keyword of the files. - - //! \brief This function sets the private member variable isRestartFiles - //! \param[in] boolean Boolean value - void setIsRestartFile(bool boolean){this->isRestartFile = boolean;} - - /// \brief Dynamically control whether or not to require equal - /// number of keywords (vectors) in the two result sets. - /// - /// \param[in] allow Whether or not to allow different number of - /// summary keywords in the two result sets. - void setAllowDifferentNumberOfKeywords(const bool allow); -}; - -#endif