Changeset 666

Timestamp:

10/19/09 22:24:47 (15 years ago)

Author:

smidl

Message:

pmsm details

Location:

applications/pmsm

Files:

• pmsm.h (modified) (5 diffs)
• pmsm_estim.cpp (modified) (1 diff)

applications/pmsm/pmsm.h

@@ -13 +13 @@
 //TODO hardcoded RVs!!!
 RV rx ( "{ia ib om th }");
-RV ru ( "{ua ub }");
+RV ru ( "{o_ua o_ub }");
 RV ry ( "{oia oib }");
 
@@ -25 +25 @@
         double Rs, Ls, dt, Ypm, kp, p,  J, Mz;
 
+        bool compensate;
 public:
-        IMpmsm() :diffbifn ( ) {dimy=4; dimx = 4; dimu=2;};
+        IMpmsm() :diffbifn ( ) {dimy=4; dimx = 4; dimu=2; dimc=6;compensate=true;};
         //! Set mechanical and electrical variables
         virtual void set_parameters ( double Rs0, double Ls0, double dt0, double Ypm0, double kp0, double p0, double J0, double Mz0 ) {Rs=Rs0; Ls=Ls0; dt=dt0; Ypm=Ypm0; kp=kp0; p=p0; J=J0; Mz=Mz0;}
@@ -58 +59 @@
                 double ubm;
 
-                modelpwm(x0,u0,uam,ubm);
+                if (compensate){
+                        modelpwm(x0,u0,uam,ubm);
+                } else {
+                        uam = u0(0);
+                        ubm = u0(1);
+                }
+                
                 
                 vec xk( 4 );
@@ -104 +111 @@
                 set_parameters ( params["Rs"], params["Ls"], 125e-6, params["Fmag"], \
                          params["kp"], params["p"], params["J"], 0.0);
+                int comp;
+                if (UI::get(comp,root,"compensate",UI::optional)){compensate=(comp==1);}
         };
 
@@ -306 +315 @@
 class OMpmsm: public diffbifn {
 public:
-        OMpmsm() :diffbifn () {dimy=2;dimx=4;dimu=2;};
+        OMpmsm() :diffbifn () {dimy=2;dimx=4;dimu=0;};
 
         vec eval ( const vec &x0, const vec &u0 ) {

applications/pmsm/pmsm_estim.cpp

@@ -12 +12 @@
 #include "pmsmDS.h"
 #include "filters.h"
+#include "base/datasources.h"