Add model_maker to pipeline testing

.gitlab-ci.yml

@@ -217,8 +217,11 @@ running_stage:
    artifacts:
       paths:
          - build/cluster/c_*
+         - build/cluster/D*
          - build/inclusion/c_*
+         - build/inclusion/D*
          - build/sphere/c_*
+         - build/sphere/D*
          #- build/trapping/*
       exclude:
          - ".git*"
@@ -233,17 +236,23 @@ running_stage:
       - cd build/libnptm
       - export LD_LIBRARY_PATH="$LD_LIBRARY_PATH;$PWD"
       - cd ../sphere
+      - echo "Testing configurator for sphere"
+      - ../../src/scripts/model_maker.py ../../test_data/sphere/config_dev.yml
       - echo "Running np_sphere"
       - chmod +x np_sphere
-      - OMP_NUM_THREADS=1 ./np_sphere
+      - OMP_NUM_THREADS=1 ./np_sphere DEDFB DSPH .
       - cd ../cluster
+      - echo "Testing configurator for cluster"
+      - ../../src/scripts/model_maker.py ../../test_data/cluster/config_dev.yml
       - echo "Running np_cluster"
       - chmod +x np_cluster
-      - OMP_NUM_THREADS=1 ./np_cluster
+      - OMP_NUM_THREADS=1 ./np_cluster DEDFB DCLU .
       - cd ../inclusion
+      - echo "Testing configurator for inclusion"
+      - ../../src/scripts/model_maker.py ../../test_data/inclusion/config_dev.yml
       - echo "Running np_inclusion"
       - chmod +x np_inclusion
-      - OMP_NUM_THREADS=1 ./np_inclusion
+      - OMP_NUM_THREADS=1 ./np_inclusion DEDFB DINCLU .
       
 testing_stage:
    stage: test

test_data/inclusion/config_dev.yml

@@ -16,7 +16,7 @@ output_settings:
   # Folder for the code output storage
   output_folder: "."
   # Name of the main output file
-  output_name  : "c_OCLU"
+  output_name  : "c_OINCLU"
   # Requested output formats
   formats      : [ "LEGACY", "HDF5" ]
   # Index of the scale for transition matrix output