github/CoolProp
1
1
Fork 0
mirror of https://github.com/CoolProp/CoolProp.git synced 2026-01-22 20:38:01 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fix CAS parsing for REFPROP strings

Browse Source
This commit is contained in:
Ian Bell
2015-09-03 22:40:38 -06:00
parent 24e0ec2063
commit 721dc68fac
1 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/Backends/REFPROP/REFPROPMixtureBackend.cpp
View File

@@ -341,17 +341,22 @@ std::string REFPROPMixtureBackend::fluid_param_string(const std::string &ParamNa
// c hnam--component name [character*12]
// c hn80--component name--long form [character*80]
// c hcasn--CAS (Chemical Abstracts Service) number [character*12]
long icomp = 1L;
char hnam[13], hn80[81], hcasn[13];
NAMEdll(&icomp, hnam, hn80, hcasn, 12, 80, 12);
std::string casn = hcasn;
strstrip(casn);
return casn;
std::vector<std::string> CASvec;
for (long icomp = 1L; icomp <= fluid_names.size(); ++icomp){
char hnam[13], hn80[81], hcasn[13];
NAMEdll(&icomp, hnam, hn80, hcasn, 12, 80, 12);
hcasn[12]='\0';
std::string casn = hcasn;
strstrip(casn);
CASvec.push_back(casn);
}
return strjoin(CASvec, "&");
}
else if (ParamName == "name"){
long icomp = 1L;
char hnam[13], hn80[81], hcasn[13];
NAMEdll(&icomp, hnam, hn80, hcasn, 12, 80, 12);
hnam[12] = '\0';
std::string name = hnam;
strstrip(name);
return name;
@@ -360,6 +365,7 @@ std::string REFPROPMixtureBackend::fluid_param_string(const std::string &ParamNa
long icomp = 1L;
char hnam[13], hn80[81], hcasn[13];
NAMEdll(&icomp, hnam, hn80, hcasn, 12, 80, 12);
hn80[80] = '\0';
std::string n80 = hn80;
strstrip(n80);
return n80;
@@ -372,6 +378,7 @@ long REFPROPMixtureBackend::match_CAS(const std::string &CAS){
for (long icomp = 1L; icomp <= static_cast<long>(fluid_names.size()); ++icomp){
char hnam[13], hn80[81], hcasn[13];
NAMEdll(&icomp, hnam, hn80, hcasn, 12, 80, 12);
hcasn[12] = '\0';
std::string casn = hcasn;
strstrip(casn);
if (casn == CAS){