Skip to content

Commit

Permalink
updated
Browse files Browse the repository at this point in the history
  • Loading branch information
Mike Park authored and Mike Park committed Jun 21, 2021
1 parent a57e780 commit fcf389e
Show file tree
Hide file tree
Showing 3 changed files with 44 additions and 17 deletions.
53 changes: 40 additions & 13 deletions acceptance/facebody/sin50xy/square.egads
Expand Up @@ -97,21 +97,24 @@ _brch
15
2 8 3
_tParams
3.535534613040e-02 1.414213845216e-03 1.500000000000e+01
2 0 4
3.535533905933e-02 1.060660171780e-02 2.000000000000e+01
2 0 5
1 5 2
_body
6 0
1 5 2
_brch
15 0
1 7 3
_faceID
6 0 1
1 5 1
_hist
6
4 0 3
1 7 3
_faceID
6 0 1
1 9 2
__trace__
6 1
4 0 4
1 5 2
_body
6 -3
Expand All @@ -121,7 +124,10 @@ _edgeID
1 6 1
_nface
1
4 1 3
1 9 2
__trace__
6 1
4 1 4
1 5 2
_body
6 -3
Expand All @@ -131,7 +137,10 @@ _edgeID
1 6 1
_nface
1
4 2 3
1 9 2
__trace__
6 2
4 2 4
1 5 2
_body
6 -3
Expand All @@ -141,7 +150,10 @@ _edgeID
1 6 1
_nface
1
4 3 3
1 9 2
__trace__
6 3
4 3 4
1 5 2
_body
6 -3
Expand All @@ -151,32 +163,47 @@ _edgeID
1 6 1
_nface
1
5 0 2
1 9 2
__trace__
6 4
5 0 3
1 7 1
_nodeID
1
1 6 1
_nedge
2
5 1 2
1 9 2
__trace__
6 1
5 1 3
1 7 1
_nodeID
2
1 6 1
_nedge
2
5 2 2
1 9 2
__trace__
6 2
5 2 3
1 7 1
_nodeID
3
1 6 1
_nedge
2
5 3 2
1 9 2
__trace__
6 3
5 3 3
1 7 1
_nodeID
4
1 6 1
_nedge
2
1 9 2
__trace__
6 4
0 0 0
Binary file modified acceptance/facebody/sin50xy/square.meshb
Binary file not shown.
8 changes: 4 additions & 4 deletions src/ref_acceptance.c
Expand Up @@ -195,13 +195,13 @@ static REF_STATUS ref_acceptance_u(REF_NODE ref_node, const char *function_name,
z = ref_node_xyz(ref_node, 2, node);
if (strcmp(function_name, "5") == 0) {
scalar[node] = 2.0 * pow(x, 2) + 2.0 * pow(y, 2) + 2.0 * pow(z, 2);
} else if (strcmp(function_name, "u5") == 0) {
} else if (strcmp(function_name, "sin50xy") == 0) {
REF_DBL xy;
xy = (2.0 * x - 1.0) * (2.0 * y - 1.0);
if (xy >= (2.0 * ref_math_pi / 50.0)) {
scalar[node] = 0.01 * sin(50.0 * xy);
} else {
if ((ref_math_pi / 50.0) <= xy && xy <= (2.0 * ref_math_pi / 50.0)) {
scalar[node] = sin(50.0 * xy);
} else {
scalar[node] = 0.01 * sin(50.0 * xy);
}
} else if (strcmp(function_name, "sinfun3") == 0) {
REF_DBL xyz;
Expand Down

0 comments on commit fcf389e

Please sign in to comment.