From d50cc4f40d0bd1f8f8c327ccf691bce215383875 Mon Sep 17 00:00:00 2001 From: Xuan Sun Date: Wed, 13 Jul 2022 09:53:35 -0700 Subject: [PATCH 1/7] Spyder init --- .spyproject/config/codestyle.ini | 8 ++++++++ .../config/defaults/defaults-codestyle-0.2.0.ini | 5 +++++ .../config/defaults/defaults-encoding-0.2.0.ini | 3 +++ .spyproject/config/defaults/defaults-vcs-0.2.0.ini | 4 ++++ .../config/defaults/defaults-workspace-0.2.0.ini | 6 ++++++ .spyproject/config/encoding.ini | 6 ++++++ .spyproject/config/vcs.ini | 7 +++++++ .spyproject/config/workspace.ini | 12 ++++++++++++ 8 files changed, 51 insertions(+) create mode 100644 .spyproject/config/codestyle.ini create mode 100644 .spyproject/config/defaults/defaults-codestyle-0.2.0.ini create mode 100644 .spyproject/config/defaults/defaults-encoding-0.2.0.ini create mode 100644 .spyproject/config/defaults/defaults-vcs-0.2.0.ini create mode 100644 .spyproject/config/defaults/defaults-workspace-0.2.0.ini create mode 100644 .spyproject/config/encoding.ini create mode 100644 .spyproject/config/vcs.ini create mode 100644 .spyproject/config/workspace.ini diff --git a/.spyproject/config/codestyle.ini b/.spyproject/config/codestyle.ini new file mode 100644 index 0000000..0f54b4c --- /dev/null +++ b/.spyproject/config/codestyle.ini @@ -0,0 +1,8 @@ +[codestyle] +indentation = True +edge_line = True +edge_line_columns = 79 + +[main] +version = 0.2.0 + diff --git a/.spyproject/config/defaults/defaults-codestyle-0.2.0.ini b/.spyproject/config/defaults/defaults-codestyle-0.2.0.ini new file mode 100644 index 0000000..0b95e5c --- /dev/null +++ b/.spyproject/config/defaults/defaults-codestyle-0.2.0.ini @@ -0,0 +1,5 @@ +[codestyle] +indentation = True +edge_line = True +edge_line_columns = 79 + diff --git a/.spyproject/config/defaults/defaults-encoding-0.2.0.ini b/.spyproject/config/defaults/defaults-encoding-0.2.0.ini new file mode 100644 index 0000000..0ce193c --- /dev/null +++ b/.spyproject/config/defaults/defaults-encoding-0.2.0.ini @@ -0,0 +1,3 @@ +[encoding] +text_encoding = utf-8 + diff --git a/.spyproject/config/defaults/defaults-vcs-0.2.0.ini b/.spyproject/config/defaults/defaults-vcs-0.2.0.ini new file mode 100644 index 0000000..ee25483 --- /dev/null +++ b/.spyproject/config/defaults/defaults-vcs-0.2.0.ini @@ -0,0 +1,4 @@ +[vcs] +use_version_control = False +version_control_system = + diff --git a/.spyproject/config/defaults/defaults-workspace-0.2.0.ini b/.spyproject/config/defaults/defaults-workspace-0.2.0.ini new file mode 100644 index 0000000..2a73ab7 --- /dev/null +++ b/.spyproject/config/defaults/defaults-workspace-0.2.0.ini @@ -0,0 +1,6 @@ +[workspace] +restore_data_on_startup = True +save_data_on_exit = True +save_history = True +save_non_project_files = False + diff --git a/.spyproject/config/encoding.ini b/.spyproject/config/encoding.ini new file mode 100644 index 0000000..a17aced --- /dev/null +++ b/.spyproject/config/encoding.ini @@ -0,0 +1,6 @@ +[encoding] +text_encoding = utf-8 + +[main] +version = 0.2.0 + diff --git a/.spyproject/config/vcs.ini b/.spyproject/config/vcs.ini new file mode 100644 index 0000000..fd66eae --- /dev/null +++ b/.spyproject/config/vcs.ini @@ -0,0 +1,7 @@ +[vcs] +use_version_control = False +version_control_system = + +[main] +version = 0.2.0 + diff --git a/.spyproject/config/workspace.ini b/.spyproject/config/workspace.ini new file mode 100644 index 0000000..4d9540a --- /dev/null +++ b/.spyproject/config/workspace.ini @@ -0,0 +1,12 @@ +[workspace] +restore_data_on_startup = True +save_data_on_exit = True +save_history = True +save_non_project_files = False +project_type = 'empty-project-type' +recent_files = [] + +[main] +version = 0.2.0 +recent_files = [] + From 9415f088f618595558c8f54790ebb7cac825ebb9 Mon Sep 17 00:00:00 2001 From: Xuan Sun Date: Thu, 14 Jul 2022 11:21:41 -0700 Subject: [PATCH 2/7] New branch and default updates Created a new document to write function. Updated .gitignore to ignore spyder project inits. --- .gitignore | 1 + add_de_Broglie_wavelength.py | 6 ++++++ 2 files changed, 7 insertions(+) create mode 100644 add_de_Broglie_wavelength.py diff --git a/.gitignore b/.gitignore index 096c8e9..28ce419 100644 --- a/.gitignore +++ b/.gitignore @@ -98,6 +98,7 @@ ENV/ # Spyder project settings .spyderproject +.spyproject # Rope project settings .ropeproject diff --git a/add_de_Broglie_wavelength.py b/add_de_Broglie_wavelength.py new file mode 100644 index 0000000..eff1bcc --- /dev/null +++ b/add_de_Broglie_wavelength.py @@ -0,0 +1,6 @@ +# -*- coding: utf-8 -*- +""" +Created on Thu Jul 14 11:19:59 2022 + +@author: xuans +""" From 027c625b9b92844d750115b88fdc905b92be01b1 Mon Sep 17 00:00:00 2001 From: Xuan Sun Date: Thu, 14 Jul 2022 11:23:06 -0700 Subject: [PATCH 3/7] Moved document into proper directory. --- add_de_Broglie_wavelength.py => hack/add_de_Broglie_wavelength.py | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename add_de_Broglie_wavelength.py => hack/add_de_Broglie_wavelength.py (100%) diff --git a/add_de_Broglie_wavelength.py b/hack/add_de_Broglie_wavelength.py similarity index 100% rename from add_de_Broglie_wavelength.py rename to hack/add_de_Broglie_wavelength.py From 0ab517e132b492b7fc44716e761d4027d6a111d8 Mon Sep 17 00:00:00 2001 From: Xuan Sun Date: Thu, 14 Jul 2022 11:50:49 -0700 Subject: [PATCH 4/7] Added internals of function Added math with fundamental constants to de Broglie wavelength function. Added a validate_quantities to perform initial checks. --- hack/add_de_Broglie_wavelength.py | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/hack/add_de_Broglie_wavelength.py b/hack/add_de_Broglie_wavelength.py index eff1bcc..be9af52 100644 --- a/hack/add_de_Broglie_wavelength.py +++ b/hack/add_de_Broglie_wavelength.py @@ -4,3 +4,19 @@ @author: xuans """ + +import numpy as np + +import astropy.units as u + +from astropy.constants.si import k_B, h, m_e + +from plasmapy.utils.decorators import validate_quantities + +@validate_quantities( + T_e={'can_be_negative': False, 'equivalencies': u.temperature_energy()} +) +def de_Broglie_wavelength(T_e: u.K) -> u.m: + constants = np.sqrt(h**2 / (2 * np.pi * m_e * k_B)) + return constants * 1/np.sqrt(T_e) + From 2e1ba4c5361cc123c8bf63c2a38c027ea4c45a0c Mon Sep 17 00:00:00 2001 From: Xuan Sun Date: Thu, 14 Jul 2022 11:59:34 -0700 Subject: [PATCH 5/7] removed .spyproject This was committed too early. Updated .gitignore and removed on local machine via command line. --- .spyproject/config/codestyle.ini | 8 -------- .../config/defaults/defaults-codestyle-0.2.0.ini | 5 ----- .../config/defaults/defaults-encoding-0.2.0.ini | 3 --- .spyproject/config/defaults/defaults-vcs-0.2.0.ini | 4 ---- .../config/defaults/defaults-workspace-0.2.0.ini | 6 ------ .spyproject/config/encoding.ini | 6 ------ .spyproject/config/vcs.ini | 7 ------- .spyproject/config/workspace.ini | 12 ------------ 8 files changed, 51 deletions(-) delete mode 100644 .spyproject/config/codestyle.ini delete mode 100644 .spyproject/config/defaults/defaults-codestyle-0.2.0.ini delete mode 100644 .spyproject/config/defaults/defaults-encoding-0.2.0.ini delete mode 100644 .spyproject/config/defaults/defaults-vcs-0.2.0.ini delete mode 100644 .spyproject/config/defaults/defaults-workspace-0.2.0.ini delete mode 100644 .spyproject/config/encoding.ini delete mode 100644 .spyproject/config/vcs.ini delete mode 100644 .spyproject/config/workspace.ini diff --git a/.spyproject/config/codestyle.ini b/.spyproject/config/codestyle.ini deleted file mode 100644 index 0f54b4c..0000000 --- a/.spyproject/config/codestyle.ini +++ /dev/null @@ -1,8 +0,0 @@ -[codestyle] -indentation = True -edge_line = True -edge_line_columns = 79 - -[main] -version = 0.2.0 - diff --git a/.spyproject/config/defaults/defaults-codestyle-0.2.0.ini b/.spyproject/config/defaults/defaults-codestyle-0.2.0.ini deleted file mode 100644 index 0b95e5c..0000000 --- a/.spyproject/config/defaults/defaults-codestyle-0.2.0.ini +++ /dev/null @@ -1,5 +0,0 @@ -[codestyle] -indentation = True -edge_line = True -edge_line_columns = 79 - diff --git a/.spyproject/config/defaults/defaults-encoding-0.2.0.ini b/.spyproject/config/defaults/defaults-encoding-0.2.0.ini deleted file mode 100644 index 0ce193c..0000000 --- a/.spyproject/config/defaults/defaults-encoding-0.2.0.ini +++ /dev/null @@ -1,3 +0,0 @@ -[encoding] -text_encoding = utf-8 - diff --git a/.spyproject/config/defaults/defaults-vcs-0.2.0.ini b/.spyproject/config/defaults/defaults-vcs-0.2.0.ini deleted file mode 100644 index ee25483..0000000 --- a/.spyproject/config/defaults/defaults-vcs-0.2.0.ini +++ /dev/null @@ -1,4 +0,0 @@ -[vcs] -use_version_control = False -version_control_system = - diff --git a/.spyproject/config/defaults/defaults-workspace-0.2.0.ini b/.spyproject/config/defaults/defaults-workspace-0.2.0.ini deleted file mode 100644 index 2a73ab7..0000000 --- a/.spyproject/config/defaults/defaults-workspace-0.2.0.ini +++ /dev/null @@ -1,6 +0,0 @@ -[workspace] -restore_data_on_startup = True -save_data_on_exit = True -save_history = True -save_non_project_files = False - diff --git a/.spyproject/config/encoding.ini b/.spyproject/config/encoding.ini deleted file mode 100644 index a17aced..0000000 --- a/.spyproject/config/encoding.ini +++ /dev/null @@ -1,6 +0,0 @@ -[encoding] -text_encoding = utf-8 - -[main] -version = 0.2.0 - diff --git a/.spyproject/config/vcs.ini b/.spyproject/config/vcs.ini deleted file mode 100644 index fd66eae..0000000 --- a/.spyproject/config/vcs.ini +++ /dev/null @@ -1,7 +0,0 @@ -[vcs] -use_version_control = False -version_control_system = - -[main] -version = 0.2.0 - diff --git a/.spyproject/config/workspace.ini b/.spyproject/config/workspace.ini deleted file mode 100644 index 4d9540a..0000000 --- a/.spyproject/config/workspace.ini +++ /dev/null @@ -1,12 +0,0 @@ -[workspace] -restore_data_on_startup = True -save_data_on_exit = True -save_history = True -save_non_project_files = False -project_type = 'empty-project-type' -recent_files = [] - -[main] -version = 0.2.0 -recent_files = [] - From 3455bd66aaa02dc85506e40a0cf80d836e2464de Mon Sep 17 00:00:00 2001 From: Xuan Sun Date: Thu, 14 Jul 2022 12:02:28 -0700 Subject: [PATCH 6/7] Added an alias --- hack/add_de_Broglie_wavelength.py | 1 + 1 file changed, 1 insertion(+) diff --git a/hack/add_de_Broglie_wavelength.py b/hack/add_de_Broglie_wavelength.py index be9af52..1d5d821 100644 --- a/hack/add_de_Broglie_wavelength.py +++ b/hack/add_de_Broglie_wavelength.py @@ -20,3 +20,4 @@ def de_Broglie_wavelength(T_e: u.K) -> u.m: constants = np.sqrt(h**2 / (2 * np.pi * m_e * k_B)) return constants * 1/np.sqrt(T_e) +lambda_e = de_Broglie_wavelength \ No newline at end of file From 4bd49abbc970938275caf6314b8b5b59c1d363aa Mon Sep 17 00:00:00 2001 From: Xuan Sun Date: Thu, 14 Jul 2022 12:04:22 -0700 Subject: [PATCH 7/7] Added newline at end of file as recommended --- hack/add_de_Broglie_wavelength.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hack/add_de_Broglie_wavelength.py b/hack/add_de_Broglie_wavelength.py index 1d5d821..f532c82 100644 --- a/hack/add_de_Broglie_wavelength.py +++ b/hack/add_de_Broglie_wavelength.py @@ -20,4 +20,4 @@ def de_Broglie_wavelength(T_e: u.K) -> u.m: constants = np.sqrt(h**2 / (2 * np.pi * m_e * k_B)) return constants * 1/np.sqrt(T_e) -lambda_e = de_Broglie_wavelength \ No newline at end of file +lambda_e = de_Broglie_wavelength