Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
T
teqp_fork_old
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Sven Michael Pohl
teqp_fork_old
Commits
74840946
Commit
74840946
authored
3 years ago
by
Ian Bell
Browse files
Options
Downloads
Patches
Plain Diff
Handling a few warnings
parent
b1f36fa7
No related branches found
No related tags found
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
include/teqp/constants.hpp
+3
-3
3 additions, 3 deletions
include/teqp/constants.hpp
include/teqp/types.hpp
+1
-1
1 addition, 1 deletion
include/teqp/types.hpp
src/time_fugcoeff.cpp
+16
-9
16 additions, 9 deletions
src/time_fugcoeff.cpp
with
20 additions
and
13 deletions
include/teqp/constants.hpp
+
3
−
3
View file @
74840946
...
@@ -5,7 +5,7 @@ const double N_A = 6.02214076e23; ///< Avogadro's number
...
@@ -5,7 +5,7 @@ const double N_A = 6.02214076e23; ///< Avogadro's number
///< Gas constant, according to CODATA 2019, in the given number type
///< Gas constant, according to CODATA 2019, in the given number type
template
<
typename
NumType
>
template
<
typename
NumType
>
const
auto
get_R_gas
()
{
const
auto
get_R_gas
()
{
const
doubl
e
k_B
=
1.380649e-23
;
///< Boltzmann constant
const
NumTyp
e
k_B
=
1.380649e-23
;
///< Boltzmann constant
const
doubl
e
N_A
=
6.02214076e23
;
///< Avogadro's number
const
NumTyp
e
N_A
_
=
6.02214076e23
;
///< Avogadro's number
return
N_A
*
k_B
;
return
static_cast
<
NumType
>
(
N_A
_
*
k_B
)
;
};
};
\ No newline at end of file
This diff is collapsed.
Click to expand it.
include/teqp/types.hpp
+
1
−
1
View file @
74840946
...
@@ -63,7 +63,7 @@ auto getbaseval(const T& expr)
...
@@ -63,7 +63,7 @@ auto getbaseval(const T& expr)
auto
toeig
=
[](
const
std
::
vector
<
double
>&
v
)
->
Eigen
::
ArrayXd
{
return
Eigen
::
Map
<
const
Eigen
::
ArrayXd
>
(
&
(
v
[
0
]),
v
.
size
());
};
auto
toeig
=
[](
const
std
::
vector
<
double
>&
v
)
->
Eigen
::
ArrayXd
{
return
Eigen
::
Map
<
const
Eigen
::
ArrayXd
>
(
&
(
v
[
0
]),
v
.
size
());
};
auto
all_same_length
=
[](
const
nlohmann
::
json
&
j
,
const
std
::
vector
<
std
::
string
>&
ks
)
{
auto
all_same_length
=
[](
const
nlohmann
::
json
&
j
,
const
std
::
vector
<
std
::
string
>&
ks
)
{
std
::
set
<
int
>
lengths
;
std
::
set
<
decltype
(
j
[
0
].
size
())
>
lengths
;
for
(
auto
k
:
ks
)
{
lengths
.
insert
(
j
[
k
].
size
());
}
for
(
auto
k
:
ks
)
{
lengths
.
insert
(
j
[
k
].
size
());
}
return
lengths
.
size
()
==
1
;
return
lengths
.
size
()
==
1
;
};
};
...
...
This diff is collapsed.
Click to expand it.
src/time_fugcoeff.cpp
+
16
−
9
View file @
74840946
...
@@ -28,19 +28,25 @@ int main()
...
@@ -28,19 +28,25 @@ int main()
bool
loaded_REFPROP
=
load_REFPROP
(
err
,
path
,
DLL_name
);
bool
loaded_REFPROP
=
load_REFPROP
(
err
,
path
,
DLL_name
);
printf
(
"Loaded refprop: %s @ address %zu
\n
"
,
loaded_REFPROP
?
"true"
:
"false"
,
REFPROP_address
());
printf
(
"Loaded refprop: %s @ address %zu
\n
"
,
loaded_REFPROP
?
"true"
:
"false"
,
REFPROP_address
());
if
(
!
loaded_REFPROP
)
{
return
EXIT_FAILURE
;
}
if
(
!
loaded_REFPROP
)
{
return
EXIT_FAILURE
;
}
char
hpath
[
256
]
=
" "
;
strcpy
(
hpath
,
const_cast
<
char
*>
(
path
.
c_str
()));
{
SETPATHdll
(
hpath
,
255
);
char
hpath
[
256
]
=
" "
;
strcpy
(
hpath
,
const_cast
<
char
*>
(
path
.
c_str
()));
SETPATHdll
(
hpath
,
255
);
}
int
ierr
=
0
,
nc
=
1
;
{
char
herr
[
256
],
hfld
[
10001
]
=
"PROPANE"
,
hhmx
[
256
]
=
"HMX.BNC"
,
href
[
4
]
=
"DEF"
;
int
ierr
=
0
,
nc
=
1
;
SETUPdll
(
nc
,
hfld
,
hhmx
,
href
,
ierr
,
herr
,
10000
,
255
,
3
,
255
);
char
herr
[
256
],
hfld
[
10001
]
=
"PROPANE"
,
hhmx
[
256
]
=
"HMX.BNC"
,
href
[
4
]
=
"DEF"
;
if
(
ierr
!=
0
)
{
SETUPdll
(
nc
,
hfld
,
hhmx
,
href
,
ierr
,
herr
,
10000
,
255
,
3
,
255
);
printf
(
"This ierr: %d herr: %s
\n
"
,
ierr
,
herr
);
if
(
ierr
!=
0
)
{
return
EXIT_FAILURE
;
printf
(
"This ierr: %d herr: %s
\n
"
,
ierr
,
herr
);
return
EXIT_FAILURE
;
}
}
}
// Try to disable caching in REFPROP
// Try to disable caching in REFPROP
{
{
int
ierr
=
0
;
char
herr
[
256
];
char
hflag
[
256
]
=
"Cache "
;
char
hflag
[
256
]
=
"Cache "
;
int
jFlag
=
3
,
kFlag
=
-
1
;
int
jFlag
=
3
,
kFlag
=
-
1
;
FLAGSdll
(
hflag
,
jFlag
,
kFlag
,
ierr
,
herr
,
255
,
255
);
FLAGSdll
(
hflag
,
jFlag
,
kFlag
,
ierr
,
herr
,
255
,
255
);
...
@@ -89,6 +95,7 @@ int main()
...
@@ -89,6 +95,7 @@ int main()
std
::
valarray
<
double
>
z
(
20
);
z
=
0.0
;
z
[
std
::
slice
(
0
,
Ncomp
,
1
)]
=
1.0
/
Ncomp
;
std
::
valarray
<
double
>
z
(
20
);
z
=
0.0
;
z
[
std
::
slice
(
0
,
Ncomp
,
1
)]
=
1.0
/
Ncomp
;
std
::
valarray
<
double
>
u
(
20
);
u
=
0.0
;
std
::
valarray
<
double
>
u
(
20
);
u
=
0.0
;
auto
usummer
=
0.0
;
auto
usummer
=
0.0
;
int
ierr
=
0
;
char
herr
[
256
];
auto
tic
=
std
::
chrono
::
high_resolution_clock
::
now
();
auto
tic
=
std
::
chrono
::
high_resolution_clock
::
now
();
for
(
auto
j
=
0
;
j
<
N
;
++
j
)
{
for
(
auto
j
=
0
;
j
<
N
;
++
j
)
{
FUGCOFdll
(
T
,
D_moldm3
,
&
(
z
[
0
]),
&
(
u
[
0
]),
ierr
,
herr
,
255
);
FUGCOFdll
(
T
,
D_moldm3
,
&
(
z
[
0
]),
&
(
u
[
0
]),
ierr
,
herr
,
255
);
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment