Merge branch 'qss-solver-dev' into release-4.2.0

CIFASIS · Jun 1, 2023 · 2b6b0b7 · 2b6b0b7
2 parents 6289848 + 59073eb
commit 2b6b0b7
Show file tree

Hide file tree

Showing 20 changed files with 1,356 additions and 162 deletions.
diff --git a/src/engine/common/data.h b/src/engine/common/data.h
@@ -62,7 +62,9 @@ typedef enum {
   SD_CVODE_BDF,
   SD_CVODE_AM,
   SD_IDA,
-  SD_QSS_TEST
+  SD_mLIQSS,
+  SD_mLIQSS2,
+  SD_mLIQSS3
 } SD_Solver;
 
 typedef enum {

diff --git a/src/engine/common/settings.c b/src/engine/common/settings.c
@@ -46,8 +46,12 @@ SD_Solver _getSolver(const char *sol)
     return SD_LIQSS3;
   } else if (!strcmp(sol, "QSS4")) {
     return SD_QSS4;
-  } else if (!strcmp(sol, "QSS_TEST")) {
-    return SD_QSS_TEST;
+  } else if (!strcmp(sol, "mLIQSS")) {
+    return SD_mLIQSS;
+  } else if (!strcmp(sol, "mLIQSS2")) {
+    return SD_mLIQSS2;
+  } else if (!strcmp(sol, "mLIQSS3")) {
+    return SD_mLIQSS3;
   } else if (!strcmp(sol, "DASSL")) {
     return SD_DASSL;
   } else if (!strcmp(sol, "DOPRI")) {
@@ -94,6 +98,7 @@ int _getOrder(SD_Solver sol)
   case SD_QSS:
   case SD_CQSS:
   case SD_LIQSS:
+  case SD_mLIQSS:
   case SD_DASSL:
   case SD_DOPRI:
   case SD_CVODE_BDF:
@@ -102,10 +107,12 @@ int _getOrder(SD_Solver sol)
     return 1;
   case SD_QSS2:
   case SD_LIQSS2:
+  case SD_mLIQSS2:
   case SD_LIQSS_BDF:
     return 2;
   case SD_QSS3:
   case SD_LIQSS3:
+  case SD_mLIQSS3:
     return 3;
   case SD_QSS4:
     return 4;

diff --git a/src/engine/qss/methods/Makefile.include b/src/engine/qss/methods/Makefile.include
@@ -11,7 +11,9 @@ SEQ_METHODS_SRC = $(QSS_METHODS_DIR)/qss.c \
 		  $(QSS_METHODS_DIR)/liqss_bdf.c \
 		  $(QSS_METHODS_DIR)/liqss3.c \
 		  $(QSS_METHODS_DIR)/cqss.c \
-		  $(QSS_METHODS_DIR)/qss_test.c
+		  $(QSS_METHODS_DIR)/mliqss.c \
+		  $(QSS_METHODS_DIR)/mliqss2.c \
+		  $(QSS_METHODS_DIR)/mliqss3.c
 
 # Objects