Merge pull request google#52 from mabrains/bjt_cj__regression_update

complete the code and fix it is issues
proppy · Dec 29, 2022 · d398c23 · d398c23
2 parents ba88070 + 851745c
commit d398c23
Show file tree

Hide file tree

Showing 6 changed files with 468 additions and 199 deletions.
diff --git a/models/ngspice/testing/regression/bjt_cj/device_netlists/npn_CBJ.spice b/models/ngspice/testing/regression/bjt_cj/device_netlists/npn_CBJ.spice
@@ -14,7 +14,7 @@
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 * See the License for the specific language governing permissions and
 * limitations under the License.
-Vb b 0 dc -3.3
+Vb b 0 dc -3.0
 
 .temp {{temp}}
 .options tnom={{temp}}
@@ -23,15 +23,15 @@ Vb b 0 dc -3.3
 xq1 0 b 0 0 {{device}}
 
 
-.DC Vb 0 -3.3 -0.1
+.DC Vb 0 -3.0 -0.1
 
 .control
 
 save all @q.xq1.q0[cmu]
 run 
 print  @q.xq1.q0[cmu]
 
-wrdata {{device}}_{{cv_sim}}_{{corner}}_T{{temp}}/simulated_{{cv_sim}}/1_simulated_{{device}}.csv @q.xq1.q0[cmu]*1.0e15
+wrdata {{dirpath}}/cj_simulated/simulated_{{device}}_t{{temp}}_{{cap}}_{{corner}}.csv @q.xq1.q0[cmu]*1.0e15
 
 .endc
 

diff --git a/models/ngspice/testing/regression/bjt_cj/device_netlists/npn_CSJ.spice b/models/ngspice/testing/regression/bjt_cj/device_netlists/npn_CSJ.spice
@@ -14,7 +14,7 @@
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 * See the License for the specific language governing permissions and
 * limitations under the License.
-Vb b 0 dc -3.3
+Vb b 0 dc -3.0
 
 .temp {{temp}}
 .options tnom={{temp}}
@@ -23,15 +23,15 @@ Vb b 0 dc -3.3
 xq1 0 0 0 b {{device}}
 
 
-.DC Vb 0 -3.3 -0.1
+.DC Vb 0 -3.0 -0.1
 
 .control
 
 save all @q.xq1.q0[csub]
 run 
 print  @q.xq1.q0[csub]
 
-wrdata {{device}}_{{cv_sim}}_{{corner}}_T{{temp}}/simulated_{{cv_sim}}/2_simulated_{{device}}.csv @q.xq1.q0[csub]*1.0e15
+wrdata {{dirpath}}/cj_simulated/simulated_{{device}}_t{{temp}}_{{cap}}_{{corner}}.csv @q.xq1.q0[csub]*1.0e15
 
 .endc
 

diff --git a/models/ngspice/testing/regression/bjt_cj/device_netlists/npn_EBJ.spice b/models/ngspice/testing/regression/bjt_cj/device_netlists/npn_EBJ.spice
@@ -14,7 +14,7 @@
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 * See the License for the specific language governing permissions and
 * limitations under the License.
-Vb b 0 dc -3.3
+Vb b 0 dc -3.0
 
 .temp {{temp}}
 .options tnom={{temp}}
@@ -23,15 +23,15 @@ Vb b 0 dc -3.3
 xq1 0 b 0 0 {{device}}
 
 
-.DC Vb 0 -3.3 -0.1
+.DC Vb 0 -3.0 -0.1
 
 .control
 
 save all @q.xq1.q0[cpi]
 run 
 print  @q.xq1.q0[cpi]
 
-wrdata {{device}}_{{cv_sim}}_{{corner}}_T{{temp}}/simulated_{{cv_sim}}/0_simulated_{{device}}.csv @q.xq1.q0[cpi]*1.0e15
+wrdata {{dirpath}}/cj_simulated/simulated_{{device}}_t{{temp}}_{{cap}}_{{corner}}.csv @q.xq1.q0[cpi]*1.0e15
 
 .endc
 

diff --git a/models/ngspice/testing/regression/bjt_cj/device_netlists/pnp_CBJ.spice b/models/ngspice/testing/regression/bjt_cj/device_netlists/pnp_CBJ.spice
@@ -14,7 +14,7 @@
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 * See the License for the specific language governing permissions and
 * limitations under the License.
-Vb b 0 dc -3.3
+Vb b 0 dc -3.0
 
 .temp {{temp}}
 .options tnom={{temp}}
@@ -23,15 +23,15 @@ Vb b 0 dc -3.3
 xq1 b 0 0 {{device}}
 
 
-.DC Vb 0 -3.3 -0.1
+.DC Vb 0 -3.0 -0.1
 
 .control
 
 save all @q.xq1.q0[cmu]
 run 
 print  @q.xq1.q0[cmu]
 
-wrdata {{device}}_{{cv_sim}}_{{corner}}_T{{temp}}/simulated_{{cv_sim}}/1_simulated_{{device}}.csv @q.xq1.q0[cmu]*1.0e15
+wrdata bjt_cj_regr/pnp/cj_simulated/simulated_{{device}}_t{{temp}}_{{cap}}_{{corner}}.csv @q.xq1.q0[cmu]*1.0e15
 
 .endc
 

diff --git a/models/ngspice/testing/regression/bjt_cj/device_netlists/pnp_EBJ.spice b/models/ngspice/testing/regression/bjt_cj/device_netlists/pnp_EBJ.spice
@@ -14,7 +14,7 @@
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 * See the License for the specific language governing permissions and
 * limitations under the License.
-Vb b 0 dc -3.3
+Vb b 0 dc -3.0
 
 .temp {{temp}}
 .options tnom={{temp}}
@@ -23,15 +23,15 @@ Vb b 0 dc -3.3
 xq1 0 0 b {{device}}
 
 
-.DC Vb 0 -3.3 -0.1
+.DC Vb 0 -3.0 -0.1
 
 .control
 
 save all @q.xq1.q0[cpi]
 run 
 print  @q.xq1.q0[cpi]
 
-wrdata {{device}}_{{cv_sim}}_{{corner}}_T{{temp}}/simulated_{{cv_sim}}/0_simulated_{{device}}.csv @q.xq1.q0[cpi]*1.0e15
+wrdata bjt_cj_regr/pnp/cj_simulated/simulated_{{device}}_t{{temp}}_{{cap}}_{{corner}}.csv @q.xq1.q0[cpi]*1.0e15
 
 .endc