haskal
/
kicad
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

pcb_calculator: code rework: rename "murC" member by "m_murC"

This commit is contained in:
jean-pierre charras 2018-06-07 15:34:13 +02:00
parent 77477e4f10
commit da0f956ca5
9 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pcb_calculator/transline/c_microstrip.cpp
View File

@ -163,7 +163,7 @@ void C_MICROSTRIP::compute_single_line()
//aux_ms->t = t; //aux_ms->t = t;
aux_ms->ht = 1e12; /* arbitrarily high */ aux_ms->ht = 1e12; /* arbitrarily high */
aux_ms->m_freq = m_freq; aux_ms->m_freq = m_freq;
aux_ms->murC = murC; aux_ms->m_murC = m_murC;
aux_ms->microstrip_Z0(); aux_ms->microstrip_Z0();
aux_ms->dispersion(); aux_ms->dispersion();
} }
@ -836,7 +836,7 @@ void C_MICROSTRIP::calc()
void C_MICROSTRIP::get_c_microstrip_sub() void C_MICROSTRIP::get_c_microstrip_sub()
{ {
er = getProperty( EPSILONR_PRM ); er = getProperty( EPSILONR_PRM );
murC = getProperty( MURC_PRM ); m_murC = getProperty( MURC_PRM );
h = getProperty( H_PRM ); h = getProperty( H_PRM );
ht = getProperty( H_T_PRM ); ht = getProperty( H_T_PRM );
t = getProperty( T_PRM ); t = getProperty( T_PRM );

4
pcb_calculator/transline/coax.cpp
View File

@ -63,7 +63,7 @@ void COAX::get_coax_sub()
{ {
er = getProperty( EPSILONR_PRM ); er = getProperty( EPSILONR_PRM );
mur = getProperty( MUR_PRM ); mur = getProperty( MUR_PRM );
murC = getProperty( MURC_PRM ); m_murC = getProperty( MURC_PRM );
tand = getProperty( TAND_PRM ); tand = getProperty( TAND_PRM );
m_sigma = 1.0 / getProperty( RHO_PRM ); m_sigma = 1.0 / getProperty( RHO_PRM );
} }
@ -116,7 +116,7 @@ double COAX::alphac_coax()
{ {
double ac, Rs; double ac, Rs;
Rs = sqrt( M_PI * m_freq * murC * MU0 / m_sigma ); Rs = sqrt( M_PI * m_freq * m_murC * MU0 / m_sigma );
ac = sqrt( er ) * ( ( (1 / din) + (1 / dout) ) / log( dout / din ) ) * (Rs / ZF0); ac = sqrt( er ) * ( ( (1 / din) + (1 / dout) ) / log( dout / din ) ) * (Rs / ZF0);
ac = ac * 20.0 / log( 10.0 ); ac = ac * 20.0 / log( 10.0 );
return ac; return ac;

2
pcb_calculator/transline/coplanar.cpp
View File

@ -69,7 +69,7 @@ void COPLANAR::getProperties()
t = getProperty( T_PRM ); t = getProperty( T_PRM );
er = getProperty( EPSILONR_PRM ); er = getProperty( EPSILONR_PRM );
murC = getProperty( MURC_PRM ); m_murC = getProperty( MURC_PRM );
tand = getProperty( TAND_PRM ); tand = getProperty( TAND_PRM );
m_sigma = 1.0 / getProperty( RHO_PRM ); m_sigma = 1.0 / getProperty( RHO_PRM );
Z0 = getProperty( Z0_PRM ); Z0 = getProperty( Z0_PRM );

2
pcb_calculator/transline/microstrip.cpp
View File

@ -467,7 +467,7 @@ void MICROSTRIP::get_microstrip_sub()
ht = getProperty( H_T_PRM ); ht = getProperty( H_T_PRM );
t = getProperty( T_PRM ); t = getProperty( T_PRM );
m_sigma = 1.0 / getProperty( RHO_PRM ); m_sigma = 1.0 / getProperty( RHO_PRM );
murC = getProperty( MURC_PRM ); m_murC = getProperty( MURC_PRM );
tand = getProperty( TAND_PRM ); tand = getProperty( TAND_PRM );
rough = getProperty( ROUGH_PRM ); rough = getProperty( ROUGH_PRM );
} }

4
pcb_calculator/transline/rectwaveguide.cpp
View File

@ -93,7 +93,7 @@ double RECTWAVEGUIDE::alphac()
double ac; double ac;
short m, n, mmax, nmax; short m, n, mmax, nmax;
Rs = sqrt( M_PI * m_freq * murC * MU0 / m_sigma ); Rs = sqrt( M_PI * m_freq * m_murC * MU0 / m_sigma );
ac = 0.0; ac = 0.0;
mmax = (int) floor( m_freq / fc( 1, 0 ) ); mmax = (int) floor( m_freq / fc( 1, 0 ) );
nmax = mmax; nmax = mmax;
@ -189,7 +189,7 @@ void RECTWAVEGUIDE::get_rectwaveguide_sub()
{ {
er = getProperty( EPSILONR_PRM ); er = getProperty( EPSILONR_PRM );
mur = getProperty( MUR_PRM ); mur = getProperty( MUR_PRM );
murC = getProperty( MURC_PRM ); m_murC = getProperty( MURC_PRM );
m_sigma = 1.0 / getProperty( RHO_PRM ); m_sigma = 1.0 / getProperty( RHO_PRM );
tand = getProperty( TAND_PRM ); tand = getProperty( TAND_PRM );
tanm = getProperty( TANM_PRM ); tanm = getProperty( TANM_PRM );

2
pcb_calculator/transline/stripline.cpp
View File

@ -60,7 +60,7 @@ void STRIPLINE::getProperties()
t = getProperty( T_PRM ); t = getProperty( T_PRM );
er = getProperty( EPSILONR_PRM ); er = getProperty( EPSILONR_PRM );
murC = getProperty( MURC_PRM ); m_murC = getProperty( MURC_PRM );
tand = getProperty( TAND_PRM ); tand = getProperty( TAND_PRM );
m_sigma = 1.0 / getProperty( RHO_PRM ); m_sigma = 1.0 / getProperty( RHO_PRM );
Z0 = getProperty( Z0_PRM ); Z0 = getProperty( Z0_PRM );

4
pcb_calculator/transline/transline.cpp
View File

@ -61,7 +61,7 @@ bool IsSelectedInDialog( enum PRMS_ID aPrmId );
/* Constructor creates a transmission line instance. */ /* Constructor creates a transmission line instance. */
TRANSLINE::TRANSLINE() TRANSLINE::TRANSLINE()
{ {
murC = 1.0; m_murC = 1.0;
m_name = (const char*) 0; m_name = (const char*) 0;
// Initialize these variables mainly to avoid warnings from a static analyzer // Initialize these variables mainly to avoid warnings from a static analyzer
@ -122,7 +122,7 @@ double TRANSLINE::getProperty( enum PRMS_ID aPrmId )
double TRANSLINE::skin_depth() double TRANSLINE::skin_depth()
{ {
double depth; double depth;
depth = 1.0 / sqrt( M_PI * m_freq * murC * MU0 * m_sigma ); depth = 1.0 / sqrt( M_PI * m_freq * m_murC * MU0 * m_sigma );
return depth; return depth;
} }

2
pcb_calculator/transline/transline.h
View File

@ -76,7 +76,7 @@ protected:
double er; /* dielectric constant */ double er; /* dielectric constant */
double tand; /* Dielectric Loss Tangent */ double tand; /* Dielectric Loss Tangent */
double m_sigma; // Conductivity of the metal double m_sigma; // Conductivity of the metal
double murC; /* magnetic permeability of conductor */ double m_murC; /* magnetic permeability of conductor */
double m_skindepth; // Skin depth double m_skindepth; // Skin depth
double skin_depth(); double skin_depth();

2
pcb_calculator/transline/twistedpair.cpp
View File

@ -58,7 +58,7 @@ void TWISTEDPAIR::getProperties()
len = getProperty( PHYS_LEN_PRM ); len = getProperty( PHYS_LEN_PRM );
er = getProperty( EPSILONR_PRM ); er = getProperty( EPSILONR_PRM );
murC = getProperty( MURC_PRM ); m_murC = getProperty( MURC_PRM );
tand = getProperty( TAND_PRM ); tand = getProperty( TAND_PRM );
m_sigma = 1.0 / getProperty( RHO_PRM ); m_sigma = 1.0 / getProperty( RHO_PRM );
twists = getProperty( TWISTEDPAIR_TWIST_PRM ); twists = getProperty( TWISTEDPAIR_TWIST_PRM );