Skip to content

[com1DFA]: Add options for computing resistance (especially dealing with hEff) #993

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
fso42 merged 2 commits into from
Dec 19, 2024
Merged

[com1DFA]: Add options for computing resistance (especially dealing with hEff) #993

fso42 merged 2 commits into from
Dec 19, 2024

Conversation

@PaulaSp3
Copy link
Contributor

@PaulaSp3 PaulaSp3 commented Jun 25, 2024 •
edited
Loading

added options:

  1. (as before) hEff = min(h, h_res)
  2. hEff = const and included in parameter cResH
  3. add to option 1 a Coulomb-term
  4. add to option 2 a Coulomb-term

the options are for experimental tests, we should remove those that are unnecessary.

** Update **
options 3 and 4 are deleted

@pep8speaks
Copy link

pep8speaks commented Jun 25, 2024 •
edited
Loading

Hello @PaulaSp3! Thanks for updating this PR.

Line 2868:121: E501 line too long (132 > 120 characters)
Line 1311:59: E251 unexpected spaces around keyword / parameter equals
Line 1311:57: E251 unexpected spaces around keyword / parameter equals
Line 1311:51: E231 missing whitespace after ','
Line 1126:56: E231 missing whitespace after ','
Line 1125:40: E711 comparison to None should be 'if cond is None:'

Line 642:1: W293 blank line contains whitespace
Line 596:1: E305 expected 2 blank lines after class or function definition, found 1
Line 388:33: E712 comparison to True should be 'if cond is True:' or 'if cond:'
Line 387:72: E225 missing whitespace around operator
Line 386:22: E225 missing whitespace around operator
Line 369:69: E225 missing whitespace around operator
Line 368:73: E225 missing whitespace around operator
Line 357:121: E501 line too long (125 > 120 characters)
Line 355:121: E501 line too long (179 > 120 characters)
Line 355:19: E127 continuation line over-indented for visual indent
Line 354:121: E501 line too long (146 > 120 characters)
Line 352:33: E712 comparison to False should be 'if cond is False:' or 'if not cond:'
Line 351:72: E225 missing whitespace around operator
Line 350:22: E225 missing whitespace around operator
Line 336:39: E225 missing whitespace around operator
Line 329:69: E225 missing whitespace around operator
Line 328:73: E225 missing whitespace around operator
Line 320:59: E241 multiple spaces after ','
Line 317:121: E501 line too long (125 > 120 characters)
Line 315:121: E501 line too long (179 > 120 characters)
Line 315:19: E127 continuation line over-indented for visual indent
Line 314:121: E501 line too long (146 > 120 characters)
Line 312:33: E712 comparison to False should be 'if cond is False:' or 'if not cond:'
Line 311:72: E225 missing whitespace around operator
Line 310:22: E225 missing whitespace around operator
Line 291:121: E501 line too long (126 > 120 characters)
Line 289:121: E501 line too long (179 > 120 characters)
Line 289:19: E127 continuation line over-indented for visual indent
Line 288:121: E501 line too long (146 > 120 characters)
Line 286:33: E712 comparison to True should be 'if cond is True:' or 'if cond:'
Line 285:72: E225 missing whitespace around operator
Line 284:22: E225 missing whitespace around operator
Line 269:38: E225 missing whitespace around operator
Line 253:121: E501 line too long (131 > 120 characters)
Line 226:121: E501 line too long (121 > 120 characters)
Line 224:121: E501 line too long (179 > 120 characters)
Line 224:19: E127 continuation line over-indented for visual indent
Line 223:121: E501 line too long (146 > 120 characters)
Line 219:43: E241 multiple spaces after ','
Line 218:91: E241 multiple spaces after ','
Line 217:121: E501 line too long (121 > 120 characters)
Line 155:5: E265 block comment should start with '# '
Line 136:5: E265 block comment should start with '# '
Line 110:1: W293 blank line contains whitespace

Line 783:44: W291 trailing whitespace
Line 782:37: W291 trailing whitespace
Line 782:24: E127 continuation line over-indented for visual indent
Line 765:43: W291 trailing whitespace
Line 764:37: W291 trailing whitespace
Line 764:24: E127 continuation line over-indented for visual indent
Line 747:43: W291 trailing whitespace
Line 746:37: W291 trailing whitespace
Line 746:24: E127 continuation line over-indented for visual indent
Line 696:44: W291 trailing whitespace
Line 695:35: W291 trailing whitespace
Line 695:24: E127 continuation line over-indented for visual indent
Line 233:37: E711 comparison to None should be 'if cond is None:'
Line 192:37: E711 comparison to None should be 'if cond is None:'

Comment last updated at 2024-12-19 13:54:19 UTC

@PaulaSp3 PaulaSp3 requested review from awirb and fso42 June 25, 2024 11:16
fso42
fso42 requested changes Jul 1, 2024
View reviewed changes
fso42
fso42 requested changes Jul 1, 2024
View reviewed changes
Copy link
Contributor

@fso42 fso42 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please look into the failing pytests

@fso42 fso42 self-assigned this Jul 1, 2024
@fso42 fso42 added the enhancement New feature or request label Jul 1, 2024
@fso42 fso42 removed their assignment Jul 2, 2024
@PaulaSp3 PaulaSp3 self-assigned this Jul 3, 2024
@PaulaSp3 PaulaSp3 force-pushed the PS_ResistanceParameter_options branch 2 times, most recently from 7eb008b to fa3bb39 Compare July 10, 2024 14:25
@PaulaSp3 PaulaSp3 force-pushed the PS_ResistanceParameter_options branch from cb4d726 to 43f00df Compare July 11, 2024 09:10
@fso42 fso42 force-pushed the PS_ResistanceParameter_options branch from ecdbf48 to 8d40cc2 Compare August 12, 2024 08:21
@PaulaSp3 PaulaSp3 force-pushed the PS_ResistanceParameter_options branch 3 times, most recently from 44bba50 to 5fdaf82 Compare December 9, 2024 13:14
awirb
awirb approved these changes Dec 10, 2024
View reviewed changes
@PaulaSp3 PaulaSp3 force-pushed the PS_ResistanceParameter_options branch 2 times, most recently from 0dd1694 to f488ba6 Compare December 16, 2024 07:48
@fso42 fso42 added this to the Version 1.10 milestone Dec 19, 2024
@fso42 fso42 unassigned awirb and PaulaSp3 Dec 19, 2024
PaulaSp3 and others added 2 commits December 19, 2024 14:53
@PaulaSp3 @fso42
Add options for ResistanceModel
b216e1b 
Add resistance model options

Add Resistance Force options

Add Resistance force models

fix bugs, additional muCoulomb for resistance

answer to pep8speaks

answer to pep8speaks

use resModel.lower()

adjust tests

adjust tests

short and incomplete docu about resistance models

fix bug

minor fix in comment
@PaulaSp3 @fso42
Delete resistance options with coulomb term
7a4d852 
  - Update docs/theoryCom1DFA.rst
  - Remove report files
@fso42 fso42 force-pushed the PS_ResistanceParameter_options branch from 501be6d to 7a4d852 Compare December 19, 2024 13:54
@qlty-cloud-legacy
Copy link

qlty-cloud-legacy bot commented Dec 19, 2024

Code Climate has analyzed commit 7a4d852 and detected 0 issues on this pull request.

The test coverage on the diff in this pull request is 95.0% (50% is the threshold).

This pull request will bring the total coverage in the repository to 69.5%.

View more on Code Climate.

@fso42
Copy link
Contributor

fso42 commented Dec 19, 2024

Standardtests ok, apart from known (KOT and PFA)

@fso42 fso42 merged commit 0bda3a8 into master Dec 19, 2024
4 checks passed
@fso42 fso42 deleted the PS_ResistanceParameter_options branch December 19, 2024 15:48
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@fso42 fso42 fso42 approved these changes

@awirb awirb awirb approved these changes

Assignees

@fso42 fso42

Labels

enhancement New feature or request

Projects

None yet

Milestone

Version 1.10

Development

Successfully merging this pull request may close these issues.

5 participants

@PaulaSp3 @pep8speaks @fso42 @awirb