Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
MDANSE
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
4
Issues
4
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Environments
Packages & Registries
Packages & Registries
Container Registry
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Scientific Software
MDANSE
Commits
86edec1f
Commit
86edec1f
authored
Feb 27, 2020
by
Remi Perenon
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'bugfix-ndtsf_error' into 'develop'
Bugfix ndtsf error See merge request
!53
parents
91e207b3
f304d47a
Pipeline
#6990
passed with stages
in 15 minutes and 10 seconds
Changes
3
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
7 additions
and
3 deletions
+7
-3
CHANGELOG
CHANGELOG
+1
-0
Data/Jobs_reference_data/ndtsf_reference.nc
Data/Jobs_reference_data/ndtsf_reference.nc
+0
-0
Src/Framework/Jobs/NeutronDynamicTotalStructureFactor.py
Src/Framework/Jobs/NeutronDynamicTotalStructureFactor.py
+6
-3
No files found.
CHANGELOG
View file @
86edec1f
version 1.4.0
--------------
* FIXED issue #49 Some LAMMPS files could not be converted
* FIXED issue #48 There was an error in NDTSF analysis
* FIXED issue #47 GUI converter did not close
* CHANGED (internal) Docker build has been changed
* CHANGED (internal) macOS build has been changed
...
...
Data/Jobs_reference_data/ndtsf_reference.nc
View file @
86edec1f
No preview for this file type
Src/Framework/Jobs/NeutronDynamicTotalStructureFactor.py
View file @
86edec1f
...
...
@@ -210,9 +210,12 @@ class NeutronDynamicTotalStructureFactor(IJob):
self
.
_outputData
[
"f(q,t)_coh_weighted_%s%s"
%
pair
][:]
=
self
.
_outputData
[
"f(q,t)_coh_%s%s"
%
pair
][:]
*
numpy
.
sqrt
(
ci
*
cj
)
*
bi
*
bj
self
.
_outputData
[
"s(q,f)_coh_weighted_%s%s"
%
pair
][:]
=
self
.
_outputData
[
"s(q,f)_coh_%s%s"
%
pair
][:]
*
numpy
.
sqrt
(
ci
*
cj
)
*
bi
*
bj
self
.
_outputData
[
"f(q,t)_coh_total"
][:]
+=
self
.
_outputData
[
"f(q,t)_coh_weighted_%s%s"
%
pair
][:]
self
.
_outputData
[
"s(q,f)_coh_total"
][:]
+=
self
.
_outputData
[
"s(q,f)_coh_weighted_%s%s"
%
pair
][:]
if
pair
[
0
]
==
pair
[
1
]:
# Add a factor 2 if the two elements are different
self
.
_outputData
[
"f(q,t)_coh_total"
][:]
+=
self
.
_outputData
[
"f(q,t)_coh_weighted_%s%s"
%
pair
][:]
self
.
_outputData
[
"s(q,f)_coh_total"
][:]
+=
self
.
_outputData
[
"s(q,f)_coh_weighted_%s%s"
%
pair
][:]
else
:
self
.
_outputData
[
"f(q,t)_coh_total"
][:]
+=
2
*
self
.
_outputData
[
"f(q,t)_coh_weighted_%s%s"
%
pair
][:]
self
.
_outputData
[
"s(q,f)_coh_total"
][:]
+=
2
*
self
.
_outputData
[
"s(q,f)_coh_weighted_%s%s"
%
pair
][:]
# Compute incoherent functions and structure factor
for
element
,
ni
in
nAtomsPerElement
.
items
():
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment