From 7efc2e003aad62aa4724ee9c7b0be2713b825ab8 Mon Sep 17 00:00:00 2001 From: zachparrott Date: Thu, 2 Dec 2021 14:48:13 -0700 Subject: [PATCH 1/5] fix keyboard mash? --- pyEPR/calcs/back_box_numeric.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyEPR/calcs/back_box_numeric.py b/pyEPR/calcs/back_box_numeric.py index 5f6e298..57e904f 100644 --- a/pyEPR/calcs/back_box_numeric.py +++ b/pyEPR/calcs/back_box_numeric.py @@ -303,4 +303,4 @@ def black_box_hamiltonian_nq(freqs, zmat, ljs, cos_trunc=6, fock_trunc=8, show_f H = black_box_hamiltonian(f0s, ljs, fzpfs, cos_trunc, fock_trunc) return make_dispersive(H, fock_trunc, fzpfs, f0s) -black_box_hamiltonian_nq = black_box_hamiltonian_nqzZ +black_box_hamiltonian_nq = black_box_hamiltonian_nq From 3986ddfd478a70978953eaa37dd38c2f98734e5c Mon Sep 17 00:00:00 2001 From: zachparrott Date: Thu, 2 Dec 2021 14:49:26 -0700 Subject: [PATCH 2/5] local user config --- pyEPR/_config_user.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pyEPR/_config_user.py b/pyEPR/_config_user.py index c1334ce..eca02fe 100644 --- a/pyEPR/_config_user.py +++ b/pyEPR/_config_user.py @@ -21,7 +21,7 @@ # Folder to save result data to. # PLEASE CHANGE THIS - root_dir=r'C:\data-pyEPR', # Not all machines have a D drive so substituting D with C here + root_dir=r'C:\Users\zlp\Documents\data-pyEPR', # Not all machines have a D drive so substituting D with C here # Loss properties of various materials and surfaces dissipation=Dict( @@ -31,7 +31,8 @@ # refs: https://arxiv.org/abs/1308.1743 # http://arxiv.org/pdf/1509.01854.pdf tan_delta_sapp=1e-6, # tan(delta) for bulk surface - epsi=10, # dielectric + # epsi=10, # dielectric + epsi=11.1, # dielectric ################################################## # Surface dielectric From 6b588f953fbba033e35677959a8d4a39411ff473 Mon Sep 17 00:00:00 2001 From: zachparrott Date: Thu, 17 Nov 2022 14:47:04 -0700 Subject: [PATCH 3/5] Match _config_user to upstream pyEPR --- pyEPR/_config_user.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pyEPR/_config_user.py b/pyEPR/_config_user.py index 4ad3e1d..ccc70da 100644 --- a/pyEPR/_config_user.py +++ b/pyEPR/_config_user.py @@ -21,7 +21,7 @@ # Folder to save result data to. # PLEASE CHANGE THIS - root_dir=r'C:\Users\zlp\Documents\data-pyEPR', # Not all machines have a D drive so substituting D with C here + root_dir=r'C:\data-pyEPR', # Not all machines have a D drive so substituting D with C here # Loss properties of various materials and surfaces dissipation=Dict( @@ -32,7 +32,7 @@ # http://arxiv.org/pdf/1509.01854.pdf tan_delta_sapp=1e-6, # tan(delta) for bulk surface # epsi=10, # dielectric - epsi=11.1, # dielectric + epsi=10, # dielectric ################################################## # Surface dielectric From 7a342c379b4775bb2e2e194c2e86a66f1194599d Mon Sep 17 00:00:00 2001 From: zachparrott Date: Thu, 17 Nov 2022 14:50:58 -0700 Subject: [PATCH 4/5] and second fix to upstream.. --- pyEPR/_config_user.py | 1 - 1 file changed, 1 deletion(-) diff --git a/pyEPR/_config_user.py b/pyEPR/_config_user.py index ccc70da..932bcd9 100644 --- a/pyEPR/_config_user.py +++ b/pyEPR/_config_user.py @@ -31,7 +31,6 @@ # refs: https://arxiv.org/abs/1308.1743 # http://arxiv.org/pdf/1509.01854.pdf tan_delta_sapp=1e-6, # tan(delta) for bulk surface - # epsi=10, # dielectric epsi=10, # dielectric ################################################## From 18dbd2443f6c5f094744a09fdae08958b3811f17 Mon Sep 17 00:00:00 2001 From: zachparrott Date: Thu, 17 Nov 2022 14:56:44 -0700 Subject: [PATCH 5/5] Proper name of config file missing in .gitignore --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 08f0b6c..53ea855 100644 --- a/.gitignore +++ b/.gitignore @@ -102,6 +102,7 @@ ENV/ # exclude config pyEPR/config.py +pyEPR/_user_config.py __src__not_incl/ pyEPR/.vscode/ pyEPR/.pylintrc