Added mLIQSS methods to compiler.

CIFASIS · May 2, 2023 · 2aa5e88 · 2aa5e88
1 parent b2a1e3a
commit 2aa5e88
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 4 deletions.
diff --git a/src/mmoc/ir/annotation.cpp b/src/mmoc/ir/annotation.cpp
@@ -448,10 +448,18 @@ Solver ModelAnnotation::getSolver(string s)
     _order = 4;
     _polyCoeffs = 5;
     return QSS4;
-  } else if (!s.compare("QSS_TEST")) {
+  } else if (!s.compare("mLIQSS")) {
+    _order = 1;
+    _polyCoeffs = 2;
+    return mLIQSS;
+  } else if (!s.compare("mLIQSS2")) {
     _order = 2;
     _polyCoeffs = 3;
-    return QSS_TEST;
+    return mLIQSS2;
+  } else if (!s.compare("mLIQSS3")) {
+    _order = 3;
+    _polyCoeffs = 4;
+    return mLIQSS3;
   }
   return QSS;
 }
@@ -731,7 +739,9 @@ EvalAnnotation::EvalAnnotation() : _tokens()
   _tokens.insert(pair<string, string>("LIQSS_BDF", "LIQSS_BDF"));
   _tokens.insert(pair<string, string>("LIQSS3", "LIQSS3"));
   _tokens.insert(pair<string, string>("QSS4", "QSS4"));
-  _tokens.insert(pair<string, string>("QSS_TEST", "QSS_TEST"));
+  _tokens.insert(pair<string, string>("mLIQSS", "mLIQSS"));
+  _tokens.insert(pair<string, string>("mLIQSS2", "mLIQSS2"));
+  _tokens.insert(pair<string, string>("mLIQSS3", "mLIQSS3"));
   _tokens.insert(pair<string, string>("DASSL", "DASSL"));
   _tokens.insert(pair<string, string>("DOPRI", "DOPRI"));
   _tokens.insert(pair<string, string>("CVODE_AM", "CVODE_AM"));

diff --git a/src/mmoc/ir/annotation.h b/src/mmoc/ir/annotation.h
@@ -32,7 +32,25 @@
 namespace MicroModelica {
 namespace IR {
 
-typedef enum { QSS, CQSS, LIQSS, QSS2, LIQSS2, LIQSS_BDF, QSS3, LIQSS3, QSS4, DASSL, DOPRI, CVODE_BDF, CVODE_AM, IDA, QSS_TEST } Solver;
+typedef enum {
+  QSS,
+  CQSS,
+  LIQSS,
+  QSS2,
+  LIQSS2,
+  LIQSS_BDF,
+  QSS3,
+  LIQSS3,
+  QSS4,
+  DASSL,
+  DOPRI,
+  CVODE_BDF,
+  CVODE_AM,
+  IDA,
+  mLIQSS,
+  mLIQSS2,
+  mLIQSS3
+} Solver;
 
 typedef enum { Metis, HMetis, Scotch, Patoh, MTPL, MTPL_IT, Manual } PartitionMethod;