diff options
| author | Ruben Undheim <ruben.undheim@gmail.com> | 2019-02-10 08:49:27 +0000 |
|---|---|---|
| committer | Ruben Undheim <ruben.undheim@gmail.com> | 2019-02-10 08:49:27 +0000 |
| commit | 94cdcb9013e4862560945c14dbe762daa2baea07 (patch) | |
| tree | 6e2a3a3dad7a0800109f911c70c100daa6502d22 /CSXCAD/src/CSPropDebyeMaterial.cpp | |
| parent | ffda26309128be5d112df61a03e4827e47ecfac8 (diff) | |
Import GIT HEAD of CSXCAD sub-project (with Python interface)
Diffstat (limited to 'CSXCAD/src/CSPropDebyeMaterial.cpp')
| -rw-r--r-- | CSXCAD/src/CSPropDebyeMaterial.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/CSXCAD/src/CSPropDebyeMaterial.cpp b/CSXCAD/src/CSPropDebyeMaterial.cpp index f12c261..b1809be 100644 --- a/CSXCAD/src/CSPropDebyeMaterial.cpp +++ b/CSXCAD/src/CSPropDebyeMaterial.cpp @@ -99,8 +99,8 @@ bool CSPropDebyeMaterial::Update(std::string *ErrStr) for (int n=0;n<3;++n) { EC=EpsDelta[o][n].Evaluate(); - if (EC!=ParameterScalar::NO_ERROR) bOK=false; - if ((EC!=ParameterScalar::NO_ERROR) && (ErrStr!=NULL)) + if (EC!=ParameterScalar::PS_NO_ERROR) bOK=false; + if ((EC!=ParameterScalar::PS_NO_ERROR) && (ErrStr!=NULL)) { std::stringstream stream; stream << std::endl << "Error in Debye Material-Property epsilon Delta frequency value (ID: " << uiID << "): "; @@ -109,8 +109,8 @@ bool CSPropDebyeMaterial::Update(std::string *ErrStr) } EC=WeightEpsDelta[o][n].Evaluate(); - if (EC!=ParameterScalar::NO_ERROR) bOK=false; - if ((EC!=ParameterScalar::NO_ERROR) && (ErrStr!=NULL)) + if (EC!=ParameterScalar::PS_NO_ERROR) bOK=false; + if ((EC!=ParameterScalar::PS_NO_ERROR) && (ErrStr!=NULL)) { std::stringstream stream; stream << std::endl << "Error in Debye Material-Property epsilon Delta frequency weighting function (ID: " << uiID << "): "; @@ -119,8 +119,8 @@ bool CSPropDebyeMaterial::Update(std::string *ErrStr) } EC=EpsRelaxTime[o][n].Evaluate(); - if (EC!=ParameterScalar::NO_ERROR) bOK=false; - if ((EC!=ParameterScalar::NO_ERROR) && (ErrStr!=NULL)) + if (EC!=ParameterScalar::PS_NO_ERROR) bOK=false; + if ((EC!=ParameterScalar::PS_NO_ERROR) && (ErrStr!=NULL)) { std::stringstream stream; stream << std::endl << "Error in Debye Material-Property epsilon relaxation time value (ID: " << uiID << "): "; @@ -129,8 +129,8 @@ bool CSPropDebyeMaterial::Update(std::string *ErrStr) } EC=WeightEpsRelaxTime[o][n].Evaluate(); - if (EC!=ParameterScalar::NO_ERROR) bOK=false; - if ((EC!=ParameterScalar::NO_ERROR) && (ErrStr!=NULL)) + if (EC!=ParameterScalar::PS_NO_ERROR) bOK=false; + if ((EC!=ParameterScalar::PS_NO_ERROR) && (ErrStr!=NULL)) { std::stringstream stream; stream << std::endl << "Error in Debye Material-Property epsilon relaxation time weighting function (ID: " << uiID << "): "; |