Fix a compil warning and 2 Coverity warnings.

This commit is contained in:
jean-pierre charras 2020-08-07 13:13:25 +02:00
parent 9b6ade6b1c
commit 8005de27c0
3 changed files with 14 additions and 10 deletions

View File

@ -151,6 +151,7 @@ wxString GetVersionInfoData( const wxString& aTitle, bool aHtml, bool aBrief )
#if defined( NGSPICE_BUILD_VERSION ) #if defined( NGSPICE_BUILD_VERSION )
aMsg << indent4 << "ngspice: " << NGSPICE_BUILD_VERSION << eol; aMsg << indent4 << "ngspice: " << NGSPICE_BUILD_VERSION << eol;
#elif defined( NGSPICE_HAVE_CONFIG_H ) #elif defined( NGSPICE_HAVE_CONFIG_H )
#undef HAVE_STRNCASECMP /* is redefined in ngspice/config.h */
#include <ngspice/config.h> #include <ngspice/config.h>
aMsg << indent4 << "ngspice: " << PACKAGE_VERSION << eol; aMsg << indent4 << "ngspice: " << PACKAGE_VERSION << eol;
#else #else

View File

@ -31,6 +31,8 @@
RECTWAVEGUIDE::RECTWAVEGUIDE() : TRANSLINE() RECTWAVEGUIDE::RECTWAVEGUIDE() : TRANSLINE()
{ {
m_Name = "RectWaveGuide"; m_Name = "RectWaveGuide";
fc10 = 1.0; // Cutoff frequency for TE10 mode
Init(); Init();
} }

View File

@ -71,6 +71,7 @@ TRANSLINE::TRANSLINE()
{ {
m_parameters[MURC_PRM] = 1.0; m_parameters[MURC_PRM] = 1.0;
m_Name = nullptr; m_Name = nullptr;
ang_l = 0.0; // Electrical length in angle
Init(); Init();
} }
@ -135,7 +136,7 @@ double TRANSLINE::getProperty( enum PRMS_ID aPrmId )
} }
/** @function getProperties /** @function getProperties
* *
* Get all properties from the UI. Computes some extra ones. * Get all properties from the UI. Computes some extra ones.
**/ **/
void TRANSLINE::getProperties( void ) void TRANSLINE::getProperties( void )
@ -151,7 +152,7 @@ void TRANSLINE::getProperties( void )
m_parameters[SKIN_DEPTH_PRM] = skin_depth(); m_parameters[SKIN_DEPTH_PRM] = skin_depth();
} }
/** @function checkProperties /** @function checkProperties
* *
* Checks the input parameters (ie: negative length). * Checks the input parameters (ie: negative length).
* Does not check for incompatibility between values as this depends on the line shape. * Does not check for incompatibility between values as this depends on the line shape.
**/ **/
@ -219,7 +220,7 @@ void TRANSLINE::synthesize()
/** /**
* @function skin_depth * @function skin_depth
* calculate skin depth * calculate skin depth
* *
* \f$ \frac{1}{\sqrt{ \pi \cdot f \cdot \mu \cdot \sigma }} \f$ * \f$ \frac{1}{\sqrt{ \pi \cdot f \cdot \mu \cdot \sigma }} \f$
*/ */
#include <cstdio> #include <cstdio>
@ -318,14 +319,14 @@ double TRANSLINE::ellipk( double k )
/** /**
* @function minimizeZ0Error1D * @function minimizeZ0Error1D
* *
* Tries to find a parameter that minimizes the error ( on Z0 ). * Tries to find a parameter that minimizes the error ( on Z0 ).
* This function only works with a single parameter. * This function only works with a single parameter.
* Calls @ref calcAnalyze several times until the error is acceptable. * Calls @ref calcAnalyze several times until the error is acceptable.
* While the error is unnacceptable, changes slightly the parameter. * While the error is unnacceptable, changes slightly the parameter.
* *
* This function does not change Z0 / Angl_L. * This function does not change Z0 / Angl_L.
* *
* @param avar Parameter to synthesize * @param avar Parameter to synthesize
* @return 'true' if error < MAX_ERROR, else 'false' * @return 'true' if error < MAX_ERROR, else 'false'
*/ */
@ -407,13 +408,13 @@ bool TRANSLINE::minimizeZ0Error1D( double* aVar )
} }
/** /**
* @function setErrorLevel * @function setErrorLevel
* *
* set an error / warning level for a given parameter. * set an error / warning level for a given parameter.
* *
* @see TRANSLINE_OK * @see TRANSLINE_OK
* @see TRANSLINE_WARNING * @see TRANSLINE_WARNING
* @see TRANSLINE_ERROR * @see TRANSLINE_ERROR
* *
* @param aP parameter * @param aP parameter
* @param aErrorLevel Error level * @param aErrorLevel Error level
*/ */