scf_eda.proto

diff --git a/scf_eda.pb-c.c b/scf_eda.pb-c.c
index 482c4cc6b893378501d70102f627a340a27f4276..f81f03537313fef1ea265311bd443d1fca380759 100644 (file)
--- a/scf_eda.pb-c.c
+++ b/scf_eda.pb-c.c
@@ -721,7 +721,7 @@ const ProtobufCMessageDescriptor scf_econn__descriptor =
   (ProtobufCMessageInit) scf_econn__init,
   NULL,NULL,NULL    /* reserved[123] */
 };
-static const ProtobufCFieldDescriptor scf_eline__field_descriptors[12] =
+static const ProtobufCFieldDescriptor scf_eline__field_descriptors[14] =
 {
   {
     "id",
@@ -856,9 +856,33 @@ static const ProtobufCFieldDescriptor scf_eline__field_descriptors[12] =
     0,NULL,NULL    /* reserved1,reserved2, etc */
   },
   {
-    "vflag",
+    "r",
     12,
     PROTOBUF_C_LABEL_REQUIRED,
+    PROTOBUF_C_TYPE_DOUBLE,
+    0,   /* quantifier_offset */
+    offsetof(ScfEline, r),
+    NULL,
+    NULL,
+    0,             /* flags */
+    0,NULL,NULL    /* reserved1,reserved2, etc */
+  },
+  {
+    "jr",
+    13,
+    PROTOBUF_C_LABEL_REQUIRED,
+    PROTOBUF_C_TYPE_DOUBLE,
+    0,   /* quantifier_offset */
+    offsetof(ScfEline, jr),
+    NULL,
+    NULL,
+    0,             /* flags */
+    0,NULL,NULL    /* reserved1,reserved2, etc */
+  },
+  {
+    "vflag",
+    14,
+    PROTOBUF_C_LABEL_REQUIRED,
     PROTOBUF_C_TYPE_BOOL,
     0,   /* quantifier_offset */
     offsetof(ScfEline, vflag),
@@ -876,16 +900,18 @@ static const unsigned scf_eline__field_indices_by_name[] = {
   3,   /* field[3] = flags */
   0,   /* field[0] = id */
   10,   /* field[10] = ja */
+  12,   /* field[12] = jr */
   8,   /* field[8] = jv */
   6,   /* field[6] = lines */
   1,   /* field[1] = pins */
+  11,   /* field[11] = r */
   7,   /* field[7] = v */
-  11,   /* field[11] = vflag */
+  13,   /* field[13] = vflag */
 };
 static const ProtobufCIntRange scf_eline__number_ranges[1 + 1] =
 {
   { 1, 0 },
-  { 0, 12 }
+  { 0, 14 }
 };
 const ProtobufCMessageDescriptor scf_eline__descriptor =
 {
@@ -895,7 +921,7 @@ const ProtobufCMessageDescriptor scf_eline__descriptor =
   "ScfEline",
   "",
   sizeof(ScfEline),
-  12,
+  14,
   scf_eline__field_descriptors,
   scf_eline__field_indices_by_name,
   1,  scf_eline__number_ranges,

diff --git a/scf_eda.pb-c.h b/scf_eda.pb-c.h
index 8c58f90c8f031d9b836214d20013eb6b7808ff84..465d09ccb6653f3b9a03495c98b77b5f47f4b9dd 100644 (file)
--- a/scf_eda.pb-c.h
+++ b/scf_eda.pb-c.h
@@ -101,11 +101,13 @@ struct  _ScfEline
   double jv;
   double a;
   double ja;
+  double r;
+  double jr;
   protobuf_c_boolean vflag;
 };
 #define SCF_ELINE__INIT \
  { PROTOBUF_C_MESSAGE_INIT (&scf_eline__descriptor) \
-    , 0, 0,NULL, 0, 0, 0, 0,NULL, 0,NULL, 0, 0, 0, 0, 0 }
+    , 0, 0,NULL, 0, 0, 0, 0,NULL, 0,NULL, 0, 0, 0, 0, 0, 0, 0 }
 
 
 struct  _ScfEcomponent

diff --git a/scf_eda.proto b/scf_eda.proto
index 94f583e880ae40a993c2513efb73a5cffb33ad62..af4d15097ac89f780046ff780eb1ada9899ccafa 100644 (file)
--- a/scf_eda.proto
+++ b/scf_eda.proto
@@ -57,8 +57,10 @@ message scf_eline
        required double    jv     = 9;
        required double    a      = 10;
        required double    ja     = 11;
+       required double    r      = 12;
+       required double    jr     = 13;
 
-       required bool      vflag  = 12;
+       required bool      vflag  = 14;
 }
 
 message scf_ecomponent

diff --git a/ses_step_va.c b/ses_step_va.c
index 52a85351033814435657a21366d36a62c8b998b5..065e086c9801bb11046ba9a1133bc9d69034630d 100644 (file)
--- a/ses_step_va.c
+++ b/ses_step_va.c
@@ -108,7 +108,7 @@ static int __ses_path_jr(ScfEfunction* f, ses_path_t* path)
                        r   =  r  / R;
                        jr  = -jr / R;
 
-                       double dr  = p1->tr  - (p0->tr + r);
+                       double dr  = p1->tr  - (p0->tr  + r);
                        double jdr = p1->jtr - (p0->jtr + jr);
 
                        for ( ; j < path->pins->size; j++) {