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

sim - allow sources that are both AC and TRAN

This commit is contained in:
Fabien Corona 2023-02-18 02:17:48 +00:00
parent cd1b425a80
commit 754feff5e7
1 changed files with 37 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
eeschema/sim/sim_model_source.cpp
View File

@ -48,17 +48,31 @@ std::string SPICE_GENERATOR_SOURCE::ModelLine( const SPICE_ITEM& aItem ) const
std::string SPICE_GENERATOR_SOURCE::ItemLine( const SPICE_ITEM& aItem ) const std::string SPICE_GENERATOR_SOURCE::ItemLine( const SPICE_ITEM& aItem ) const
{ {
SPICE_ITEM item = aItem; SPICE_ITEM item = aItem;
std::string ac = "";
std::string dc = "";
if( m_model.FindParam( "ac" ) )
ac = m_model.FindParam( "ac" )->value->ToSpiceString();
if( m_model.FindParam( "dc" ) )
dc = m_model.FindParam( "dc" )->value->ToSpiceString();
bool emptyLine = true;
item.modelName = ""; item.modelName = "";
std::string inlineType = m_model.GetSpiceInfo().inlineTypeString; // @FIXME
std::string ac = m_model.FindParam( "ac" )->value->ToSpiceString(); // the keyword "DC" refers to both offset of a sine source, and value for DC analysis
std::string ph = m_model.FindParam( "ph" )->value->ToSpiceString(); // Because of this, both values are always equal in a sine source.
//
// suggestion: rename the sine parameter from "DC" to "offset"
if( ac != "" ) if( dc != "" )
item.modelName.append( fmt::format( "AC {} {} ", ac, ph ) ); {
emptyLine = false;
item.modelName += fmt::format( "DC {} ", dc );
}
if( m_model.GetSpiceInfo().inlineTypeString != "" )
if( inlineType != "" && inlineType != "DC" )
{ {
std::string args = ""; std::string args = "";
@ -187,11 +201,22 @@ std::string SPICE_GENERATOR_SOURCE::ItemLine( const SPICE_ITEM& aItem ) const
break; break;
} }
item.modelName.append( fmt::format( "{}( {})", emptyLine = false;
m_model.GetSpiceInfo().inlineTypeString, item.modelName += fmt::format( "{}( {}) ", m_model.GetSpiceInfo().inlineTypeString, args );
args ) );
} }
else
if( ac != "" )
{
std::string ph = "";
if( m_model.FindParam( "ph" ) )
ph = m_model.FindParam( "ph" )->value->ToSpiceString();
emptyLine = false;
item.modelName += fmt::format( "AC {} {}", ac, ph );
}
if( emptyLine )
{ {
item.modelName.append( m_model.GetParam( 0 ).value->ToSpiceString() ); item.modelName.append( m_model.GetParam( 0 ).value->ToSpiceString() );
} }