Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
BornAgain
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
Container 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
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
mlz
BornAgain
Commits
aafdf3c4
Commit
aafdf3c4
authored
11 years ago
by
Celine Durniak
Browse files
Options
Downloads
Patches
Plain Diff
Correction of the formula for the volume of a spheroid
parent
e7358862
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
Core/FormFactors/src/FormFactorSpheroid.cpp
+1
-1
1 addition, 1 deletion
Core/FormFactors/src/FormFactorSpheroid.cpp
Tests/UnitTests/TestCore/FormFactorTest.h
+2
-1
2 additions, 1 deletion
Tests/UnitTests/TestCore/FormFactorTest.h
with
3 additions
and
2 deletions
Core/FormFactors/src/FormFactorSpheroid.cpp
+
1
−
1
View file @
aafdf3c4
...
...
@@ -74,7 +74,7 @@ complex_t FormFactorSpheroid::evaluate_for_q(const cvector_t& q) const
if
(
std
::
abs
(
m_q
.
mag
())
<=
Numeric
::
double_epsilon
)
{
return
M_PI
*
R
*
H
/
fp
*
(
1.
-
H
/
(
3.
*
fp
*
R
));
return
M_PI
*
R
*
H
*
H
/
fp
*
(
1.
-
H
/
(
3.
*
fp
*
R
));
}
else
{
...
...
This diff is collapsed.
Click to expand it.
Tests/UnitTests/TestCore/FormFactorTest.h
+
2
−
1
View file @
aafdf3c4
...
...
@@ -447,7 +447,8 @@ TEST_F(FormFactorTest, Spheroid)
double
radius
=
3.
;
double
flattening
=
1.5
;
double
total_height
=
2.
*
flattening
*
radius
;
double
volume
=
M_PI
*
radius
*
height
/
flattening
*
(
1.
-
height
/
(
3.
*
flattening
*
radius
));
double
volume
=
M_PI
*
radius
*
height
*
height
/
flattening
*
(
1.
-
height
/
(
3.
*
flattening
*
radius
));
FormFactorSpheroid
spheroid
(
radius
,
height
,
flattening
);
...
...
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