|
@@ -159,7 +159,7 @@ class RootModel : public CoupledModel < RootModel >
|
|
{
|
|
{
|
|
public:
|
|
public:
|
|
enum submodels { A, B };
|
|
enum submodels { A, B };
|
|
- enum internals { IY, BY, DY, IZ };
|
|
|
|
|
|
+ enum internals { IY, BY, DY, IZ, DX };
|
|
enum states { N };
|
|
enum states { N };
|
|
|
|
|
|
RootModel() : _a(new AModel), _b(new BModel)
|
|
RootModel() : _a(new AModel), _b(new BModel)
|
|
@@ -168,6 +168,7 @@ public:
|
|
Submodels(((A, _a.get()), (B, _b.get())));
|
|
Submodels(((A, _a.get()), (B, _b.get())));
|
|
|
|
|
|
// internals
|
|
// internals
|
|
|
|
+ Internal(DX, &RootModel::_dx);
|
|
InternalsS(((IY, _b.get(), BModel::IY), (IZ, _b.get(), BModel::IZ)));
|
|
InternalsS(((IY, _b.get(), BModel::IY), (IZ, _b.get(), BModel::IZ)));
|
|
InternalS(BY, _b.get(), BModel::BY);
|
|
InternalS(BY, _b.get(), BModel::BY);
|
|
|
|
|
|
@@ -206,6 +207,9 @@ private:
|
|
std::unique_ptr < AModel > _a;
|
|
std::unique_ptr < AModel > _a;
|
|
std::unique_ptr < BModel > _b;
|
|
std::unique_ptr < BModel > _b;
|
|
|
|
|
|
|
|
+ //internals
|
|
|
|
+ double _dx;
|
|
|
|
+
|
|
// states
|
|
// states
|
|
int _n;
|
|
int _n;
|
|
};
|
|
};
|