OilfieldToolsNet/opm-common
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix typos: spesific -> specific

Browse Source
This commit is contained in:
Markus Blatt
2022-10-29 00:05:49 +02:00
parent b76c62a2f1
commit 043050a793
9 changed files with 42 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cmake/Templates/style.css
View File

@@ -1,4 +1,4 @@
/* Userspesific CSS for doxygen */
/* Userspecific CSS for doxygen */
body, table, div, p, dl {
font-family: Lucida Grande, Verdana, Geneva, Arial, sans-serif;
font-size: 16px;

2
docs/man1/compareECL.1
View File

@@ -32,7 +32,7 @@ The integration test compares SGAS, SWAT and PRESSURE in unified restart files,
.TP
\fB\-p\fR Print keywords in both cases and exit.
.TP
\fB\-r\fR compare a spesific report time step number in a restart file.
\fB\-r\fR compare a specific report time step number in a restart file.
.TP
\fB\-t\fR Specify ECLIPSE filetype to compare, (default behaviour is that all files are compared if found). Different possible arguments are:
.IP

2
docs/man1/convertECL.1
View File

@@ -14,5 +14,5 @@ In addition, the program takes these options (which must be given before the arg
.TP
\fB\-i\fR Enforce IX standard on output file.
.TP
\fB\-r\fR extract and convert a spesific report time step number from a unified restart file.
\fB\-r\fR extract and convert a specific report time step number from a unified restart file.
.PP

42
test_util/EclRegressionTest.cpp
View File

@@ -287,12 +287,12 @@ void ECLRegressionTest::checkSpesificKeyword(std::vector<std::string>& keywords1
std::vector<eclArrType>& arrayType2,
const std::string& reference)
{
auto search1 = std::find(keywords1.begin(), keywords1.end(), spesificKeyword);
auto search2 = std::find(keywords2.begin(), keywords2.end(), spesificKeyword);
auto search1 = std::find(keywords1.begin(), keywords1.end(), specificKeyword);
auto search2 = std::find(keywords2.begin(), keywords2.end(), specificKeyword);
if (search1 == keywords1.end() && search2 == keywords2.end()) {
std::cout << "Testing specific keyword \"" << spesificKeyword << "\" in " << reference << ". Keyword not found in any of the cases ." << std::endl;
OPM_THROW(std::runtime_error, "\nTesting spesific keyword \"" << spesificKeyword << "\" in " << reference << ". Keyword not found in any of the cases .");
std::cout << "Testing specific keyword \"" << specificKeyword << "\" in " << reference << ". Keyword not found in any of the cases ." << std::endl;
OPM_THROW(std::runtime_error, "\nTesting specific keyword \"" << specificKeyword << "\" in " << reference << ". Keyword not found in any of the cases .");
}
eclArrType arrType;
@@ -301,23 +301,23 @@ void ECLRegressionTest::checkSpesificKeyword(std::vector<std::string>& keywords1
arrType = arrayType1[ind];
if (search2 == keywords2.end()) {
std::cout << "Testing spesific kewyword in " << reference << ". Keyword found in fist case but not in second case." << std::endl;
OPM_THROW(std::runtime_error, "\nTesting spesific kewyword in " << reference << ". Keyword found in fist case but not in second case.");
std::cout << "Testing specific kewyword in " << reference << ". Keyword found in fist case but not in second case." << std::endl;
OPM_THROW(std::runtime_error, "\nTesting specific kewyword in " << reference << ". Keyword found in fist case but not in second case.");
}
keywords1.clear();
arrayType1.clear();
keywords1.push_back(spesificKeyword);
keywords1.push_back(specificKeyword);
arrayType1.push_back(arrType);
keywords2.clear();
arrayType2.clear();
keywords2.push_back(spesificKeyword);
keywords2.push_back(specificKeyword);
arrayType2.push_back(arrType);
} else {
if (search2 != keywords2.end()) {
std::cout << "Testing spesific kewyword in " << reference << ". Keyword not found in fist case but found in second case." << std::endl;
OPM_THROW(std::runtime_error, "\nTesting spesific kewyword in " << reference << ". Keyword not found in fist case but found in second case.");
std::cout << "Testing specific kewyword in " << reference << ". Keyword not found in fist case but found in second case." << std::endl;
OPM_THROW(std::runtime_error, "\nTesting specific kewyword in " << reference << ". Keyword not found in fist case but found in second case.");
}
keywords1.clear();
@@ -585,7 +585,7 @@ void ECLRegressionTest::results_init()
} else {
std::cout << "\nComparing init files \n" << std::endl;
if (spesificKeyword.empty()) {
if (specificKeyword.empty()) {
if (keywords1.size() == keywords2.size() && keywords1 != keywords2) {
/*
If the keywords come in different order in the two files
@@ -693,23 +693,23 @@ void ECLRegressionTest::results_rst()
deviations.clear();
if (spesificSequence > -1) {
auto search1 = std::find(seqnums1.begin(), seqnums1.end(), spesificSequence);
auto search2 = std::find(seqnums2.begin(), seqnums2.end(), spesificSequence);
if (specificSequence > -1) {
auto search1 = std::find(seqnums1.begin(), seqnums1.end(), specificSequence);
auto search2 = std::find(seqnums2.begin(), seqnums2.end(), specificSequence);
if (search1 == seqnums1.end()) {
OPM_THROW(std::runtime_error, "\nSpecified sequence " << spesificSequence << " not found in restart files for case 1");
OPM_THROW(std::runtime_error, "\nSpecified sequence " << specificSequence << " not found in restart files for case 1");
}
if (search2 == seqnums2.end()) {
OPM_THROW(std::runtime_error, "\nSpecified sequence " << spesificSequence << " not found in restart files for case 2");
OPM_THROW(std::runtime_error, "\nSpecified sequence " << specificSequence << " not found in restart files for case 2");
}
seqnums1.clear();
seqnums1.push_back(spesificSequence);
seqnums1.push_back(specificSequence);
seqnums2.clear();
seqnums2.push_back(spesificSequence);
seqnums2.push_back(specificSequence);
} else if (onlyLastSequence) {
@@ -791,7 +791,7 @@ void ECLRegressionTest::results_rst()
if (printKeywordOnly) {
printComparisonForKeywordLists(keywords1, keywords2, arrayType1, arrayType2);
} else {
if (spesificKeyword.empty()) {
if (specificKeyword.empty()) {
compareKeywords(keywords1, keywords2, reference);
} else {
checkSpesificKeyword(keywords1, keywords2, arrayType1, arrayType2, reference);
@@ -946,7 +946,7 @@ void ECLRegressionTest::results_smry()
printMissingKeywords(keywords1, keywords2);
}
} else {
if (spesificKeyword.empty()) {
if (specificKeyword.empty()) {
compareKeywords(keywords1, keywords2, reference);
} else {
checkSpesificKeyword(keywords1, keywords2, arrayType1, arrayType2, reference);
@@ -1114,7 +1114,7 @@ void ECLRegressionTest::results_rft()
if (printKeywordOnly) {
printComparisonForKeywordLists(keywords1, keywords2, arrayType1, arrayType2);
} else {
if (spesificKeyword.empty()) {
if (specificKeyword.empty()) {
compareKeywords(keywords1, keywords2, reference);
} else {
checkSpesificKeyword(keywords1, keywords2, arrayType1, arrayType2, reference);

12
test_util/EclRegressionTest.hpp
View File

@@ -80,10 +80,10 @@ public:
}
void compareSpesificKeyword(std::string keyword) {
this->spesificKeyword = std::move(keyword);
this->specificKeyword = std::move(keyword);
}
void compareSpesificRstReportStepNumber(int seqn) {
this->spesificSequence = seqn;
this->specificSequence = seqn;
}
void setLoadBaseRunData(bool loadArg) {
@@ -177,11 +177,11 @@ private:
bool loadBaseRunData = false;
// spesific keyword to be compared
std::string spesificKeyword;
// specific keyword to be compared
std::string specificKeyword;
// spesific restart sequence to be compared
int spesificSequence = -1;
// specific restart sequence to be compared
int specificSequence = -1;
// Accept extra keywords in the restart file of the 'new' simulation.
bool acceptExtraKeywords = false;

2
test_util/arraylist.cpp
View File

@@ -34,7 +34,7 @@ static void printHelp() {
std::cout << "\nList all arrays found in an EclFile specified on the command line. \n\n"
<< "\nThe program have one option which will only work on unified restart files:\n\n"
<< "-h Print help and exit.\n"
<< "-r List array for a spesific report time step number. Option only valid for a unified restart file. \n\n";
<< "-r List array for a specific report time step number. Option only valid for a unified restart file. \n\n";
}
void print_array_list(const std::vector<EclEntry>& array_list, const std::vector<int>& element_size)

4
test_util/compareECL.cpp
View File

@@ -42,7 +42,7 @@ static void printHelp() {
<< "-l Only do comparison for the last Report Step. This option is only valid for restart files.\n"
<< "-n Do not throw on errors.\n"
<< "-p Print keywords in both cases and exit.\n"
<< "-r compare a spesific report time step number in a restart file.\n"
<< "-r compare a specific report time step number in a restart file.\n"
<< "-t Specify ECLIPSE filetype to compare, (default behaviour is that all files are compared if found). Different possible arguments are:\n"
<< " -t UNRST \t Compare two unified restart files (.UNRST). This the default value, so it is the same as not passing option -t.\n"
<< " -t EGRID \t Compare two EGrid files (.EGRID).\n"
@@ -216,7 +216,7 @@ int main(int argc, char** argv) {
if (integrationTest && specificFileType) {
if (fileTypeString=="EGRID" || fileTypeString=="INIT" || fileTypeString=="RFT") {
std::cerr << "Integration test and spesific file type, only valid for UNRST and SMRY" << std::endl;
std::cerr << "Integration test and specific file type, only valid for UNRST and SMRY" << std::endl;
return EXIT_FAILURE;
}
}

2
test_util/convertECL.cpp
View File

@@ -119,7 +119,7 @@ static void printHelp() {
<< "-h Print help and exit.\n"
<< "-l List report step numbers in the selected restart file.\n"
<< "-i Enforce IX standard on output file.\n"
<< "-r Extract and convert a spesific report time step number from a unified restart file. \n\n";
<< "-r Extract and convert a specific report time step number from a unified restart file. \n\n";
}
int main(int argc, char **argv) {

16
tests/test_EclRegressionTest.cpp
View File

@@ -499,18 +499,18 @@ BOOST_AUTO_TEST_CASE(results_init_1) {
// should fail, even though using accept extra keywords option
BOOST_CHECK_THROW(test1a.results_init(),std::runtime_error);
// check with spesific kewyword PORV, found in both cases and should be ok
// check with specific kewyword PORV, found in both cases and should be ok
test1a.setAcceptExtraKeywords(false);
test1a.compareSpesificKeyword("PORV");
test1a.results_init();
// check with spesific kewyword PORO, found in second case only, should throw exeption
// check with specific kewyword PORO, found in second case only, should throw exeption
test1a.compareSpesificKeyword("PORO");
BOOST_CHECK_THROW(test1a.results_init(),std::runtime_error);
// check with spesific kewyword not found in any of the cases, should throw exeption
// check with specific kewyword not found in any of the cases, should throw exeption
test1a.compareSpesificKeyword("XXXXX");
BOOST_CHECK_THROW(test1a.results_init(),std::runtime_error);
@@ -723,20 +723,20 @@ BOOST_AUTO_TEST_CASE(results_unrst_1) {
test2a.setAcceptExtraKeywords(true);
test2a.results_rst();
// checking for spesific keyword PRESSURE, found in both cases
// checking for specific keyword PRESSURE, found in both cases
test2a.setAcceptExtraKeywords(false);
test2a.compareSpesificKeyword("PRESSURE");
// test should be ok
test2a.results_rst();
// checking for spesific keyword RS, only present in one of the cases
// checking for specific keyword RS, only present in one of the cases
test2a.compareSpesificKeyword("RS");
// should fail
BOOST_CHECK_THROW(test2a.results_rst(),std::runtime_error);
// checking for spesific keyword XXXX, not found in any of the cases
// checking for specific keyword XXXX, not found in any of the cases
test2a.compareSpesificKeyword("XXXX");
// should fail
@@ -926,7 +926,7 @@ BOOST_AUTO_TEST_CASE(results_unrst_3) {
ECLRegressionTest test2("TMP1", "TMP2", 1e-3, 1e-3);
BOOST_CHECK_THROW(test2.results_rst(),std::runtime_error);
// check spesific keyword RS, should be OK
// check specific keyword RS, should be OK
test2.compareSpesificKeyword("RS");
test2.results_rst();
@@ -1231,7 +1231,7 @@ BOOST_AUTO_TEST_CASE(results_rft_1) {
test1b.results_rft();
// accept extra keyword to false, but check for spesific keyword (PRESSSURE)
// accept extra keyword to false, but check for specific keyword (PRESSSURE)
test1b.setAcceptExtraKeywords(false);
test1b.compareSpesificKeyword("PRESSURE");