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
f5761370
Commit
f5761370
authored
3 years ago
by
Ian Bell
Browse files
Options
Downloads
Patches
Plain Diff
Add a view to the mole fractions rather than a copy in C interface
parent
bc249b9e
No related branches found
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
interface/C/teqpc.cpp
+12
-10
12 additions, 10 deletions
interface/C/teqpc.cpp
with
12 additions
and
10 deletions
interface/C/teqpc.cpp
+
12
−
10
View file @
f5761370
/***
* Although this is a C-language interface, the code itself is of course written in C++
* to allow for features only available in C++ and avoiding C memory management
*/
#include
<unordered_map>
#include
<unordered_map>
#include
<variant>
#include
<variant>
...
@@ -6,6 +11,7 @@
...
@@ -6,6 +11,7 @@
#include
"teqp/derivs.hpp"
#include
"teqp/derivs.hpp"
// TODO: actually make new UUID for each model instance
// TODO: actually make new UUID for each model instance
// TODO: catch tests
using
vad
=
std
::
valarray
<
double
>
;
using
vad
=
std
::
valarray
<
double
>
;
using
cub
=
decltype
(
canonical_PR
(
vad
{},
vad
{},
vad
{}));
using
cub
=
decltype
(
canonical_PR
(
vad
{},
vad
{},
vad
{}));
...
@@ -81,12 +87,12 @@ int free_model(char* uuid, char* errmsg, int errmsg_length) {
...
@@ -81,12 +87,12 @@ int free_model(char* uuid, char* errmsg, int errmsg_length) {
int
get_Arxy
(
char
*
uuid
,
const
int
NT
,
const
int
ND
,
const
double
T
,
const
double
rho
,
const
double
*
molefrac
,
const
int
Ncomp
,
double
*
val
,
char
*
errmsg
,
int
errmsg_length
)
{
int
get_Arxy
(
char
*
uuid
,
const
int
NT
,
const
int
ND
,
const
double
T
,
const
double
rho
,
const
double
*
molefrac
,
const
int
Ncomp
,
double
*
val
,
char
*
errmsg
,
int
errmsg_length
)
{
int
errcode
=
0
;
int
errcode
=
0
;
try
{
try
{
//
Copy
the double buffer
into a valarray
//
Make an Eigen view of
the double buffer
std
::
vala
rray
molefrac_
(
molefrac
,
Ncomp
);
Eigen
::
Map
<
const
Eigen
::
A
rray
Xd
>
molefrac_
(
molefrac
,
Ncomp
);
// Lambda function to extract the given derivative from the thing contained in the variant
// Lambda function to extract the given derivative from the thing contained in the variant
auto
f
=
[
&
](
auto
&
model
)
{
auto
f
=
[
&
](
auto
&
model
)
{
using
tdx
=
TDXDerivatives
<
decltype
(
model
),
double
,
std
::
valarray
<
double
>
>
;
using
tdx
=
TDXDerivatives
<
decltype
(
model
),
double
,
decltype
(
molefrac_
)
>
;
return
tdx
::
get_Ar
(
NT
,
ND
,
model
,
T
,
rho
,
molefrac_
);
return
tdx
::
get_Ar
(
NT
,
ND
,
model
,
T
,
rho
,
molefrac_
);
};
};
...
@@ -102,11 +108,11 @@ int get_Arxy(char* uuid, const int NT, const int ND, const double T, const doubl
...
@@ -102,11 +108,11 @@ int get_Arxy(char* uuid, const int NT, const int ND, const double T, const doubl
int
main
()
{
int
main
()
{
constexpr
int
errmsg_length
=
300
;
constexpr
int
errmsg_length
=
300
;
char
uuid
[
300
]
=
""
,
errmsg
[
errmsg_length
]
=
""
;
char
uuid
[
300
]
=
""
,
errmsg
[
errmsg_length
]
=
""
;
double
val
=
-
1
;
std
::
valarray
<
double
>
molefrac
=
{
1.0
};
{
{
std
::
string
j
=
R"({"kind":"vdW1", "model":{"a":1.0, "
r
b":2.0}})"
;
std
::
string
j
=
R"({"kind":"vdW1", "model":{"a":1.0, "b":2.0}})"
;
int
errcode1
=
build_model
(
j
.
c_str
(),
uuid
,
errmsg
,
errmsg_length
);
int
errcode1
=
build_model
(
j
.
c_str
(),
uuid
,
errmsg
,
errmsg_length
);
double
val
=
-
1
;
std
::
valarray
<
double
>
molefrac
=
{
1.0
};
int
errcode11
=
get_Arxy
(
uuid
,
0
,
0
,
300
,
3.0e-6
,
&
(
molefrac
[
0
]),
molefrac
.
size
(),
&
val
,
errmsg
,
errmsg_length
);
int
errcode11
=
get_Arxy
(
uuid
,
0
,
0
,
300
,
3.0e-6
,
&
(
molefrac
[
0
]),
molefrac
.
size
(),
&
val
,
errmsg
,
errmsg_length
);
int
errcode2
=
free_model
(
uuid
,
errmsg
,
errmsg_length
);
int
errcode2
=
free_model
(
uuid
,
errmsg
,
errmsg_length
);
int
rrr
=
0
;
int
rrr
=
0
;
...
@@ -123,8 +129,6 @@ int main() {
...
@@ -123,8 +129,6 @@ int main() {
}
}
)"
;
)"
;
int
errcode1
=
build_model
(
j
.
c_str
(),
uuid
,
errmsg
,
errmsg_length
);
int
errcode1
=
build_model
(
j
.
c_str
(),
uuid
,
errmsg
,
errmsg_length
);
double
val
=
-
1
;
std
::
valarray
<
double
>
molefrac
=
{
1.0
};
int
errcode11
=
get_Arxy
(
uuid
,
0
,
0
,
300
,
3.0e-6
,
&
(
molefrac
[
0
]),
molefrac
.
size
(),
&
val
,
errmsg
,
errmsg_length
);
int
errcode11
=
get_Arxy
(
uuid
,
0
,
0
,
300
,
3.0e-6
,
&
(
molefrac
[
0
]),
molefrac
.
size
(),
&
val
,
errmsg
,
errmsg_length
);
int
errcode2
=
free_model
(
uuid
,
errmsg
,
errmsg_length
);
int
errcode2
=
free_model
(
uuid
,
errmsg
,
errmsg_length
);
int
rrr
=
0
;
int
rrr
=
0
;
...
@@ -141,8 +145,6 @@ int main() {
...
@@ -141,8 +145,6 @@ int main() {
}
}
)"
;
)"
;
int
errcode1
=
build_model
(
j
.
c_str
(),
uuid
,
errmsg
,
errmsg_length
);
int
errcode1
=
build_model
(
j
.
c_str
(),
uuid
,
errmsg
,
errmsg_length
);
double
val
=
-
1
;
std
::
valarray
<
double
>
molefrac
=
{
1.0
};
int
errcode11
=
get_Arxy
(
uuid
,
0
,
1
,
300
,
3.0e-6
,
&
(
molefrac
[
0
]),
molefrac
.
size
(),
&
val
,
errmsg
,
errmsg_length
);
int
errcode11
=
get_Arxy
(
uuid
,
0
,
1
,
300
,
3.0e-6
,
&
(
molefrac
[
0
]),
molefrac
.
size
(),
&
val
,
errmsg
,
errmsg_length
);
int
errcode2
=
free_model
(
uuid
,
errmsg
,
errmsg_length
);
int
errcode2
=
free_model
(
uuid
,
errmsg
,
errmsg_length
);
int
rrr
=
0
;
int
rrr
=
0
;
...
...
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