Asaf branch #55
Merged
Asaf branch #55
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Merge 'master' branch into 'develop' branch
Ideally you wouldn't need to specify if the object is a line/surface/volume, but I didn't found a way to get this from ansys. Also some formatting fixes.
And again, formatting fixes whenever I see one
Allow for quantum analysis for only some of the modes which can now be sent as a list
Fix of Q analysis modes update, print of results is still problamatic
allows to print result and print variation to be used togther where the variation to be printed is give by an integer
zlatko-minev
approved these changes
Oct 11, 2020
| @@ -304,8 +304,8 @@ | |||
| } | |||
| ], | |||
| "source": [ | |||
| "ℰ_total = eprh.calc_energy_electric(volume='AllObjects')\n", | |||
| "ℰ_substr = eprh.calc_energy_electric(volume='substrate')\n", | |||
| "ℰ_total = eprh.calc_energy_electric(obj='AllObjects')\n", | |||
| @@ -233,18 +233,18 @@ def setup_data(self): | |||
| if not self.data_dir.is_dir(): | |||
| self.data_dir.mkdir(parents=True, exist_ok=True) | |||
|
|
|||
| def calc_p_junction_single(self, mode, variation, U_E = None, U_H = None): | |||
| def calc_p_junction_single(self, mode, variation, U_E=None, U_H=None): | |||
| ''' | ||
| This function is used in the case of a single junction only. | ||
| For multiple junctions, see `calc_p_junction`. | ||
|
|
||
| Assumes no lumped capacitive elements. | ||
| ''' | ||
| if U_E == None: |
| @@ -592,15 +598,26 @@ def calc_energy_electric(self, | |||
| B = vecE.conj() | |||
| A = A.dot(B) | |||
| A = A.real() | |||
| A = A.integrate_vol(name=volume) | |||
|
|
|||
| if obj_dims == 1: | |||
| ''' | ||
| if volume != 'Deprecated': | ||
| logger.warning('The use of the "volume" argument is deprecated... use "obj" instead') |
| @@ -631,7 +633,14 @@ def analyze_variation(self, | |||
| # ensuring proper matrix dimensionality when slicing | |||
| junctions = (junctions,) if type(junctions) is int else junctions | |||
|
|
|||
| modes = list(range(self.n_modes)) | |||
| if modes is None: | |||
| modes = list(range(self.n_modes)) | |||
| @@ -645,7 +654,7 @@ def analyze_variation(self, | |||
| # Get matrices | |||
| PJ, SJ, Om, EJ, PHI_zpf, PJ_cap, n_zpf = self.get_epr_base_matrices( | |||
| variation) | |||
| freqs_hfss = self.freqs_hfss[variation].values | |||
| freqs_hfss = self.freqs_hfss[variation].values[(modes)] | |||
There was a problem hiding this comment.
Not sure why brackets parans here arround modes
|
It only worked with the parenthesis, I think it was because it was
expecting a tuple, but it was a while ago and I simply forgot to push the
changes before there was a COVID lockdown here.
…On Sun, Oct 11, 2020 at 7:39 PM Zlatko Minev ***@***.***> wrote:
***@***.**** approved this pull request.
Assuming you have run this code with a=some ansys analysis to check that
it doesn't intrpduce artifcat bugs, im good to merge :) Great jpb
------------------------------
In _tutorial_notebooks/Tutorial 2. Field calculations - dielectric energy
participation ratios (EPRs).ipynb
<#55 (comment)>:
> @@ -304,8 +304,8 @@
}
],
"source": [
- "ℰ_total = eprh.calc_energy_electric(volume='AllObjects')\n",
- "ℰ_substr = eprh.calc_energy_electric(volume='substrate')\n",
+ "ℰ_total = eprh.calc_energy_electric(obj='AllObjects')\n",
Good change
------------------------------
In pyEPR/core_distributed_analysis.py
<#55 (comment)>:
> @@ -233,18 +233,18 @@ def setup_data(self):
if not self.data_dir.is_dir():
self.data_dir.mkdir(parents=True, exist_ok=True)
- def calc_p_junction_single(self, mode, variation, U_E = None, U_H = None):
+ def calc_p_junction_single(self, mode, variation, U_E=None, U_H=None):
Good formatting
------------------------------
In pyEPR/core_distributed_analysis.py
<#55 (comment)>:
> '''
This function is used in the case of a single junction only.
For multiple junctions, see `calc_p_junction`.
Assumes no lumped capacitive elements.
'''
- if U_E == None:
Good check update
------------------------------
In pyEPR/core_distributed_analysis.py
<#55 (comment)>:
> @@ -592,15 +598,26 @@ def calc_energy_electric(self,
B = vecE.conj()
A = A.dot(B)
A = A.real()
- A = A.integrate_vol(name=volume)
+
+ if obj_dims == 1:
Very nice
------------------------------
In pyEPR/core_distributed_analysis.py
<#55 (comment)>:
> '''
+ if volume != 'Deprecated':
+ logger.warning('The use of the "volume" argument is deprecated... use "obj" instead')
Very nice
------------------------------
In pyEPR/core_quantum_analysis.py
<#55 (comment)>:
> @@ -631,7 +633,14 @@ def analyze_variation(self,
# ensuring proper matrix dimensionality when slicing
junctions = (junctions,) if type(junctions) is int else junctions
- modes = list(range(self.n_modes))
+ if modes is None:
+ modes = list(range(self.n_modes))
nice, Long desired update
------------------------------
In pyEPR/core_quantum_analysis.py
<#55 (comment)>:
> @@ -645,7 +654,7 @@ def analyze_variation(self,
# Get matrices
PJ, SJ, Om, EJ, PHI_zpf, PJ_cap, n_zpf = self.get_epr_base_matrices(
variation)
- freqs_hfss = self.freqs_hfss[variation].values
+ freqs_hfss = self.freqs_hfss[variation].values[(modes)]
Not sure why brackets parans here arround modes
—
You are receiving this because you authored the thread.
Reply to this email directly, view it on GitHub
<#55 (review)>,
or unsubscribe
<https://github.com/notifications/unsubscribe-auth/AOD23AZFJTZFVCUEZC6PR5LSKHNURANCNFSM4SLUM3WQ>
.
|
|
Thank you! At the next meeting do you think you can present what these changes do? |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.