From 2e17fa110f1787fda447771fd9f31e68665ad057 Mon Sep 17 00:00:00 2001 From: Ruben Undheim Date: Sat, 9 Jul 2016 11:12:02 +0200 Subject: Spelling fixes Gbp-Pq: Name 0002-Spelling-fixes.patch --- CSXCAD/src/CSPrimPolyhedron.cpp | 4 ++-- CSXCAD/src/CSPrimPolyhedronReader.cpp | 2 +- CSXCAD/src/CSRectGrid.cpp | 4 ++-- QCSXCAD/QCSGridEditor.cpp | 2 +- QCSXCAD/QCSXCAD.cpp | 8 ++++---- QCSXCAD/QVTKStructure.cpp | 2 +- openEMS/Common/processmodematch.cpp | 2 +- openEMS/FDTD/extensions/operator_ext_upml.cpp | 2 +- openEMS/FDTD/operator.cpp | 6 +++--- openEMS/tools/AdrOp.cpp | 22 +++++++++++----------- openEMS/tools/ErrorMsg.cpp | 10 +++++----- openEMS/tools/ExpenseLog.h | 2 +- openEMS/tools/useful.cpp | 2 +- openEMS/tools/vtk_file_writer.cpp | 4 ++-- 14 files changed, 36 insertions(+), 36 deletions(-) diff --git a/CSXCAD/src/CSPrimPolyhedron.cpp b/CSXCAD/src/CSPrimPolyhedron.cpp index 2454f28..129d238 100644 --- a/CSXCAD/src/CSPrimPolyhedron.cpp +++ b/CSXCAD/src/CSPrimPolyhedron.cpp @@ -183,11 +183,11 @@ bool CSPrimPolyhedron::BuildTree() { m_Dimension = 2; - //if structure is not closed due to invalud faces, mark it as 3D + //if structure is not closed due to invalid faces, mark it as 3D if (m_InvalidFaces>0) { m_Dimension = 3; - std::cerr << "CSPrimPolyhedron::BuildTree: Warning, found polyhedron has invalud faces and is not a closed surface, setting to 3D solid anyway!" << std::endl; + std::cerr << "CSPrimPolyhedron::BuildTree: Warning, found polyhedron has invalid faces and is not a closed surface, setting to 3D solid anyway!" << std::endl; } } diff --git a/CSXCAD/src/CSPrimPolyhedronReader.cpp b/CSXCAD/src/CSPrimPolyhedronReader.cpp index ed224fd..c88c67e 100644 --- a/CSXCAD/src/CSPrimPolyhedronReader.cpp +++ b/CSXCAD/src/CSPrimPolyhedronReader.cpp @@ -77,7 +77,7 @@ bool CSPrimPolyhedronReader::Write2XML(TiXmlElement &elem, bool parameterised) elem.SetAttribute("FileType","PLY"); break; default: - elem.SetAttribute("FileType","Unkown"); + elem.SetAttribute("FileType","Unknown"); break; } return CSPrimitives::Write2XML(elem,parameterised); diff --git a/CSXCAD/src/CSRectGrid.cpp b/CSXCAD/src/CSRectGrid.cpp index 4f90bfe..3a8dcf7 100644 --- a/CSXCAD/src/CSRectGrid.cpp +++ b/CSXCAD/src/CSRectGrid.cpp @@ -78,7 +78,7 @@ std::string CSRectGrid::AddDiscLines(int direct, int numLines, double* vals, std } fParse.Parse(DistFunction,dirVar); if (fParse.GetParseErrorType()!=FunctionParser::FP_NO_ERROR) - return std::string("An error occured parsing f(") + dirVar + std::string(") - Parser message:\n") + std::string(fParse.ErrorMsg()); + return std::string("An error occurred parsing f(") + dirVar + std::string(") - Parser message:\n") + std::string(fParse.ErrorMsg()); double dValue=0; bool error=false; @@ -88,7 +88,7 @@ std::string CSRectGrid::AddDiscLines(int direct, int numLines, double* vals, std if (fParse.EvalError()!=0) error=true; AddDiscLine(direct,dValue); } - if (error) return std::string("An error occured evaluation the grid function f(") + dirVar + std::string(")!"); + if (error) return std::string("An error occurred evaluation the grid function f(") + dirVar + std::string(")!"); } return ""; } diff --git a/QCSXCAD/QCSGridEditor.cpp b/QCSXCAD/QCSGridEditor.cpp index 4e2210c..17d8ffe 100644 --- a/QCSXCAD/QCSGridEditor.cpp +++ b/QCSXCAD/QCSGridEditor.cpp @@ -237,7 +237,7 @@ void QCSGridEditor::BuildInHomogenDisc() // if (fParse.EvalError()!=0) error=true; // clGrid->AddDiscLine(i,dValue); // } -// if (error) QMessageBox::warning(HomogenDisc,tr("Error evaluation grid function!"),QString(tr("An error occured evaluation the grid function f(%1)!").arg(coordVars.at(i)))); +// if (error) QMessageBox::warning(HomogenDisc,tr("Error evaluation grid function!"),QString(tr("An error occurred evaluation the grid function f(%1)!").arg(coordVars.at(i)))); // } // clGrid->Sort(i); // } diff --git a/QCSXCAD/QCSXCAD.cpp b/QCSXCAD/QCSXCAD.cpp index 4cd4a74..b9ef094 100644 --- a/QCSXCAD/QCSXCAD.cpp +++ b/QCSXCAD/QCSXCAD.cpp @@ -299,7 +299,7 @@ bool QCSXCAD::ReadNode(TiXmlNode* root) if (root==NULL) return false; clear(); QString msg(ReadFromXML(root)); - if (msg.isEmpty()==false) QMessageBox::warning(this,tr("Geometry read error"),tr("An geometry read error occured!!\n\n")+msg,QMessageBox::Ok,QMessageBox::NoButton); + if (msg.isEmpty()==false) QMessageBox::warning(this,tr("Geometry read error"),tr("An geometry read error occurred!!\n\n")+msg,QMessageBox::Ok,QMessageBox::NoButton); CSTree->UpdateTree(); CSTree->expandAll(); setModified(); @@ -336,7 +336,7 @@ bool QCSXCAD::ReadFile(QString filename) // QString msg(ReadFromXML(filename.toLatin1().constData())); QString msg(ReadFromXML(root)); if (msg.isEmpty()==false) - QMessageBox::warning(this,tr("Geometry read error"),tr("An geometry read error occured!!\n\n")+msg,QMessageBox::Ok,QMessageBox::NoButton); + QMessageBox::warning(this,tr("Geometry read error"),tr("An geometry read error occurred!!\n\n")+msg,QMessageBox::Ok,QMessageBox::NoButton); CSTree->UpdateTree(); CSTree->expandAll(); @@ -720,7 +720,7 @@ void QCSXCAD::ExportGeometry() if (qFilename==NULL) return; if (!qFilename.endsWith(".xml")) qFilename+=".xml"; - if (Write2XML(qFilename.toLatin1().data())==false) QMessageBox::warning(this,tr("Geometry Export"),tr("Unknown error occured! Geometry Export failed"),1,0); + if (Write2XML(qFilename.toLatin1().data())==false) QMessageBox::warning(this,tr("Geometry Export"),tr("Unknown error occurred! Geometry Export failed"),1,0); } void QCSXCAD::ExportGeometry_Povray() @@ -802,7 +802,7 @@ void QCSXCAD::ExportGeometry(QString dirname, int type) StructureVTK->ExportProperty2PLY(uID,filename,clGrid.GetDeltaUnit()); break; default: - QMessageBox::warning(this, "Export Dialog","Unkown export type, skipping..."); + QMessageBox::warning(this, "Export Dialog","Unknown export type, skipping..."); return; break; } diff --git a/QCSXCAD/QVTKStructure.cpp b/QCSXCAD/QVTKStructure.cpp index 7394bd9..3239dea 100644 --- a/QCSXCAD/QVTKStructure.cpp +++ b/QCSXCAD/QVTKStructure.cpp @@ -306,7 +306,7 @@ void QVTKStructure::RenderGridDir(int dir, unsigned int plane_pos) uiQty[n]=CSGrid->GetQtyLines(n); if ((int)plane_pos>=uiQty[dir]) { - cerr << "QVTKStructure::RenderGridDir: requested plane postion is out of range, resetting to max value!" << endl; + cerr << "QVTKStructure::RenderGridDir: requested plane position is out of range, resetting to max value!" << endl; plane_pos = uiQty[dir]-1; } diff --git a/openEMS/Common/processmodematch.cpp b/openEMS/Common/processmodematch.cpp index 85d2d58..851912d 100644 --- a/openEMS/Common/processmodematch.cpp +++ b/openEMS/Common/processmodematch.cpp @@ -123,7 +123,7 @@ void ProcessModeMatch::InitProcess() int res = m_ModeParser[n]->Parse(m_ModeFunction[ny], "x,y,z,rho,a,r,t"); if (res >= 0) { - cerr << "ProcessModeMatch::InitProcess(): Warning, an error occured parsing the mode matching function (see below) ..." << endl; + cerr << "ProcessModeMatch::InitProcess(): Warning, an error occurred parsing the mode matching function (see below) ..." << endl; cerr << m_ModeFunction[ny] << "\n" << string(res, ' ') << "^\n" << m_ModeParser[n]->ErrorMsg() << "\n"; SetEnable(false); Reset(); diff --git a/openEMS/FDTD/extensions/operator_ext_upml.cpp b/openEMS/FDTD/extensions/operator_ext_upml.cpp index fc46d85..d64c21c 100644 --- a/openEMS/FDTD/extensions/operator_ext_upml.cpp +++ b/openEMS/FDTD/extensions/operator_ext_upml.cpp @@ -280,7 +280,7 @@ bool Operator_Ext_UPML::SetGradingFunction(string func) int res = m_GradingFunction->Parse(m_GradFunc.c_str(), "D,dl,W,Z,N"); if (res < 0) return true; - cerr << "Operator_Ext_UPML::SetGradingFunction: Warning, an error occured parsing the pml grading function (see below) ..." << endl; + cerr << "Operator_Ext_UPML::SetGradingFunction: Warning, an error occurred parsing the pml grading function (see below) ..." << endl; cerr << func << "\n" << string(res, ' ') << "^\n" << m_GradingFunction->ErrorMsg() << "\n"; return false; } diff --git a/openEMS/FDTD/operator.cpp b/openEMS/FDTD/operator.cpp index 259b1fb..54d4aad 100644 --- a/openEMS/FDTD/operator.cpp +++ b/openEMS/FDTD/operator.cpp @@ -450,7 +450,7 @@ Grid_Path Operator::FindPath(double start[], double stop[]) currPos[minDir]+=-1; minPos[minDir]-=1; } - //check validity of current postion + //check validity of current position for (int n=0;n<3;++n) if (currPos[n]>=numLines[n]) { @@ -1397,7 +1397,7 @@ bool Operator::AverageMatCellCenter(int ny, const unsigned int* pos, double* Eff for (int n=0; n<4; ++n) if (std::isnan(EffMat[n]) || std::isinf(EffMat[n])) { - cerr << "Operator::" << __func__ << ": Error, an effective material parameter is not a valid result, this should NOT have happend... exit..." << endl; + cerr << "Operator::" << __func__ << ": Error, an effective material parameter is not a valid result, this should NOT have happened... exit..." << endl; cerr << ny << "@" << n << " : " << pos[0] << "," << pos[1] << "," << pos[2] << endl; exit(0); } @@ -1510,7 +1510,7 @@ bool Operator::AverageMatQuarterCell(int ny, const unsigned int* pos, double* Ef for (int n=0; n<4; ++n) if (std::isnan(EffMat[n]) || std::isinf(EffMat[n])) { - cerr << "Operator::" << __func__ << ": Error, An effective material parameter is not a valid result, this should NOT have happend... exit..." << endl; + cerr << "Operator::" << __func__ << ": Error, An effective material parameter is not a valid result, this should NOT have happened... exit..." << endl; cerr << ny << "@" << n << " : " << pos[0] << "," << pos[1] << "," << pos[2] << endl; exit(0); } diff --git a/openEMS/tools/AdrOp.cpp b/openEMS/tools/AdrOp.cpp index 228f8de..23a7e87 100644 --- a/openEMS/tools/AdrOp.cpp +++ b/openEMS/tools/AdrOp.cpp @@ -28,15 +28,15 @@ AdrOp::AdrOp(unsigned int muiImax, unsigned int muiJmax, unsigned int muiKmax, u fprintf(stderr,"Memory allocation failed!! exiting..."); exit(1); } - error->SetMsg(1,"Adress Operator: Memory allocation failed!! exiting..."); - error->SetMsg(2,"Adress Operator: Invalid Adress requested!! exiting..."); - error->SetMsg(3,"Adress Operator: Invalid Position set!! exiting..."); - error->SetMsg(4,"Adress Operator: Invalid jump or passing end of iteration!! exiting..."); - error->SetMsg(5,"Adress Operator: 4D not yet implemented!! exiting..."); - error->SetMsg(6,"Adress Operator: Position not set!! exiting..."); - error->SetMsg(7,"Adress Operator: Cells not added to Adress Operator!! exiting..."); - error->SetMsg(8,"Adress Operator: Invalid Node!! exiting..."); - error->SetMsg(9,"Adress Operator: Grid invalid!! exiting..."); + error->SetMsg(1,"Address Operator: Memory allocation failed!! exiting..."); + error->SetMsg(2,"Address Operator: Invalid Address requested!! exiting..."); + error->SetMsg(3,"Address Operator: Invalid Position set!! exiting..."); + error->SetMsg(4,"Address Operator: Invalid jump or passing end of iteration!! exiting..."); + error->SetMsg(5,"Address Operator: 4D not yet implemented!! exiting..."); + error->SetMsg(6,"Address Operator: Position not set!! exiting..."); + error->SetMsg(7,"Address Operator: Cells not added to Address Operator!! exiting..."); + error->SetMsg(8,"Address Operator: Invalid Node!! exiting..."); + error->SetMsg(9,"Address Operator: Grid invalid!! exiting..."); //if (muiImax<0) muiImax=0; //if (muiJmax<0) muiJmax=0; @@ -50,7 +50,7 @@ AdrOp::AdrOp(unsigned int muiImax, unsigned int muiJmax, unsigned int muiKmax, u else exit(-2); if (muiKmax>0) uiDimension++; if ( (muiLmax>0) && (muiKmax>0) ) uiDimension++; -// cout << "\n-----Adress Operator created: Dimension: " << uiDimension << "----" <0) && (nr<=NoMsg)) { if (Msg[nr-1]!=NULL) fprintf(stderr,"%s",Msg[nr-1]); - else fprintf(stderr,"unkown error occured!! Error code: %d exiting...",nr); + else fprintf(stderr,"unknown error occurred!! Error code: %d exiting...",nr); if (chAddMsg!=NULL) fprintf(stderr,"%s",chAddMsg); getchar(); exit(nr); } else { - fprintf(stderr,"unkown error occured!! Error code: %d exiting...",nr); + fprintf(stderr,"unknown error occurred!! Error code: %d exiting...",nr); getchar(); exit(nr); } @@ -78,14 +78,14 @@ void ErrorMsg::Error(unsigned int nr,int addNr) if ((nr>0) && (nr<=NoMsg)) { if (Msg[nr-1]!=NULL) fprintf(stderr,"%s",Msg[nr-1]); - else fprintf(stderr,"unkown error occured!! Error code: %d exiting...",nr); + else fprintf(stderr,"unknown error occurred!! Error code: %d exiting...",nr); fprintf(stderr,"%d",addNr); getchar(); exit(nr); } else { - fprintf(stderr,"unkown error occured!! Error code: %d exiting...",nr); + fprintf(stderr,"unknown error occurred!! Error code: %d exiting...",nr); getchar(); exit(nr); } @@ -93,6 +93,6 @@ void ErrorMsg::Error(unsigned int nr,int addNr) void ErrorMsg::ownError(void) { - fprintf(stdout," Error occured by using Error Message class!! ... exiting..."); + fprintf(stdout," Error occurred by using Error Message class!! ... exiting..."); exit(-1); } diff --git a/openEMS/tools/ExpenseLog.h b/openEMS/tools/ExpenseLog.h index f8cc1ba..8aa1438 100644 --- a/openEMS/tools/ExpenseLog.h +++ b/openEMS/tools/ExpenseLog.h @@ -14,7 +14,7 @@ using namespace std; ExpenseLog EL; \ ExpenseModule* EngineExpense=EL.AddModule("Static Engine Expenses"); \ ExpenseModule* PPExpense=EL.AddModule("Static Post Processing"); \ -ExpenseModule* AdrOpExpense=EL.AddModule("Adress Operator"); +ExpenseModule* AdrOpExpense=EL.AddModule("Address Operator"); #define EXTERN_EXPENSE_DEFINE extern ExpenseLog EL; #define ENGINEEXPENSE_DEFINE extern ExpenseModule* EngineExpense; #define POSTPROCEXPENSE_DEFINE extern ExpenseModule* PPExpense; diff --git a/openEMS/tools/useful.cpp b/openEMS/tools/useful.cpp index 50aacfb..8e548f0 100644 --- a/openEMS/tools/useful.cpp +++ b/openEMS/tools/useful.cpp @@ -63,7 +63,7 @@ std::vector AssignJobs2Threads(unsigned int jobs, unsigned int nrT } if (jobs>0) - std::cerr << "AssignJobs2Threads: Error, " << jobs << " remain to be assigned, this should not have happend..." << std::endl; + std::cerr << "AssignJobs2Threads: Error, " << jobs << " remain to be assigned, this should not have happened..." << std::endl; if (RemoveEmpty) { diff --git a/openEMS/tools/vtk_file_writer.cpp b/openEMS/tools/vtk_file_writer.cpp index 79c40f3..be6586f 100644 --- a/openEMS/tools/vtk_file_writer.cpp +++ b/openEMS/tools/vtk_file_writer.cpp @@ -70,7 +70,7 @@ void VTK_File_Writer::SetMeshLines(double const* const* lines, unsigned int cons vtkRectilinearGrid* RectGrid = dynamic_cast(m_GridData); if (RectGrid==NULL) { - cerr << "VTK_File_Writer::SetMeshLines: Error, grid invalid, this should not have happend! " << endl; + cerr << "VTK_File_Writer::SetMeshLines: Error, grid invalid, this should not have happened! " << endl; exit(1); } RectGrid->SetDimensions(count[0],count[1],count[2]); @@ -97,7 +97,7 @@ void VTK_File_Writer::SetMeshLines(double const* const* lines, unsigned int cons vtkStructuredGrid* StructGrid = dynamic_cast(m_GridData); if (StructGrid==NULL) { - cerr << "VTK_File_Writer::SetMeshLines: Error, grid invalid, this should not have happend! " << endl; + cerr << "VTK_File_Writer::SetMeshLines: Error, grid invalid, this should not have happened! " << endl; exit(1); } -- cgit v1.2.3