luke
/
ngspice
mirror of https://git.code.sf.net/p/ngspice/ngspice
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'pre-master' into bt_dev

This commit is contained in:
Brian Taylor 2022-12-27 09:32:16 -08:00
parent d35491fa8f aacd4350c3
commit d184d1ea94
5 changed files with 29 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
examples/osdi/hicuml0/KiCad/ECL-OR.kicad_pro
View File

@ -216,7 +216,7 @@
"pinned_symbol_libs": [] "pinned_symbol_libs": []
}, },
"meta": { "meta": {
"filename": "ECL-RO.kicad_pro", "filename": "ECL-OR.kicad_pro",
"version": 1 "version": 1
}, },
"net_settings": { "net_settings": {
@ -289,7 +289,7 @@
"page_layout_descr_file": "", "page_layout_descr_file": "",
"plot_directory": "", "plot_directory": "",
"spice_adjust_passive_values": false, "spice_adjust_passive_values": false,
"spice_external_command": "C:\\Spice64\\bin\\ngspice-2022-osdi.exe \"%I\"", "spice_external_command": "C:\\Spice64\\bin\\ngspice.exe \"%I\"",
"subpart_first_id": 65, "subpart_first_id": 65,
"subpart_id_separator": 0 "subpart_id_separator": 0
}, },

14
examples/osdi/hicuml0/KiCad/ECL-OR.kicad_sch
View File

@ -823,8 +823,8 @@
(effects (font (size 1.27 1.27)) (justify left bottom)) (effects (font (size 1.27 1.27)) (justify left bottom))
(uuid 323369ca-7b3f-476e-866f-1c1d7820c037) (uuid 323369ca-7b3f-476e-866f-1c1d7820c037)
) )
(text ".tran 0.1n 100u\n.control\npre_osdi test_osdi_win/HICUML0-2.osdi\nrun\nplot a1 a2+2 in1+4 in2+6\n.endc" (text ".tran 0.1n 100u\n.control\npre_osdi D:/Spice_general/ngspice-master/examples/osdi/hicuml0/osdi_libs/HICUML0-2.osdi\nrun\nplot a1 a2+2 in1+4 in2+6\n.endc"
(at 242.824 120.142 0) (at 180.34 139.7 0)
(effects (font (size 1.27 1.27)) (justify left bottom)) (effects (font (size 1.27 1.27)) (justify left bottom))
(uuid be5001b9-96d7-45a3-8a97-97b78d9916ae) (uuid be5001b9-96d7-45a3-8a97-97b78d9916ae)
) )
@ -943,7 +943,7 @@
(property "Spice_Netlist_Enabled" "Y" (id 6) (at 187.96 97.536 0) (property "Spice_Netlist_Enabled" "Y" (id 6) (at 187.96 97.536 0)
(effects (font (size 1.27 1.27)) hide) (effects (font (size 1.27 1.27)) hide)
) )
(property "Spice_Lib_File" "model-card-hicumL0V1p11_mod.lib" (id 7) (at 187.96 97.536 0) (property "Spice_Lib_File" "D:\\Spice_general\\ngspice-master\\examples\\osdi\\hicuml0\\Modelcards\\model-card-hicumL0V1p11_mod.lib" (id 7) (at 187.96 97.536 0)
(effects (font (size 1.27 1.27)) hide) (effects (font (size 1.27 1.27)) hide)
) )
(pin "4" (uuid f11ebe79-902d-47f0-99c2-7adbb580de22)) (pin "4" (uuid f11ebe79-902d-47f0-99c2-7adbb580de22))
@ -977,7 +977,7 @@
(property "Spice_Netlist_Enabled" "Y" (id 6) (at 208.788 97.536 0) (property "Spice_Netlist_Enabled" "Y" (id 6) (at 208.788 97.536 0)
(effects (font (size 1.27 1.27)) hide) (effects (font (size 1.27 1.27)) hide)
) )
(property "Spice_Lib_File" "model-card-hicumL0V1p11_mod.lib" (id 7) (at 208.788 97.536 0) (property "Spice_Lib_File" "D:\\Spice_general\\ngspice-master\\examples\\osdi\\hicuml0\\Modelcards\\model-card-hicumL0V1p11_mod.lib" (id 7) (at 208.788 97.536 0)
(effects (font (size 1.27 1.27)) hide) (effects (font (size 1.27 1.27)) hide)
) )
(pin "4" (uuid ba57784c-be23-47ec-9a64-6546cb680975)) (pin "4" (uuid ba57784c-be23-47ec-9a64-6546cb680975))
@ -1205,7 +1205,7 @@
(property "Spice_Netlist_Enabled" "Y" (id 6) (at 227.33 97.536 0) (property "Spice_Netlist_Enabled" "Y" (id 6) (at 227.33 97.536 0)
(effects (font (size 1.27 1.27)) hide) (effects (font (size 1.27 1.27)) hide)
) )
(property "Spice_Lib_File" "model-card-hicumL0V1p11_mod.lib" (id 7) (at 227.33 97.536 0) (property "Spice_Lib_File" "D:\\Spice_general\\ngspice-master\\examples\\osdi\\hicuml0\\Modelcards\\model-card-hicumL0V1p11_mod.lib" (id 7) (at 227.33 97.536 0)
(effects (font (size 1.27 1.27)) hide) (effects (font (size 1.27 1.27)) hide)
) )
(pin "4" (uuid fb1d4c0a-39e2-4e36-afd9-917f4603bfae)) (pin "4" (uuid fb1d4c0a-39e2-4e36-afd9-917f4603bfae))
@ -1330,7 +1330,7 @@
(property "Spice_Netlist_Enabled" "Y" (id 6) (at 175.514 97.536 0) (property "Spice_Netlist_Enabled" "Y" (id 6) (at 175.514 97.536 0)
(effects (font (size 1.27 1.27)) hide) (effects (font (size 1.27 1.27)) hide)
) )
(property "Spice_Lib_File" "model-card-hicumL0V1p11_mod.lib" (id 7) (at 175.514 97.536 0) (property "Spice_Lib_File" "D:\\Spice_general\\ngspice-master\\examples\\osdi\\hicuml0\\Modelcards\\model-card-hicumL0V1p11_mod.lib" (id 7) (at 175.514 97.536 0)
(effects (font (size 1.27 1.27)) hide) (effects (font (size 1.27 1.27)) hide)
) )
(pin "4" (uuid 5545ef00-0c6b-4a5c-9e6e-2db47f95ef53)) (pin "4" (uuid 5545ef00-0c6b-4a5c-9e6e-2db47f95ef53))
@ -1392,7 +1392,7 @@
(property "Spice_Netlist_Enabled" "Y" (id 6) (at 214.63 97.536 0) (property "Spice_Netlist_Enabled" "Y" (id 6) (at 214.63 97.536 0)
(effects (font (size 1.27 1.27)) hide) (effects (font (size 1.27 1.27)) hide)
) )
(property "Spice_Lib_File" "model-card-hicumL0V1p11_mod.lib" (id 7) (at 214.63 97.536 0) (property "Spice_Lib_File" "D:\\Spice_general\\ngspice-master\\examples\\osdi\\hicuml0\\Modelcards\\model-card-hicumL0V1p11_mod.lib" (id 7) (at 214.63 97.536 0)
(effects (font (size 1.27 1.27)) hide) (effects (font (size 1.27 1.27)) hide)
) )
(pin "4" (uuid eddec639-ce06-4cb4-88f6-39f706acdaa1)) (pin "4" (uuid eddec639-ce06-4cb4-88f6-39f706acdaa1))

7
src/maths/ni/nidest.c
View File

@ -16,6 +16,7 @@ Author: 1985 Thomas L. Quarles
void void
NIdestroy(CKTcircuit *ckt) NIdestroy(CKTcircuit *ckt)
{ {
int i;
if (ckt->CKTmatrix) if (ckt->CKTmatrix)
SMPdestroy(ckt->CKTmatrix); SMPdestroy(ckt->CKTmatrix);
ckt->CKTmatrix = NULL; ckt->CKTmatrix = NULL;
@ -33,4 +34,10 @@ NIdestroy(CKTcircuit *ckt)
SENdestroy(ckt->CKTsenInfo); SENdestroy(ckt->CKTsenInfo);
} }
#endif #endif
#ifdef PREDICTOR
if(ckt->CKTpred) FREE(ckt->CKTpred);
for( i=0;i<8;i++) {
if(ckt->CKTsols[i]) FREE(ckt->CKTsols[i]);
}
#endif
} }

7
src/spicelib/analysis/cktdest.c
View File

@ -90,6 +90,13 @@ CKTdestroy(CKTcircuit *ckt)
FREE(ckt->CKTirhsOld); FREE(ckt->CKTirhsOld);
FREE(ckt->CKTirhsSpare); FREE(ckt->CKTirhsSpare);
#ifdef PREDICTOR
if(ckt->CKTpred) FREE(ckt->CKTpred);
for( i=0;i<8;i++) {
if(ckt->CKTsols[i]) FREE(ckt->CKTsols[i]);
}
#endif
FREE(ckt->CKTstat->STATdevNum); FREE(ckt->CKTstat->STATdevNum);
FREE(ckt->CKTstat); FREE(ckt->CKTstat);
FREE(ckt->CKThead); FREE(ckt->CKThead);

12
visualc/sharedspice.vcxproj
View File

@ -198,8 +198,8 @@
</CustomBuildStep> </CustomBuildStep>
<ClCompile> <ClCompile>
<Optimization>Disabled</Optimization> <Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>..\src\maths\poly;..\src\frontend;..\src\spicelib\devices;tmp-bison;..\src\spicelib\parser;src\include;..\src\include;..\src\include\cppduals;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <AdditionalIncludeDirectories>..\src\maths\poly;..\src\osdi;..\src\frontend;..\src\spicelib\devices;tmp-bison;..\src\spicelib\parser;src\include;..\src\include;..\src\include\cppduals;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;SIMULATOR;XSPICE;SHARED_MODULE;CONFIG64;_MSC_PLATFORM_TOOLSET=$(PlatformToolsetVersion);NGDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;SIMULATOR;SHARED_MODULE;CONFIG64;_MSC_PLATFORM_TOOLSET=$(PlatformToolsetVersion);NGDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessToFile>false</PreprocessToFile> <PreprocessToFile>false</PreprocessToFile>
<PreprocessSuppressLineNumbers>false</PreprocessSuppressLineNumbers> <PreprocessSuppressLineNumbers>false</PreprocessSuppressLineNumbers>
<MinimalRebuild>false</MinimalRebuild> <MinimalRebuild>false</MinimalRebuild>
@ -248,8 +248,8 @@
<Optimization>Full</Optimization> <Optimization>Full</Optimization>
<FavorSizeOrSpeed>Speed</FavorSizeOrSpeed> <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
<WholeProgramOptimization>true</WholeProgramOptimization> <WholeProgramOptimization>true</WholeProgramOptimization>
<AdditionalIncludeDirectories>..\src\maths\poly;..\src\frontend;..\src\spicelib\devices;tmp-bison;..\src\spicelib\parser;src\include;..\src\include;..\src\include\cppduals;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <AdditionalIncludeDirectories>..\src\maths\poly;..\src\osdi;..\src\frontend;..\src\spicelib\devices;tmp-bison;..\src\spicelib\parser;src\include;..\src\include;..\src\include\cppduals;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;SIMULATOR;XSPICE;SHARED_MODULE;CONFIG64;_MSC_PLATFORM_TOOLSET=$(PlatformToolsetVersion);%(PreprocessorDefinitions)</PreprocessorDefinitions> <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;SIMULATOR;SHARED_MODULE;CONFIG64;_MSC_PLATFORM_TOOLSET=$(PlatformToolsetVersion);%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>false</MinimalRebuild> <MinimalRebuild>false</MinimalRebuild>
<ExceptionHandling> <ExceptionHandling>
</ExceptionHandling> </ExceptionHandling>
@ -338,8 +338,8 @@
<Optimization>Full</Optimization> <Optimization>Full</Optimization>
<FavorSizeOrSpeed>Speed</FavorSizeOrSpeed> <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
<WholeProgramOptimization>true</WholeProgramOptimization> <WholeProgramOptimization>true</WholeProgramOptimization>
<AdditionalIncludeDirectories>..\src\maths\poly;..\src\frontend;..\src\spicelib\devices;tmp-bison;..\src\spicelib\parser;src\include;..\src\include;..\src\include\cppduals;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <AdditionalIncludeDirectories>..\src\maths\poly;..\src\osdi;..\src\frontend;..\src\spicelib\devices;tmp-bison;..\src\spicelib\parser;src\include;..\src\include;..\src\include\cppduals;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;SIMULATOR;XSPICE;SHARED_MODULE;CONFIG64;_MSC_PLATFORM_TOOLSET=$(PlatformToolsetVersion);USE_OMP;%(PreprocessorDefinitions)</PreprocessorDefinitions> <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;SIMULATOR;SHARED_MODULE;CONFIG64;_MSC_PLATFORM_TOOLSET=$(PlatformToolsetVersion);USE_OMP;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>false</MinimalRebuild> <MinimalRebuild>false</MinimalRebuild>
<ExceptionHandling> <ExceptionHandling>
</ExceptionHandling> </ExceptionHandling>