Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
92 commits
Select commit Hold shift + click to select a range
adf60ba
Adds history_interaction_test, which tests the interaction between tw…
jackhamel16 Jun 9, 2017
49ebd2d
changed name of the test in history-interaction_test to history_inter…
jackhamel16 Jun 12, 2017
f30792a
added analytic values to history_interaction_test and used boost to c…
jackhamel16 Jun 14, 2017
bed4f13
Merge pull request #2 from jackhamel16/master
jackhamel16 Jun 14, 2017
1145078
Revert "Merge pull request #1 from jackhamel16/development"
jackhamel16 Jun 14, 2017
fc430b8
Merge pull request #3 from jackhamel16/revert-2-master
jackhamel16 Jun 14, 2017
7cda2f4
Merge pull request #4 from jackhamel16/development
jackhamel16 Jun 14, 2017
012ed44
Ran Clang-format on history_interaction_test.cpp.
jackhamel16 Jun 15, 2017
431fc62
Merge branch 'development' of github.com:jackhamel16/QuEST into devel…
jackhamel16 Jun 15, 2017
d888a57
Merge pull request #10 from jackhamel16/development
jackhamel16 Jun 15, 2017
ffcb612
Move integrator stuff to separate dir
rayhem Jun 21, 2017
48022b3
Flesh out RHS 'interface'
rayhem Jun 21, 2017
e3165b1
(WIP) Begin templating integrator
rayhem Jun 21, 2017
9d3fd6c
(WIP) Rejigger RHS to use history array
rayhem Jun 21, 2017
a142116
Move History stuff to integrator
rayhem Jun 21, 2017
0a50779
Move history code into .h file (due to imminent template)
rayhem Jun 21, 2017
8f09b65
Correctly template History stuff
rayhem Jun 21, 2017
972388e
Correctly populate history (deriv) using RHS
rayhem Jun 21, 2017
598eb02
(WIP) Template integrator over solution type
rayhem Jun 21, 2017
6180c5f
(WIP) Swap simulation code to use new History objects
rayhem Jun 21, 2017
3b65d00
Add (template) headers to build manifest
rayhem Jun 21, 2017
ebb1e8c
Include History with RHS
rayhem Jun 21, 2017
185d2ef
Test construction of History object
rayhem Jun 21, 2017
c95f575
Add Shape fixture for History dimensions
rayhem Jun 21, 2017
1de1200
Add method to fill History with value
rayhem Jun 22, 2017
94c7689
Add numeric integration test
rayhem Jun 22, 2017
9ed9f70
Use a unique_ptr to bring RHS into integrator
rayhem Jun 22, 2017
2effb86
pulled rhs_refactor into llg_dev
jackhamel16 Jun 22, 2017
cd80eb7
Merge branch 'development' into rhs_refactor
rayhem Jun 23, 2017
a59b334
added a complex ode rhs which still needs an equation, added a test f…
jackhamel16 Jun 23, 2017
c4964ce
Pass evaluatable RHS function to ode_rhs
rayhem Jun 23, 2017
363200b
Make default return of semidisk complex
rayhem Jun 23, 2017
85479c6
adds llg_rhs class based on Integrator::RHS template
jackhamel16 Jun 26, 2017
d6be3a9
Pass array of rhs funcs to RHS() objects
rayhem Jun 26, 2017
212a3e0
Properly type rhs functions
rayhem Jun 26, 2017
2fd7eb8
Revert "Properly type rhs functions"
rayhem Jun 26, 2017
14ddd3d
Revert "Pass array of rhs funcs to RHS() objects"
rayhem Jun 26, 2017
2ea2e67
Use vector of rhs functions for ODE
rayhem Jun 26, 2017
02d5904
(WIP) Playing with propagation redesign
rayhem Jun 27, 2017
cf31bc1
Use CRTP to maintain fixed- and rotating-frame propagators with corre…
rayhem Jun 27, 2017
4235a91
(WIP) Add fixed & rotating frame propagator tests
rayhem Jun 27, 2017
be7ed69
Check CRTP dyads against old GreenFunction code
rayhem Jun 27, 2017
ba4ac41
Swap out RotatingGreenFunction for crtp'd RotatingFramePropagator
rayhem Jun 27, 2017
e93012f
Merge branch 'crtp' into rhs_refactor
rayhem Jun 27, 2017
ddcc2b6
(WIP) Remove old GreenFunction stuff
rayhem Jun 27, 2017
c2b5aa8
Rename interpolation weights => evaluations
rayhem Jun 28, 2017
6408e71
adds class for magnetic particles analagous to quantum dot class. Ac…
jackhamel16 Jun 28, 2017
2bac43d
Don't bin-pack arguments
rayhem Jun 28, 2017
bf20a1c
Develop BlochRHS type
rayhem Jun 28, 2017
29ea0ad
Remove "propagation" dir
rayhem Jun 29, 2017
e67f3b2
Build BlochRHS and integrate with solver code
rayhem Jun 29, 2017
a6e33c3
Write new history table to file after sim
rayhem Jun 29, 2017
b9e2c2b
Merge branch 'rhs_refactor' of https://github.com/cglosser/QuEST into…
jackhamel16 Jun 29, 2017
1dcdd61
made pulse agnostic to the type of field and add a cos term for non-r…
jackhamel16 Jun 29, 2017
2fb875c
changed interactions.h to handle vectors and changed the pulse_intera…
jackhamel16 Jun 29, 2017
2559623
mass changes to overall code to implement llg behavior over bloch.
jackhamel16 Jul 4, 2017
30ae4e8
Merge pull request #26 from jackhamel16/llg_dev
jackhamel16 Jul 4, 2017
5544692
added mp.txt. it is a file with three magnetic particles in it
jackhamel16 Jul 4, 2017
99d3758
Merge pull request #27 from jackhamel16/llg_dev
jackhamel16 Jul 4, 2017
50b4bd8
fixed warning messages by specifying a type qualifier in history_inte…
jackhamel16 Jul 6, 2017
e2b1699
Merge pull request #28 from jackhamel16/llg_dev
jackhamel16 Jul 6, 2017
80b81ca
removed many unecessary files and removed outdated/incomplete tests
jackhamel16 Jul 10, 2017
81e1e58
Merge pull request #29 from jackhamel16/llg_dev
jackhamel16 Jul 14, 2017
eca8ab3
adds unfinished history interaction test
jackhamel16 Jul 14, 2017
7efe722
Merge pull request #30 from jackhamel16/llg_dev
jackhamel16 Jul 14, 2017
d2390e3
(WIP) Constructing vector-valued history interaction test
rayhem Jul 14, 2017
b81fc03
Replaced history_interaction Greens function with corrected version. …
jackhamel16 Jul 18, 2017
113e2f2
Added analytic test to compare history_interaction to.
jackhamel16 Jul 19, 2017
7349079
Changed r_matrix cross product in history interaction test to a cross…
jackhamel16 Jul 19, 2017
121526a
removed matrix multiplication from green_function.h and added a cross…
jackhamel16 Jul 19, 2017
23cc844
Removed matrix multiplication from green_function.h and added a cross…
jackhamel16 Jul 19, 2017
85c4a30
changed the greens function according to a recalculation using differ…
jackhamel16 Jul 20, 2017
e71e864
Reworked pulse interaction test to test magnetic particle and pulse i…
jackhamel16 Jul 25, 2017
b62c552
changed the constants in the history interaction, its corresponding t…
jackhamel16 Jul 26, 2017
f66fc29
Moved the normalization of field_orientation into the operator() func…
jackhamel16 Aug 10, 2017
9129c60
corrected coefs calculation
jackhamel16 Sep 8, 2017
278c892
Corrected the dyadic green's function and subsequent code changes. M…
jackhamel16 Sep 14, 2017
3f8d4c4
Moved the demagnetization term to self_interaction.h. this fixed a b…
jackhamel16 Oct 2, 2017
695805a
removed self-interaction from history interaction test and comparing …
jackhamel16 Oct 17, 2017
6451c54
corrected a few errors in llg_test.cpp
jackhamel16 Oct 17, 2017
a9752d7
added an Euler integrator to swap with PC integrator. It current bre…
jackhamel16 Oct 25, 2017
21fa378
called std::move on the unique ptr to rhs_functions. Prevents runnin…
jackhamel16 Dec 14, 2017
cdb7673
Removed comments from src/CMakelists.txt
jackhamel16 Dec 14, 2017
bcb0d6d
Added factor of -4pi to self_interaction term
jackhamel16 Dec 21, 2017
873e5f4
fixed bug where return statement was inside the for loop.
jackhamel16 Jan 2, 2018
7ba1bfc
fixed bug where return statement was inside the for loop.
jackhamel16 Jan 2, 2018
63580be
Made necessary changes to convert to SI units from Gaussian.
jackhamel16 Jan 2, 2018
093834d
Updated example files to fit with magnetic particles in SI units
jackhamel16 Jan 2, 2018
2ba2177
Merge branch 'master' into llg_dev
jackhamel16 Jan 2, 2018
7bdc3aa
Merge pull request #13 from jackhamel16/llg_dev
jackhamel16 Jan 2, 2018
6acab6d
Changed initialize_past function in history.h to handle any M specifi…
jackhamel16 Jan 2, 2018
aff7c2a
Merge branch 'llg_dev'
jackhamel16 Jan 2, 2018
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .clang-format
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ AlwaysBreakAfterReturnType: None
AlwaysBreakBeforeMultilineStrings: true
AlwaysBreakTemplateDeclarations: true
BinPackArguments: true
BinPackParameters: true
BinPackParameters: false
BraceWrapping:
AfterClass: false
AfterControlStatement: false
Expand Down
4 changes: 3 additions & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,9 @@ enable_cxx_compiler_flag_if_supported("-Wextra")
enable_cxx_compiler_flag_if_supported("-fdiagnostics-color=auto")
enable_cxx_compiler_flag_if_supported("-pedantic")

set(CPP_FEATURES cxx_auto_type cxx_constexpr cxx_delegating_constructors cxx_lambdas cxx_range_for cxx_strong_enums)
# Require a C++14 standard
set(CMAKE_CXX_STANDARD 14)
set(CMAKE_CXX_STANDARD_REQUIRED ON)

add_library(quest "")
target_compile_features(quest PRIVATE ${CPP_FEATURES})
Expand Down
1,026 changes: 2 additions & 1,024 deletions examples/dots.cfg

Large diffs are not rendered by default.

16 changes: 8 additions & 8 deletions examples/input.cfg
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
[parameters]
num_particles = 2
total_time = 20
timestep = 0.5e-2
interpolation_order = 3
num_particles = 2
total_time = 1e-10
timestep = 1e-15
interpolation_order = 5
[constants]
c0 = 299.792458 # um/ps
hbar = 0.65821193 # meV*ps
mu0 = 2.0133545e-04 # meV ps^2/(e^2 um)
laser_frequency = 2278.9013 # rad/ps
c0 = 2.99792458e8 # m/s
hbar = 6.62607004e-34 # m^2 kg/s
e0 = 8.85418782e-12 #s^4/m^3 A^2/kg
laser_frequency = 6.283185307e9 #rad/s = 1GHz
2 changes: 1 addition & 1 deletion examples/pulse.cfg
Original file line number Diff line number Diff line change
@@ -1 +1 @@
15589.2260227 5 227.89013 2278.9013 0 0 7.6015964 1 0 0
0000 .5e-10 .2 6.283185307e9 0 1 0 0 0 1
3 changes: 3 additions & 0 deletions mp.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
0 1 1 1 2 3 4 5 6
3 2 1 1 1 1 6 5 4
4 4 0 2 3 5 1 2 3
9 changes: 3 additions & 6 deletions src/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,22 +1,19 @@
include("${CMAKE_CURRENT_LIST_DIR}/integrator/CMakeLists.txt")
include("${CMAKE_CURRENT_LIST_DIR}/interactions/CMakeLists.txt")

target_sources(quest
PRIVATE
"${CMAKE_CURRENT_LIST_DIR}/common.h"
"${CMAKE_CURRENT_LIST_DIR}/configuration.cpp"
"${CMAKE_CURRENT_LIST_DIR}/configuration.h"
"${CMAKE_CURRENT_LIST_DIR}/history.cpp"
"${CMAKE_CURRENT_LIST_DIR}/history.h"
"${CMAKE_CURRENT_LIST_DIR}/integrator.cpp"
"${CMAKE_CURRENT_LIST_DIR}/integrator.h"
"${CMAKE_CURRENT_LIST_DIR}/lagrange_set.cpp"
"${CMAKE_CURRENT_LIST_DIR}/lagrange_set.h"
"${CMAKE_CURRENT_LIST_DIR}/math_utils.cpp"
"${CMAKE_CURRENT_LIST_DIR}/math_utils.h"
"${CMAKE_CURRENT_LIST_DIR}/pulse.cpp"
"${CMAKE_CURRENT_LIST_DIR}/pulse.h"
"${CMAKE_CURRENT_LIST_DIR}/quantum_dot.cpp"
"${CMAKE_CURRENT_LIST_DIR}/quantum_dot.h"
"${CMAKE_CURRENT_LIST_DIR}/magnetic_particle.cpp"
"${CMAKE_CURRENT_LIST_DIR}/magnetic_particle.h"
)

add_executable(quest-bin "")
Expand Down
2 changes: 1 addition & 1 deletion src/configuration.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ po::variables_map parse_configs(int argc, char *argv[]) {
constants_description.add_options()
("constants.c0", po::value<double>(&config.c0)->required(), "speed of light in vacuum")
("constants.hbar", po::value<double>(&config.hbar)->required(), "reduced Planck constant")
("constants.mu0", po::value<double>(&config.mu0)->required(), "vacuum permeability")
("constants.e0", po::value<double>(&config.e0)->required(), "vacuum permittivity")
("constants.laser_frequency", po::value<double>(&config.omega)->required(), "(angular) frequency of incident pulse")
;

Expand Down
2 changes: 1 addition & 1 deletion src/configuration.h
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
struct Configuration {
int num_particles;
int num_timesteps;
double c0, hbar, mu0, omega;
double c0, hbar, e0, omega;
double dt, total_time;
int interpolation_order;
std::string qd_path, pulse_path;
Expand Down
34 changes: 0 additions & 34 deletions src/history.cpp

This file was deleted.

23 changes: 0 additions & 23 deletions src/history.h

This file was deleted.

216 changes: 0 additions & 216 deletions src/integrator.cpp

This file was deleted.

Loading