Skip to content

Commit

Permalink
[iss-226]
Browse files Browse the repository at this point in the history
Squashed commit of the following:

commit efe64ee
Author: joaquin.f.fernandez <joaquin.f.fernandez@gmail.com>
Date:   Thu May 4 12:03:25 2023 -0300

    Updated mLIQSS2 method.

commit cea8027
Author: joaquin.f.fernandez <joaquin.f.fernandez@gmail.com>
Date:   Thu May 4 12:03:11 2023 -0300

    Updated quantizer state for mliqss methods.

commit 6343bf0
Author: joaquin.f.fernandez <joaquin.f.fernandez@gmail.com>
Date:   Tue May 2 15:20:25 2023 -0300

    Updated quantizer state.

commit 2aa5e88
Author: joaquin.f.fernandez <joaquin.f.fernandez@gmail.com>
Date:   Tue May 2 14:45:04 2023 -0300

    Added mLIQSS methods to compiler.

commit b2a1e3a
Author: joaquin.f.fernandez <joaquin.f.fernandez@gmail.com>
Date:   Tue May 2 14:44:35 2023 -0300

    Add mLIQSS methods to GUI.

commit 58cda13
Author: joaquin.f.fernandez <joaquin.f.fernandez@gmail.com>
Date:   Tue May 2 14:43:58 2023 -0300

    Fix compiler warnings.

commit 248407e
Author: joaquin.f.fernandez <joaquin.f.fernandez@gmail.com>
Date:   Tue May 2 14:43:44 2023 -0300

    Add mLIQSS methods to engine.

commit 7a5c66c
Author: joaquin.f.fernandez <joaquin.f.fernandez@gmail.com>
Date:   Tue May 2 14:42:20 2023 -0300

    Remove qss test methods from engine.
  • Loading branch information
joaquinffernandez committed Jun 1, 2023
1 parent 6441618 commit 59073eb
Show file tree
Hide file tree
Showing 20 changed files with 1,356 additions and 162 deletions.
4 changes: 3 additions & 1 deletion src/engine/common/data.h
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
11 changes: 9 additions & 2 deletions src/engine/common/settings.c
Original file line number Diff line number Diff line change
Expand Up @@ -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")) {
Expand Down Expand Up @@ -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:
Expand All @@ -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;
Expand Down
4 changes: 3 additions & 1 deletion src/engine/qss/methods/Makefile.include
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
Loading

0 comments on commit 59073eb

Please sign in to comment.