stardis

commit d41394dffa2b24b690a76ce8f1e50d218937c7c5
parent 230d8262d64c31a49afee89fc56014fc0dfdaa4e
Author: Christophe Coustet <christophe.coustet@meso-star.com>
Date:   Thu, 24 Sep 2020 12:16:22 +0200

BugFix: undetected option incompatibility

Diffstat:
M
src/stardis-parsing.c
 | 
10
+++++-----
M
src/stardis-parsing.h
 | 
3
++-

2 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/src/stardis-parsing.c b/src/stardis-parsing.c
@@ -615,10 +615,6 @@ parse_args
       args->mode |= MODE_DUMP_VTK;
       break;
 
-    case 'e':
-      args->mode |= MODE_EXTENDED_RESULTS;
-      break;
-
     case 'D': {
       char* ptr = strrchr(optarg, ',');
       if(!ptr || ptr != strchr(optarg, ','))
@@ -649,6 +645,10 @@ parse_args
       break;
     }
 
+    case 'e':
+      args->mode |= MODE_EXTENDED_RESULTS;
+      break;
+
     /*case 'F': see 's' */
 
     case 'g':
@@ -893,7 +893,7 @@ parse_args
   }
 
   if(args->mode & MODE_EXTENDED_RESULTS) {
-    if(!(args->mode & COMPUTE_MODES)) {
+    if(!(args->mode & EXT_COMPATIBLE_MODES)) {
       res = RES_BAD_ARG;
       print_multiple_modes(buf, sizeof(buf), EXT_COMPATIBLE_MODES, 0);
       logger_print(args->logger, LOG_ERROR,
diff --git a/src/stardis-parsing.h b/src/stardis-parsing.h
@@ -68,7 +68,8 @@ enum stardis_mode {
   SURFACE_COMPUTE_MODES
     = MODE_BOUNDARY_COMPUTE | MODE_FLUX_BOUNDARY_COMPUTE | MODE_MAP_COMPUTE,
 
-  EXT_COMPATIBLE_MODES = GREEN_COMPATIBLE_MODES | MODE_MEDIUM_COMPUTE,
+  EXT_COMPATIBLE_MODES
+    = GREEN_COMPATIBLE_MODES | MODE_MEDIUM_COMPUTE | MODE_FLUX_BOUNDARY_COMPUTE,
 
   REGION_COMPUTE_MODES = SURFACE_COMPUTE_MODES | MODE_MEDIUM_COMPUTE,