Remove all the *_NAME macros

Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
This commit is contained in:
Ian Bell
2014-12-10 09:59:08 -05:00
parent 5fe24de11f
commit e7afcdbe7b
2 changed files with 104 additions and 318 deletions

View File

@@ -253,108 +253,108 @@ double setFunctionPointers()
return -_HUGE;
}
// set the pointers, platform independent
RPVersion = (RPVersion_POINTER) getFunctionPointer(RPVersion_NAME);
ABFL1dll = (ABFL1dll_POINTER) getFunctionPointer(ABFL1dll_NAME);
ABFL2dll = (ABFL2dll_POINTER) getFunctionPointer(ABFL2dll_NAME);
ACTVYdll = (ACTVYdll_POINTER) getFunctionPointer(ACTVYdll_NAME);
AGdll = (AGdll_POINTER) getFunctionPointer(AGdll_NAME);
CCRITdll = (CCRITdll_POINTER) getFunctionPointer(CCRITdll_NAME);
CP0dll = (CP0dll_POINTER) getFunctionPointer(CP0dll_NAME);
CRITPdll = (CRITPdll_POINTER) getFunctionPointer(CRITPdll_NAME);
CSATKdll = (CSATKdll_POINTER) getFunctionPointer(CSATKdll_NAME);
CV2PKdll = (CV2PKdll_POINTER) getFunctionPointer(CV2PKdll_NAME);
CVCPKdll = (CVCPKdll_POINTER) getFunctionPointer(CVCPKdll_NAME);
CVCPdll = (CVCPdll_POINTER) getFunctionPointer(CVCPdll_NAME);
DBDTdll = (DBDTdll_POINTER) getFunctionPointer(DBDTdll_NAME);
DBFL1dll = (DBFL1dll_POINTER) getFunctionPointer(DBFL1dll_NAME);
DBFL2dll = (DBFL2dll_POINTER) getFunctionPointer(DBFL2dll_NAME);
DDDPdll = (DDDPdll_POINTER) getFunctionPointer(DDDPdll_NAME);
DDDTdll = (DDDTdll_POINTER) getFunctionPointer(DDDTdll_NAME);
DEFLSHdll = (DEFLSHdll_POINTER) getFunctionPointer(DEFLSHdll_NAME);
DHD1dll = (DHD1dll_POINTER) getFunctionPointer(DHD1dll_NAME);
DHFLSHdll = (DHFLSHdll_POINTER) getFunctionPointer(DHFLSHdll_NAME);
DIELECdll = (DIELECdll_POINTER) getFunctionPointer(DIELECdll_NAME);
DOTFILLdll = (DOTFILLdll_POINTER) getFunctionPointer(DOTFILLdll_NAME);
DPDD2dll = (DPDD2dll_POINTER) getFunctionPointer(DPDD2dll_NAME);
DPDDKdll = (DPDDKdll_POINTER) getFunctionPointer(DPDDKdll_NAME);
DPDDdll = (DPDDdll_POINTER) getFunctionPointer(DPDDdll_NAME);
DPDTKdll = (DPDTKdll_POINTER) getFunctionPointer(DPDTKdll_NAME);
DPDTdll = (DPDTdll_POINTER) getFunctionPointer(DPDTdll_NAME);
DPTSATKdll = (DPTSATKdll_POINTER) getFunctionPointer(DPTSATKdll_NAME);
DSFLSHdll = (DSFLSHdll_POINTER) getFunctionPointer(DSFLSHdll_NAME);
ENTHALdll = (ENTHALdll_POINTER) getFunctionPointer(ENTHALdll_NAME);
ENTROdll = (ENTROdll_POINTER) getFunctionPointer(ENTROdll_NAME);
ESFLSHdll = (ESFLSHdll_POINTER) getFunctionPointer(ESFLSHdll_NAME);
FGCTYdll = (FGCTYdll_POINTER) getFunctionPointer(FGCTYdll_NAME);
FPVdll = (FPVdll_POINTER) getFunctionPointer(FPVdll_NAME);
FUGCOFdll = (FUGCOFdll_POINTER) getFunctionPointer(FUGCOFdll_NAME);
GERG04dll = (GERG04dll_POINTER) getFunctionPointer(GERG04dll_NAME);
GETFIJdll = (GETFIJdll_POINTER) getFunctionPointer(GETFIJdll_NAME);
GETKTVdll = (GETKTVdll_POINTER) getFunctionPointer(GETKTVdll_NAME);
GIBBSdll = (GIBBSdll_POINTER) getFunctionPointer(GIBBSdll_NAME);
HSFLSHdll = (HSFLSHdll_POINTER) getFunctionPointer(HSFLSHdll_NAME);
INFOdll = (INFOdll_POINTER) getFunctionPointer(INFOdll_NAME);
LIMITKdll = (LIMITKdll_POINTER) getFunctionPointer(LIMITKdll_NAME);
LIMITSdll = (LIMITSdll_POINTER) getFunctionPointer(LIMITSdll_NAME);
LIMITXdll = (LIMITXdll_POINTER) getFunctionPointer(LIMITXdll_NAME);
MELTPdll = (MELTPdll_POINTER) getFunctionPointer(MELTPdll_NAME);
MELTTdll = (MELTTdll_POINTER) getFunctionPointer(MELTTdll_NAME);
MLTH2Odll = (MLTH2Odll_POINTER) getFunctionPointer(MLTH2Odll_NAME);
NAMEdll = (NAMEdll_POINTER) getFunctionPointer(NAMEdll_NAME);
PASSCMNdll = (PASSCMNdll_POINTER) getFunctionPointer(PASSCMNdll_NAME);
PDFL1dll = (PDFL1dll_POINTER) getFunctionPointer(PDFL1dll_NAME);
PDFLSHdll = (PDFLSHdll_POINTER) getFunctionPointer(PDFLSHdll_NAME);
PEFLSHdll = (PEFLSHdll_POINTER) getFunctionPointer(PEFLSHdll_NAME);
PHFL1dll = (PHFL1dll_POINTER) getFunctionPointer(PHFL1dll_NAME);
PHFLSHdll = (PHFLSHdll_POINTER) getFunctionPointer(PHFLSHdll_NAME);
PHIXdll = (PHIXdll_POINTER) getFunctionPointer(PHIXdll_NAME);
PHI0dll = (PHI0dll_POINTER) getFunctionPointer(PHI0dll_NAME);
PQFLSHdll = (PQFLSHdll_POINTER) getFunctionPointer(PQFLSHdll_NAME);
PREOSdll = (PREOSdll_POINTER) getFunctionPointer(PREOSdll_NAME);
PRESSdll = (PRESSdll_POINTER) getFunctionPointer(PRESSdll_NAME);
PSFL1dll = (PSFL1dll_POINTER) getFunctionPointer(PSFL1dll_NAME);
PSFLSHdll = (PSFLSHdll_POINTER) getFunctionPointer(PSFLSHdll_NAME);
PUREFLDdll = (PUREFLDdll_POINTER) getFunctionPointer(PUREFLDdll_NAME);
RESIDUALdll = (RESIDUALdll_POINTER) getFunctionPointer(RESIDUALdll_NAME);
RMIX2dll = (RMIX2dll_POINTER) getFunctionPointer(RMIX2dll_NAME);
REDXdll = (REDXdll_POINTER) getFunctionPointer(REDXdll_NAME);
QMASSdll = (QMASSdll_POINTER) getFunctionPointer(QMASSdll_NAME);
QMOLEdll = (QMOLEdll_POINTER) getFunctionPointer(QMOLEdll_NAME);
SATDdll = (SATDdll_POINTER) getFunctionPointer(SATDdll_NAME);
SATEdll = (SATEdll_POINTER) getFunctionPointer(SATEdll_NAME);
SATHdll = (SATHdll_POINTER) getFunctionPointer(SATHdll_NAME);
SATPdll = (SATPdll_POINTER) getFunctionPointer(SATPdll_NAME);
SATSdll = (SATSdll_POINTER) getFunctionPointer(SATSdll_NAME);
SATTdll = (SATTdll_POINTER) getFunctionPointer(SATTdll_NAME);
SATSPLNdll = (SATSPLNdll_POINTER) getFunctionPointer(SATSPLNdll_NAME);
SETAGAdll = (SETAGAdll_POINTER) getFunctionPointer(SETAGAdll_NAME);
SETKTVdll = (SETKTVdll_POINTER) getFunctionPointer(SETKTVdll_NAME);
SETMIXdll = (SETMIXdll_POINTER) getFunctionPointer(SETMIXdll_NAME);
SETMODdll = (SETMODdll_POINTER) getFunctionPointer(SETMODdll_NAME);
SETREFdll = (SETREFdll_POINTER) getFunctionPointer(SETREFdll_NAME);
SETUPdll = (SETUPdll_POINTER) getFunctionPointer(SETUPdll_NAME);
// SPECGRdll = (SPECGRdll_POINTER) getFunctionPointer(SPECGRdll_NAME); // not in library
SUBLPdll = (SUBLPdll_POINTER) getFunctionPointer(SUBLPdll_NAME);
SUBLTdll = (SUBLTdll_POINTER) getFunctionPointer(SUBLTdll_NAME);
SURFTdll = (SURFTdll_POINTER) getFunctionPointer(SURFTdll_NAME);
SURTENdll = (SURTENdll_POINTER) getFunctionPointer(SURTENdll_NAME);
TDFLSHdll = (TDFLSHdll_POINTER) getFunctionPointer(TDFLSHdll_NAME);
TEFLSHdll = (TEFLSHdll_POINTER) getFunctionPointer(TEFLSHdll_NAME);
THERM0dll = (THERM0dll_POINTER) getFunctionPointer(THERM0dll_NAME);
THERM2dll = (THERM2dll_POINTER) getFunctionPointer(THERM2dll_NAME);
THERM3dll = (THERM3dll_POINTER) getFunctionPointer(THERM3dll_NAME);
THERMdll = (THERMdll_POINTER) getFunctionPointer(THERMdll_NAME);
THFLSHdll = (THFLSHdll_POINTER) getFunctionPointer(THFLSHdll_NAME);
TPFLSHdll = (TPFLSHdll_POINTER) getFunctionPointer(TPFLSHdll_NAME);
TPRHOdll = (TPRHOdll_POINTER) getFunctionPointer(TPRHOdll_NAME);
TQFLSHdll = (TQFLSHdll_POINTER) getFunctionPointer(TQFLSHdll_NAME);
TRNPRPdll = (TRNPRPdll_POINTER) getFunctionPointer(TRNPRPdll_NAME);
TSFLSHdll = (TSFLSHdll_POINTER) getFunctionPointer(TSFLSHdll_NAME);
VIRBdll = (VIRBdll_POINTER) getFunctionPointer(VIRBdll_NAME);
VIRCdll = (VIRCdll_POINTER) getFunctionPointer(VIRCdll_NAME);
WMOLdll = (WMOLdll_POINTER) getFunctionPointer(WMOLdll_NAME);
XMASSdll = (XMASSdll_POINTER) getFunctionPointer(XMASSdll_NAME);
XMOLEdll = (XMOLEdll_POINTER) getFunctionPointer(XMOLEdll_NAME);
RPVersion = (RPVersion_POINTER) getFunctionPointer(STRINGIFY(RPVersion));
ABFL1dll = (ABFL1dll_POINTER) getFunctionPointer(STRINGIFY(ABFL1dll));
ABFL2dll = (ABFL2dll_POINTER) getFunctionPointer(STRINGIFY(ABFL2dll));
ACTVYdll = (ACTVYdll_POINTER) getFunctionPointer(STRINGIFY(ACTVYdll));
AGdll = (AGdll_POINTER) getFunctionPointer(STRINGIFY(AGdll));
CCRITdll = (CCRITdll_POINTER) getFunctionPointer(STRINGIFY(CCRITdll));
CP0dll = (CP0dll_POINTER) getFunctionPointer(STRINGIFY(CP0dll));
CRITPdll = (CRITPdll_POINTER) getFunctionPointer(STRINGIFY(CRITPdll));
CSATKdll = (CSATKdll_POINTER) getFunctionPointer(STRINGIFY(CSATKdll));
CV2PKdll = (CV2PKdll_POINTER) getFunctionPointer(STRINGIFY(CV2PKdll));
CVCPKdll = (CVCPKdll_POINTER) getFunctionPointer(STRINGIFY(CVCPKdll));
CVCPdll = (CVCPdll_POINTER) getFunctionPointer(STRINGIFY(CVCPdll));
DBDTdll = (DBDTdll_POINTER) getFunctionPointer(STRINGIFY(DBDTdll));
DBFL1dll = (DBFL1dll_POINTER) getFunctionPointer(STRINGIFY(DBFL1dll));
DBFL2dll = (DBFL2dll_POINTER) getFunctionPointer(STRINGIFY(DBFL2dll));
DDDPdll = (DDDPdll_POINTER) getFunctionPointer(STRINGIFY(DDDPdll));
DDDTdll = (DDDTdll_POINTER) getFunctionPointer(STRINGIFY(DDDTdll));
DEFLSHdll = (DEFLSHdll_POINTER) getFunctionPointer(STRINGIFY(DEFLSHdll));
DHD1dll = (DHD1dll_POINTER) getFunctionPointer(STRINGIFY(DHD1dll));
DHFLSHdll = (DHFLSHdll_POINTER) getFunctionPointer(STRINGIFY(DHFLSHdll));
DIELECdll = (DIELECdll_POINTER) getFunctionPointer(STRINGIFY(DIELECdll));
DOTFILLdll = (DOTFILLdll_POINTER) getFunctionPointer(STRINGIFY(DOTFILLdll));
DPDD2dll = (DPDD2dll_POINTER) getFunctionPointer(STRINGIFY(DPDD2dll));
DPDDKdll = (DPDDKdll_POINTER) getFunctionPointer(STRINGIFY(DPDDKdll));
DPDDdll = (DPDDdll_POINTER) getFunctionPointer(STRINGIFY(DPDDdll));
DPDTKdll = (DPDTKdll_POINTER) getFunctionPointer(STRINGIFY(DPDTKdll));
DPDTdll = (DPDTdll_POINTER) getFunctionPointer(STRINGIFY(DPDTdll));
DPTSATKdll = (DPTSATKdll_POINTER) getFunctionPointer(STRINGIFY(DPTSATKdll));
DSFLSHdll = (DSFLSHdll_POINTER) getFunctionPointer(STRINGIFY(DSFLSHdll));
ENTHALdll = (ENTHALdll_POINTER) getFunctionPointer(STRINGIFY(ENTHALdll));
ENTROdll = (ENTROdll_POINTER) getFunctionPointer(STRINGIFY(ENTROdll));
ESFLSHdll = (ESFLSHdll_POINTER) getFunctionPointer(STRINGIFY(ESFLSHdll));
FGCTYdll = (FGCTYdll_POINTER) getFunctionPointer(STRINGIFY(FGCTYdll));
FPVdll = (FPVdll_POINTER) getFunctionPointer(STRINGIFY(FPVdll));
FUGCOFdll = (FUGCOFdll_POINTER) getFunctionPointer(STRINGIFY(FUGCOFdll));
GERG04dll = (GERG04dll_POINTER) getFunctionPointer(STRINGIFY(GERG04dll));
GETFIJdll = (GETFIJdll_POINTER) getFunctionPointer(STRINGIFY(GETFIJdll));
GETKTVdll = (GETKTVdll_POINTER) getFunctionPointer(STRINGIFY(GETKTVdll));
GIBBSdll = (GIBBSdll_POINTER) getFunctionPointer(STRINGIFY(GIBBSdll));
HSFLSHdll = (HSFLSHdll_POINTER) getFunctionPointer(STRINGIFY(HSFLSHdll));
INFOdll = (INFOdll_POINTER) getFunctionPointer(STRINGIFY(INFOdll));
LIMITKdll = (LIMITKdll_POINTER) getFunctionPointer(STRINGIFY(LIMITKdll));
LIMITSdll = (LIMITSdll_POINTER) getFunctionPointer(STRINGIFY(LIMITSdll));
LIMITXdll = (LIMITXdll_POINTER) getFunctionPointer(STRINGIFY(LIMITXdll));
MELTPdll = (MELTPdll_POINTER) getFunctionPointer(STRINGIFY(MELTPdll));
MELTTdll = (MELTTdll_POINTER) getFunctionPointer(STRINGIFY(MELTTdll));
MLTH2Odll = (MLTH2Odll_POINTER) getFunctionPointer(STRINGIFY(MLTH2Odll));
NAMEdll = (NAMEdll_POINTER) getFunctionPointer(STRINGIFY(NAMEdll));
PASSCMNdll = (PASSCMNdll_POINTER) getFunctionPointer(STRINGIFY(PASSCMNdll));
PDFL1dll = (PDFL1dll_POINTER) getFunctionPointer(STRINGIFY(PDFL1dll));
PDFLSHdll = (PDFLSHdll_POINTER) getFunctionPointer(STRINGIFY(PDFLSHdll));
PEFLSHdll = (PEFLSHdll_POINTER) getFunctionPointer(STRINGIFY(PEFLSHdll));
PHFL1dll = (PHFL1dll_POINTER) getFunctionPointer(STRINGIFY(PHFL1dll));
PHFLSHdll = (PHFLSHdll_POINTER) getFunctionPointer(STRINGIFY(PHFLSHdll));
PHIXdll = (PHIXdll_POINTER) getFunctionPointer(STRINGIFY(PHIXdll));
PHI0dll = (PHI0dll_POINTER) getFunctionPointer(STRINGIFY(PHI0dll));
PQFLSHdll = (PQFLSHdll_POINTER) getFunctionPointer(STRINGIFY(PQFLSHdll));
PREOSdll = (PREOSdll_POINTER) getFunctionPointer(STRINGIFY(PREOSdll));
PRESSdll = (PRESSdll_POINTER) getFunctionPointer(STRINGIFY(PRESSdll));
PSFL1dll = (PSFL1dll_POINTER) getFunctionPointer(STRINGIFY(PSFL1dll));
PSFLSHdll = (PSFLSHdll_POINTER) getFunctionPointer(STRINGIFY(PSFLSHdll));
PUREFLDdll = (PUREFLDdll_POINTER) getFunctionPointer(STRINGIFY(PUREFLDdll));
RESIDUALdll = (RESIDUALdll_POINTER) getFunctionPointer(STRINGIFY(RESIDUALdll));
RMIX2dll = (RMIX2dll_POINTER) getFunctionPointer(STRINGIFY(RMIX2dll));
REDXdll = (REDXdll_POINTER) getFunctionPointer(STRINGIFY(REDXdll));
QMASSdll = (QMASSdll_POINTER) getFunctionPointer(STRINGIFY(QMASSdll));
QMOLEdll = (QMOLEdll_POINTER) getFunctionPointer(STRINGIFY(QMOLEdll));
SATDdll = (SATDdll_POINTER) getFunctionPointer(STRINGIFY(SATDdll));
SATEdll = (SATEdll_POINTER) getFunctionPointer(STRINGIFY(SATEdll));
SATHdll = (SATHdll_POINTER) getFunctionPointer(STRINGIFY(SATHdll));
SATPdll = (SATPdll_POINTER) getFunctionPointer(STRINGIFY(SATPdll));
SATSdll = (SATSdll_POINTER) getFunctionPointer(STRINGIFY(SATSdll));
SATTdll = (SATTdll_POINTER) getFunctionPointer(STRINGIFY(SATTdll));
SATSPLNdll = (SATSPLNdll_POINTER) getFunctionPointer(STRINGIFY(SATSPLNdll));
SETAGAdll = (SETAGAdll_POINTER) getFunctionPointer(STRINGIFY(SETAGAdll));
SETKTVdll = (SETKTVdll_POINTER) getFunctionPointer(STRINGIFY(SETKTVdll));
SETMIXdll = (SETMIXdll_POINTER) getFunctionPointer(STRINGIFY(SETMIXdll));
SETMODdll = (SETMODdll_POINTER) getFunctionPointer(STRINGIFY(SETMODdll));
SETREFdll = (SETREFdll_POINTER) getFunctionPointer(STRINGIFY(SETREFdll));
SETUPdll = (SETUPdll_POINTER) getFunctionPointer(STRINGIFY(SETUPdll));
// SPECGRdll = (SPECGRdll_POINTER) getFunctionPointer(STRINGIFY(SPECGRdll)); // not in library
SUBLPdll = (SUBLPdll_POINTER) getFunctionPointer(STRINGIFY(SUBLPdll));
SUBLTdll = (SUBLTdll_POINTER) getFunctionPointer(STRINGIFY(SUBLTdll));
SURFTdll = (SURFTdll_POINTER) getFunctionPointer(STRINGIFY(SURFTdll));
SURTENdll = (SURTENdll_POINTER) getFunctionPointer(STRINGIFY(SURTENdll));
TDFLSHdll = (TDFLSHdll_POINTER) getFunctionPointer(STRINGIFY(TDFLSHdll));
TEFLSHdll = (TEFLSHdll_POINTER) getFunctionPointer(STRINGIFY(TEFLSHdll));
THERM0dll = (THERM0dll_POINTER) getFunctionPointer(STRINGIFY(THERM0dll));
THERM2dll = (THERM2dll_POINTER) getFunctionPointer(STRINGIFY(THERM2dll));
THERM3dll = (THERM3dll_POINTER) getFunctionPointer(STRINGIFY(THERM3dll));
THERMdll = (THERMdll_POINTER) getFunctionPointer(STRINGIFY(THERMdll));
THFLSHdll = (THFLSHdll_POINTER) getFunctionPointer(STRINGIFY(THFLSHdll));
TPFLSHdll = (TPFLSHdll_POINTER) getFunctionPointer(STRINGIFY(TPFLSHdll));
TPRHOdll = (TPRHOdll_POINTER) getFunctionPointer(STRINGIFY(TPRHOdll));
TQFLSHdll = (TQFLSHdll_POINTER) getFunctionPointer(STRINGIFY(TQFLSHdll));
TRNPRPdll = (TRNPRPdll_POINTER) getFunctionPointer(STRINGIFY(TRNPRPdll));
TSFLSHdll = (TSFLSHdll_POINTER) getFunctionPointer(STRINGIFY(TSFLSHdll));
VIRBdll = (VIRBdll_POINTER) getFunctionPointer(STRINGIFY(VIRBdll));
VIRCdll = (VIRCdll_POINTER) getFunctionPointer(STRINGIFY(VIRCdll));
WMOLdll = (WMOLdll_POINTER) getFunctionPointer(STRINGIFY(WMOLdll));
XMASSdll = (XMASSdll_POINTER) getFunctionPointer(STRINGIFY(XMASSdll));
XMOLEdll = (XMOLEdll_POINTER) getFunctionPointer(STRINGIFY(XMOLEdll));
return COOLPROP_OK;
}
@@ -523,7 +523,7 @@ bool REFPROPMixtureBackend::REFPROP_supported () {
// Store result of previous check.
if (_REFPROP_supported) {
// Either Refprop is supported or it is the first check.
std::string rpv(RPVersion_NAME);
std::string rpv(STRINGIFY(RPVersion));
if (rpv.compare("NOTAVAILABLE")!=0) {
// Function names were defined in "REFPROP_lib.h",
// This platform theoretically supports Refprop.