summaryrefslogtreecommitdiffstats
path: root/src/electronics/simulation
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2011-12-16 09:57:14 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2011-12-16 09:57:14 -0600
commitc1ef065782051db96cdfd32cf55be6408c2a9d22 (patch)
tree0bc3705b597f8c98b2b9992d22ab9620df50b877 /src/electronics/simulation
parentbab171b2a7d7f36e2d5dd510df80fc8cb4a6b06f (diff)
downloadktechlab-c1ef065782051db96cdfd32cf55be6408c2a9d22.tar.gz
ktechlab-c1ef065782051db96cdfd32cf55be6408c2a9d22.zip
Revert "Rename a number of old tq methods that are no longer tq specific"
This reverts commit bab171b2a7d7f36e2d5dd510df80fc8cb4a6b06f.
Diffstat (limited to 'src/electronics/simulation')
-rw-r--r--src/electronics/simulation/capacitance.cpp6
-rw-r--r--src/electronics/simulation/capacitance.h2
-rw-r--r--src/electronics/simulation/element.cpp8
-rw-r--r--src/electronics/simulation/element.h2
-rw-r--r--src/electronics/simulation/inductance.cpp6
-rw-r--r--src/electronics/simulation/inductance.h2
-rw-r--r--src/electronics/simulation/reactive.cpp6
-rw-r--r--src/electronics/simulation/reactive.h2
8 files changed, 17 insertions, 17 deletions
diff --git a/src/electronics/simulation/capacitance.cpp b/src/electronics/simulation/capacitance.cpp
index 9087c7f..c289f90 100644
--- a/src/electronics/simulation/capacitance.cpp
+++ b/src/electronics/simulation/capacitance.cpp
@@ -101,9 +101,9 @@ void Capacitance::time_step()
i_eq_old = i_eq_new;
}
-bool Capacitance::updateStatus()
+bool Capacitance::updatetqStatus()
{
- b_status = Reactive::updateStatus();
+ b_status = Reactive::updatetqStatus();
if ( m_method == Capacitance::m_none ) b_status = false;
return b_status;
}
@@ -111,7 +111,7 @@ bool Capacitance::updateStatus()
void Capacitance::setMethod( Method m )
{
m_method = m;
- updateStatus();
+ updatetqStatus();
}
diff --git a/src/electronics/simulation/capacitance.h b/src/electronics/simulation/capacitance.h
index ccc083d..b26899c 100644
--- a/src/electronics/simulation/capacitance.h
+++ b/src/electronics/simulation/capacitance.h
@@ -42,7 +42,7 @@ public:
protected:
virtual void updateCurrents();
- virtual bool updateStatus();
+ virtual bool updatetqStatus();
private:
double m_cap; // Capacitance
diff --git a/src/electronics/simulation/element.cpp b/src/electronics/simulation/element.cpp
index 2411897..dbcd02d 100644
--- a/src/electronics/simulation/element.cpp
+++ b/src/electronics/simulation/element.cpp
@@ -55,7 +55,7 @@ void Element::setElementSet( ElementSet *c )
p_eSet = c;
p_A = p_eSet->matrix();
p_b = p_eSet->b();
- updateStatus();
+ updatetqStatus();
}
void Element::componentDeleted()
@@ -113,7 +113,7 @@ void Element::setCNodes( const int n0, const int n1, const int n2, const int n3
p_cnode[1] = (n1>-1)?p_eSet->cnodes()[n1]:(n1==-1?p_eSet->ground():0l);
p_cnode[2] = (n2>-1)?p_eSet->cnodes()[n2]:(n2==-1?p_eSet->ground():0l);
p_cnode[3] = (n3>-1)?p_eSet->cnodes()[n3]:(n3==-1?p_eSet->ground():0l);
- updateStatus();
+ updatetqStatus();
}
void Element::setCBranches( const int b0, const int b1, const int b2, const int b3 )
@@ -128,10 +128,10 @@ void Element::setCBranches( const int b0, const int b1, const int b2, const int
p_cbranch[1] = (b1>-1)?p_eSet->cbranches()[b1]:0l;
p_cbranch[2] = (b2>-1)?p_eSet->cbranches()[b2]:0l;
p_cbranch[3] = (b3>-1)?p_eSet->cbranches()[b3]:0l;
- updateStatus();
+ updatetqStatus();
}
-bool Element::updateStatus()
+bool Element::updatetqStatus()
{
// First, set status to false if all nodes in use are ground
b_status = false;
diff --git a/src/electronics/simulation/element.h b/src/electronics/simulation/element.h
index e05de46..7b219c9 100644
--- a/src/electronics/simulation/element.h
+++ b/src/electronics/simulation/element.h
@@ -188,7 +188,7 @@ protected:
/**
* Update the status, returning b_status
*/
- virtual bool updateStatus();
+ virtual bool updatetqStatus();
/**
* Set by child class - the number of branches that the element uses
* Typically, this is 0, but could be 1 (e.g. independent voltage source)
diff --git a/src/electronics/simulation/inductance.cpp b/src/electronics/simulation/inductance.cpp
index 22c5f9e..6737ab6 100644
--- a/src/electronics/simulation/inductance.cpp
+++ b/src/electronics/simulation/inductance.cpp
@@ -109,9 +109,9 @@ void Inductance::time_step()
}
-bool Inductance::updateStatus()
+bool Inductance::updatetqStatus()
{
- b_status = Reactive::updateStatus();
+ b_status = Reactive::updatetqStatus();
if ( m_method == Inductance::m_none )
b_status = false;
return b_status;
@@ -121,6 +121,6 @@ bool Inductance::updateStatus()
void Inductance::setMethod( Method m )
{
m_method = m;
- updateStatus();
+ updatetqStatus();
}
diff --git a/src/electronics/simulation/inductance.h b/src/electronics/simulation/inductance.h
index 46ccb09..e4bd119 100644
--- a/src/electronics/simulation/inductance.h
+++ b/src/electronics/simulation/inductance.h
@@ -42,7 +42,7 @@ class Inductance : public Reactive
protected:
virtual void updateCurrents();
- virtual bool updateStatus();
+ virtual bool updatetqStatus();
private:
double m_inductance; // Inductance
diff --git a/src/electronics/simulation/reactive.cpp b/src/electronics/simulation/reactive.cpp
index 83fcfd4..c753f42 100644
--- a/src/electronics/simulation/reactive.cpp
+++ b/src/electronics/simulation/reactive.cpp
@@ -26,11 +26,11 @@ Reactive::~Reactive()
void Reactive::setDelta( double delta )
{
m_delta = delta;
- updateStatus();
+ updatetqStatus();
}
-bool Reactive::updateStatus()
+bool Reactive::updatetqStatus()
{
- return Element::updateStatus();
+ return Element::updatetqStatus();
}
diff --git a/src/electronics/simulation/reactive.h b/src/electronics/simulation/reactive.h
index 1142b34..a93459b 100644
--- a/src/electronics/simulation/reactive.h
+++ b/src/electronics/simulation/reactive.h
@@ -34,7 +34,7 @@ public:
virtual void time_step() = 0;
protected:
- virtual bool updateStatus();
+ virtual bool updatetqStatus();
double m_delta; // Delta time interval
};