From 9cedf395ad77c6af1fed7f098a41423156755d18 Mon Sep 17 00:00:00 2001
From: James Cherry <cherry@parallaxsw.com>
Date: Wed, 10 May 2023 10:02:48 -0700
Subject: [PATCH] liberty rm pulling resistance unit

Signed-off-by: James Cherry <cherry@parallaxsw.com>
---
 include/sta/Units.hh        |  3 ---
 liberty/LibertyReader.cc    | 13 ++-----------
 liberty/LibertyReaderPvt.hh |  1 -
 liberty/Units.cc            |  1 -
 search/MakeTimingModel.cc   |  1 -
 5 files changed, 2 insertions(+), 17 deletions(-)

diff --git a/include/sta/Units.hh b/include/sta/Units.hh
index 4e6f5e1f..61355954 100644
--- a/include/sta/Units.hh
+++ b/include/sta/Units.hh
@@ -72,8 +72,6 @@ public:
   const Unit *voltageUnit() const { return &voltage_unit_; }
   Unit *resistanceUnit() { return &resistance_unit_; }
   const Unit *resistanceUnit() const { return &resistance_unit_; }
-  Unit *pullingResistanceUnit() { return &pulling_resistance_unit_; }
-  const Unit *pullingResistanceUnit() const {return &pulling_resistance_unit_;}
   Unit *currentUnit() { return &current_unit_; }
   const Unit *currentUnit() const { return &current_unit_; }
   Unit *powerUnit() { return &power_unit_; }
@@ -88,7 +86,6 @@ private:
   Unit capacitance_unit_;
   Unit voltage_unit_;
   Unit resistance_unit_;
-  Unit pulling_resistance_unit_;
   Unit current_unit_;
   Unit power_unit_;
   Unit distance_unit_;
diff --git a/liberty/LibertyReader.cc b/liberty/LibertyReader.cc
index 741ab864..ad0947eb 100644
--- a/liberty/LibertyReader.cc
+++ b/liberty/LibertyReader.cc
@@ -134,7 +134,6 @@ LibertyReader::readLibertyFile(const char *filename,
   mode_value_ = nullptr;
   ocv_derate_ = nullptr;
   pg_port_ = nullptr;
-  have_resistance_unit_ = false;
   default_operating_condition_ = nullptr;
   receiver_model_ = nullptr;
 
@@ -648,12 +647,6 @@ LibertyReader::endLibrary(LibertyGroup *group)
 void
 LibertyReader::endLibraryAttrs(LibertyGroup *group)
 {
-  // Default resistance_unit to pulling_resistance_unit.
-  if (!have_resistance_unit_) {
-    Units *units = library_->units();
-    *units->resistanceUnit() = *units->pullingResistanceUnit();
-  }
-
   // These attributes reference named groups in the library so
   // wait until the end of the library to resolve them.
   if (default_wireload_) {
@@ -727,16 +720,14 @@ LibertyReader::visitPullingResistanceUnit(LibertyAttr *attr)
 {
   if (library_)
     parseUnits(attr, "ohm", res_scale_,
-	       library_->units()->pullingResistanceUnit());
+	       library_->units()->resistanceUnit());
 }
 
 void
 LibertyReader::visitResistanceUnit(LibertyAttr *attr)
 {
-  if (library_) {
+  if (library_)
     parseUnits(attr, "ohm", res_scale_, library_->units()->resistanceUnit());
-    have_resistance_unit_ = true;
-  }
 }
 
 void
diff --git a/liberty/LibertyReaderPvt.hh b/liberty/LibertyReaderPvt.hh
index 4a5cf678..eadc990b 100644
--- a/liberty/LibertyReaderPvt.hh
+++ b/liberty/LibertyReaderPvt.hh
@@ -624,7 +624,6 @@ protected:
   float power_scale_;
   float energy_scale_;
   float distance_scale_;
-  bool have_resistance_unit_;
   const char *default_operating_condition_;
   ReceiverModelPtr receiver_model_;
   OutputWaveformSeq output_currents_;
diff --git a/liberty/Units.cc b/liberty/Units.cc
index 9ff90d79..91d13705 100644
--- a/liberty/Units.cc
+++ b/liberty/Units.cc
@@ -168,7 +168,6 @@ Units::Units() :
   capacitance_unit_("F"),
   voltage_unit_("v"),
   resistance_unit_("ohm"),
-  pulling_resistance_unit_("ohm"),
   current_unit_("A"),
   power_unit_("W"),
   distance_unit_("m"),
diff --git a/search/MakeTimingModel.cc b/search/MakeTimingModel.cc
index ecf8d0ea..fa168456 100644
--- a/search/MakeTimingModel.cc
+++ b/search/MakeTimingModel.cc
@@ -133,7 +133,6 @@ MakeTimingModel::makeLibrary()
   *library_->units()->capacitanceUnit() = *default_lib->units()->capacitanceUnit();
   *library_->units()->voltageUnit() = *default_lib->units()->voltageUnit();
   *library_->units()->resistanceUnit() = *default_lib->units()->resistanceUnit();
-  *library_->units()->pullingResistanceUnit() = *default_lib->units()->pullingResistanceUnit();
   *library_->units()->powerUnit() = *default_lib->units()->powerUnit();
   *library_->units()->distanceUnit() = *default_lib->units()->distanceUnit();