Skip to content

Commit

Permalink
[clib] Replace doublereal in definition files
Browse files Browse the repository at this point in the history
While declarations no longer use doublereal, instances were not replaced
in definition files.
  • Loading branch information
ischoegl committed Mar 14, 2023
1 parent fd69cd1 commit 7a05eed
Show file tree
Hide file tree
Showing 2 changed files with 24 additions and 24 deletions.
26 changes: 13 additions & 13 deletions src/clib/ct.cpp
Expand Up @@ -244,7 +244,7 @@ extern "C" {
}
}

doublereal thermo_temperature(int n)
double thermo_temperature(int n)
{
try {
return ThermoCabinet::item(n).temperature();
Expand All @@ -263,7 +263,7 @@ extern "C" {
return 0;
}

doublereal thermo_density(int n)
double thermo_density(int n)
{
try {
return ThermoCabinet::item(n).density();
Expand All @@ -282,7 +282,7 @@ extern "C" {
return 0;
}

doublereal thermo_molarDensity(int n)
double thermo_molarDensity(int n)
{
try {
return ThermoCabinet::item(n).molarDensity();
Expand All @@ -301,7 +301,7 @@ extern "C" {
return 0;
}

doublereal thermo_meanMolecularWeight(int n)
double thermo_meanMolecularWeight(int n)
{
try {
return ThermoCabinet::item(n).meanMolecularWeight();
Expand Down Expand Up @@ -340,7 +340,7 @@ extern "C" {
}
}

doublereal thermo_moleFraction(int n, size_t k)
double thermo_moleFraction(int n, size_t k)
{
try {
return ThermoCabinet::item(n).moleFraction(k);
Expand All @@ -361,7 +361,7 @@ extern "C" {
}
}

doublereal thermo_massFraction(int n, size_t k)
double thermo_massFraction(int n, size_t k)
{
try {
return ThermoCabinet::item(n).massFraction(k);
Expand Down Expand Up @@ -501,7 +501,7 @@ extern "C" {
}


doublereal thermo_nAtoms(int n, size_t k, size_t m)
double thermo_nAtoms(int n, size_t k, size_t m)
{
try {
return ThermoCabinet::item(n).nAtoms(k,m);
Expand All @@ -510,7 +510,7 @@ extern "C" {
}
}

int thermo_addElement(int n, const char* name, doublereal weight)
int thermo_addElement(int n, const char* name, double weight)
{
try {
ThermoCabinet::item(n).addElement(name, weight);
Expand Down Expand Up @@ -880,7 +880,7 @@ extern "C" {
}
}

doublereal thermo_refPressure(int n)
double thermo_refPressure(int n)
{
try {
return ThermoCabinet::item(n).refPressure();
Expand All @@ -889,7 +889,7 @@ extern "C" {
}
}

doublereal thermo_minTemp(int n, int k)
double thermo_minTemp(int n, int k)
{
try {
ThermoPhase& ph = ThermoCabinet::item(n);
Expand All @@ -904,7 +904,7 @@ extern "C" {
}
}

doublereal thermo_maxTemp(int n, int k)
double thermo_maxTemp(int n, int k)
{
try {
ThermoPhase& ph = ThermoCabinet::item(n);
Expand Down Expand Up @@ -966,7 +966,7 @@ extern "C" {
}
}

doublereal thermo_thermalExpansionCoeff(int n)
double thermo_thermalExpansionCoeff(int n)
{
try {
return ThermoCabinet::item(n).thermalExpansionCoeff();
Expand All @@ -975,7 +975,7 @@ extern "C" {
}
}

doublereal thermo_isothermalCompressibility(int n)
double thermo_isothermalCompressibility(int n)
{
try {
return ThermoCabinet::item(n).isothermalCompressibility();
Expand Down
22 changes: 11 additions & 11 deletions src/clib/ctmultiphase.cpp
Expand Up @@ -121,7 +121,7 @@ extern "C" {
}
}

doublereal mix_nAtoms(int i, int k, int m)
double mix_nAtoms(int i, int k, int m)
{
try {
MultiPhase& mix = mixCabinet::item(i);
Expand All @@ -142,7 +142,7 @@ extern "C" {
}
}

doublereal mix_phaseMoles(int i, int n)
double mix_phaseMoles(int i, int n)
{
try {
MultiPhase& mix = mixCabinet::item(i);
Expand Down Expand Up @@ -206,7 +206,7 @@ extern "C" {
}
}

doublereal mix_temperature(int i)
double mix_temperature(int i)
{
try {
return mixCabinet::item(i).temperature();
Expand All @@ -215,7 +215,7 @@ extern "C" {
}
}

doublereal mix_minTemp(int i)
double mix_minTemp(int i)
{
try {
return mixCabinet::item(i).minTemp();
Expand All @@ -224,7 +224,7 @@ extern "C" {
}
}

doublereal mix_maxTemp(int i)
double mix_maxTemp(int i)
{
try {
return mixCabinet::item(i).maxTemp();
Expand All @@ -233,7 +233,7 @@ extern "C" {
}
}

doublereal mix_charge(int i)
double mix_charge(int i)
{
try {
return mixCabinet::item(i).charge();
Expand All @@ -242,7 +242,7 @@ extern "C" {
}
}

doublereal mix_phaseCharge(int i, int p)
double mix_phaseCharge(int i, int p)
{
try {
MultiPhase& mix = mixCabinet::item(i);
Expand All @@ -267,7 +267,7 @@ extern "C" {
}
}

doublereal mix_pressure(int i)
double mix_pressure(int i)
{
try {
return mixCabinet::item(i).pressure();
Expand All @@ -276,7 +276,7 @@ extern "C" {
}
}

doublereal mix_speciesMoles(int i, int k)
double mix_speciesMoles(int i, int k)
{
try {
MultiPhase& mix = mixCabinet::item(i);
Expand All @@ -287,7 +287,7 @@ extern "C" {
}
}

doublereal mix_elementMoles(int i, int m)
double mix_elementMoles(int i, int m)
{
try {
MultiPhase& mix = mixCabinet::item(i);
Expand All @@ -298,7 +298,7 @@ extern "C" {
}
}

doublereal mix_equilibrate(int i, const char* XY, doublereal rtol,
double mix_equilibrate(int i, const char* XY, double rtol,
int maxsteps, int maxiter, int loglevel)
{
try {
Expand Down

0 comments on commit 7a05eed

Please sign in to comment.