From: yu.dongliang <18588496441@163.com>
Date: Sat, 7 Oct 2023 08:04:56 +0000 (+0800)
Subject: __ses_path_jr()
X-Git-Url: http://baseworks.info/?a=commitdiff_plain;h=e3f4e86bb20d037e8c75eb3059ccb1c54710fc61;p=ses.git

__ses_path_jr()
---

diff --git a/ses_step_jr.c b/ses_step_jr.c
index c1b4e9c..e88c28c 100644
--- a/ses_step_jr.c
+++ b/ses_step_jr.c
@@ -75,7 +75,7 @@ static int __ses_path_jr(ScfEfunction* f, ses_path_t* path)
 		p->pr  = r;
 		p->jpr = jr;
 
-		scf_loge("i: %d, c%ldp%ld, p->sr: %lg + j%lg\n", i, p->cid, p->id, p->sr, p->jsr);
+		scf_loge("i: %d, c%ldp%ld, p->sr: %lg\n", i, p->cid, p->id, p->sr);
 	}
 	printf("\n");
 
@@ -138,7 +138,7 @@ static int __ses_path_jr(ScfEfunction* f, ses_path_t* path)
 			r   =  r  / R;
 			jr  = -jr / R;
 
-			scf_logw("j: %d, c%ldp%ld, p1->pr: %lg + j%lg, p1->sr: %lg + j%lg, r: %lg + j%lg\n", j, p1->cid, p1->id, p1->pr, p1->jpr, p1->sr, p1->jsr, r, jr);
+			scf_logw("j: %d, c%ldp%ld, p1->pr: %lg, p1->sr: %lg, r: %lg\n", j, p1->cid, p1->id, p1->pr, p1->sr, r);
 
 			double dr  = p1->pr  - (p0->pr  + r);
 			double jdr = p1->jpr - (p0->jpr + jr);
@@ -146,7 +146,7 @@ static int __ses_path_jr(ScfEfunction* f, ses_path_t* path)
 			p1->pr  -= dr;
 			p1->jpr -= jdr;
 
-			c  = f->components[p1->lid];
+			c  = f->components[p1->cid];
 
 			if (SCF_EDA_Transistor == c->type && SCF_EDA_Transistor_E == p1->id && cp1 != p1) {
 
@@ -154,10 +154,10 @@ static int __ses_path_jr(ScfEfunction* f, ses_path_t* path)
 				p->pr  -= dr;
 				p->jpr -= jdr;
 
-				scf_logw("j: %d, c%ldp%ld, p->pr: %lg + j%lg, p->sr: %lg + j%lg, dr: %lg + j%lg\n", j, p->cid, p->id, p->pr, p->jpr, p->sr, p->jsr, dr, jdr);
+				scf_logw("j: %d, c%ldp%ld, p->pr: %lg, p->sr: %lg, dr: %lg\n", j, p->cid, p->id, p->pr, p->sr, dr);
 			}
 
-			scf_logw("j: %d, c%ldp%ld, p->pr: %lg + j%lg, p->sr: %lg + j%lg, dr: %lg + j%lg\n", j, p1->cid, p1->id, p1->pr, p1->jpr, p1->sr, p1->jsr, dr, jdr);
+			scf_logw("j: %d, c%ldp%ld, p->pr: %lg, p->sr: %lg, dr: %lg\n", j, p1->cid, p1->id, p1->pr, p1->sr, dr);
 
 			for (++j; j < path->pins->size; j++) {
 				p     = path->pins->data[j];
@@ -168,10 +168,10 @@ static int __ses_path_jr(ScfEfunction* f, ses_path_t* path)
 				p->sr  -= dr;
 				p->jsr -= jdr;
 
-				scf_logw("j: %d, c%ldp%ld, p->pr: %lg + j%lg, p->sr: %lg + j%lg\n", j, p->cid, p->id, p->pr, p->jpr, p->sr, p->jsr);
+				scf_logw("j: %d, c%ldp%ld, p->pr: %lg, p->sr: %lg\n", j, p->cid, p->id, p->pr, p->sr);
 			}
 
-			scf_logw("child: %d, r: %lg, jr: %lg, dr: %lg, jdr: %lg\n\n", child->index, child->r, child->jr, dr, jdr);
+			scf_logw("child: %d, r: %lg, dr: %lg\n\n", child->index, child->r, dr);
 		}
 	}
 
@@ -180,7 +180,7 @@ static int __ses_path_jr(ScfEfunction* f, ses_path_t* path)
 	path->r  = p->pr;
 	path->jr = p->jpr;
 
-	scf_loge("path: %d, r: %lg, jr: %lg, r0: %lg, jr0: %lg\n", path->index, path->r, path->jr, path->r0, path->jr0);
+	scf_loge("path: %d, r: %lg, r0: %lg\n", path->index, path->r, path->r0);
 	return 0;
 }
 
diff --git a/ses_step_va_diode.c b/ses_step_va_diode.c
index 3bffa25..58fd699 100644
--- a/ses_step_va_diode.c
+++ b/ses_step_va_diode.c
@@ -86,8 +86,7 @@ void __ses_path_dr(ScfEpin* p0, ScfEpin* p1, ScfEpin* p)
 
 	ses_ui_r(&p->dr, &p->jdr, v, jv, p->a, p->ja);
 
-	scf_logw("c%ldp%ld, v: %lg + j%lg, r: %lg + j%lg, p->a: %lg + j%lg, p->dr: %lg + j%lg\n", p->cid, p->id,
-			v, jv, r, jr, p->a, p->ja, p->dr, p->jdr);
+	scf_logd("c%ldp%ld, v: %lg, r: %lg, p->a: %lg, p->dr: %lg\n", p->cid, p->id, v, r, p->a, p->dr);
 
 	p->dr  -= r;
 	p->jdr -= jr;
diff --git a/ses_step_va_transistor.c b/ses_step_va_transistor.c
index f75185f..a74b9ca 100644
--- a/ses_step_va_transistor.c
+++ b/ses_step_va_transistor.c
@@ -101,8 +101,8 @@ static int __ses_path_va_transistor(ScfEfunction* f, ses_path_t* path)
 
 		__ses_path_dr(p, p1, pc);
 
-		scf_loge("i: %d, c%ldp%ld--c%ldp%ld, v: %lg + j%lg, pc->v: %lg + j%lg, pc->a: %lg + j%lg, pr: %lg + j%lg, sr: %lg + j%lg, pc->dr: %lg + j%lg\n",
-				i, p0->cid, p0->id, pc->cid, pc->id, v, jv, pc->v, pc->jv, pc->a, pc->ja, pr, jpr, sr, jsr, pc->dr, pc->jdr);
+		scf_loge("i: %d, c%ldp%ld--c%ldp%ld, v: %lg, pc->v: %lg, pc->a: %lg, pr: %lg, sr: %lg, pc->dr: %lg\n",
+				i, p0->cid, p0->id, pc->cid, pc->id, v, pc->v, pc->a, pr, sr, pc->dr);
 	}
 
 	return 0;