Commit 477df3d4a76198b76d03a3ed6558e257b79d1e1c
1 parent
0cd31073
Exists in
master
Fix error with twisted pair cable condcutor internal impedance
Showing
4 changed files
with
16 additions
and
1 deletions
Show diff stats
SRC/CABLE_MODULES/twisted_pair.F90
| @@ -46,6 +46,7 @@ | @@ -46,6 +46,7 @@ | ||
| 46 | ! | 46 | ! |
| 47 | ! started 12/4/201 CJS | 47 | ! started 12/4/201 CJS |
| 48 | ! 16/11/2017 CJS Include network synthesis process to replace s-domain transfer functions | 48 | ! 16/11/2017 CJS Include network synthesis process to replace s-domain transfer functions |
| 49 | +! 21/12/2023: fix error on cable%conductor_impedance(2)%Resistance_multiplication_factor | ||
| 49 | ! | 50 | ! |
| 50 | ! | 51 | ! |
| 51 | SUBROUTINE twisted_pair_set_parameters(cable) | 52 | SUBROUTINE twisted_pair_set_parameters(cable) |
| @@ -288,7 +289,7 @@ IMPLICIT NONE | @@ -288,7 +289,7 @@ IMPLICIT NONE | ||
| 288 | cable%conductor_impedance(2)%impedance_model_type=impedance_model_type_cylindrical_with_conductivity | 289 | cable%conductor_impedance(2)%impedance_model_type=impedance_model_type_cylindrical_with_conductivity |
| 289 | cable%conductor_impedance(2)%radius=rw | 290 | cable%conductor_impedance(2)%radius=rw |
| 290 | cable%conductor_impedance(2)%conductivity=sigma | 291 | cable%conductor_impedance(2)%conductivity=sigma |
| 291 | - cable%conductor_impedance(2)%Resistance_multiplication_factor=1.5d0 | 292 | + cable%conductor_impedance(2)%Resistance_multiplication_factor=0.5d0 |
| 292 | 293 | ||
| 293 | CALL deallocate_Sfilter(epsr) | 294 | CALL deallocate_Sfilter(epsr) |
| 294 | 295 |
SRC/cable_bundle_model_builder.F90
| @@ -77,6 +77,7 @@ | @@ -77,6 +77,7 @@ | ||
| 77 | ! 24/2/2017 CJS Allow the input name to include a path i.e. the _spec file does not need to be local. | 77 | ! 24/2/2017 CJS Allow the input name to include a path i.e. the _spec file does not need to be local. |
| 78 | ! 13/3/2018 CJS Add flag for direct/ iterative matrix solver in Laplace solution and inf/finite ground plane | 78 | ! 13/3/2018 CJS Add flag for direct/ iterative matrix solver in Laplace solution and inf/finite ground plane |
| 79 | ! 19/6/2018 CJS Add flag for Neumann/ Asymptotic boundary condition in Laplace solver. Default is Neumann | 79 | ! 19/6/2018 CJS Add flag for Neumann/ Asymptotic boundary condition in Laplace solver. Default is Neumann |
| 80 | +! 21/12/2023: Trap the special case of a tristed pair in free space which needs a special process... | ||
| 80 | ! | 81 | ! |
| 81 | PROGRAM cable_bundle_model_builder | 82 | PROGRAM cable_bundle_model_builder |
| 82 | 83 | ||
| @@ -404,6 +405,19 @@ logical :: must_use_laplace | @@ -404,6 +405,19 @@ logical :: must_use_laplace | ||
| 404 | 405 | ||
| 405 | end do ! read the next cable file in the bundle | 406 | end do ! read the next cable file in the bundle |
| 406 | 407 | ||
| 408 | +! 21/12/2023: Check for the special case of a tristed pair in free space which needs | ||
| 409 | +! a special process... | ||
| 410 | + | ||
| 411 | + if (bundle_spec%n_cables.Eq.1) then | ||
| 412 | + cable=1 | ||
| 413 | + if (bundle_spec%cable(cable)%cable_type.EQ.cable_geometry_type_twisted_pair) then | ||
| 414 | + run_status='ERROR: twisted pair cable in free space with no other conductors. Model this using two cylindrical wires' | ||
| 415 | + CALL write_program_status() | ||
| 416 | + STOP 1 | ||
| 417 | + end if | ||
| 418 | + end if | ||
| 419 | + | ||
| 420 | + | ||
| 407 | ! Check whether Laplace solver must be used | 421 | ! Check whether Laplace solver must be used |
| 408 | 422 | ||
| 409 | if (must_use_laplace.AND.(.NOT.use_Laplace)) then | 423 | if (must_use_laplace.AND.(.NOT.use_Laplace)) then |