CDPP / AMDA_Integration

Commit 14f840415af33ced81bf62176c35ef1549bc0463

Authored by Benjamin Renard
2 parents 307aa386 b302ab2c
Exists in master and in 55 other branches 10098, 4797, 5390, 6728, 7616, 8528, 8928, 9016Bis, 9049, 9084, 9259, 9326, FER_10400, FER_10663, FER_11100, FER_11242, FER_11500, FER_11586, FER_11588, FER_6265, FER_6860, FER_6951, FER_7618, FER_8455, FER_9629, FER_9915, FER_CR41, FER_CR42, FER_CR43, FER_TFCat, Histo1D2D, MAZ_10936, MAZ_11362, MAZ_6018, MAZ_9016_New, MAZ_FIX_9016, New_ColorMaps, SpeasyGet, amdadev, anr_tempete, cu2022, density_maps, develop, expression-parser-bre, frames-transformation, master_vge, mlplasmas, multiplot, new-save-plot-request, rm_6912, rm_7926, rm_8932, save-other-requests, test-merge, ws_get_catalog

Merge branch 'master' into new-save-plot-request

Showing 1 changed file with 3 additions and 0 deletions   Show diff stats
Inline Side-by-side
src/Request/Config/KernelConfigClass.php
  Diff comments   View file @14f8404
@@ -192,6 +192,9 @@ class KernelConfigClass @@ -192,6 +192,9 @@ class KernelConfigClass
192 foreach (self::$libArray as $lib) 192 foreach (self::$libArray as $lib)
193 $appProperties["app.process.LIB"] .= ("-l".$lib." "); 193 $appProperties["app.process.LIB"] .= ("-l".$lib." ");
194 194
  195 + $appProperties["app.process.DYNAMIC_LOADING"] = "false";
  196 + $appProperties["app.process.plugins.xml"] = KERNEL_CONFIG_DIR.'/plugins.xml';
  197 +
195 $appProperties["app.plot.configfile"] = KERNEL_CONFIG_DIR.'/'.self::$plotConfigFile; 198 $appProperties["app.plot.configfile"] = KERNEL_CONFIG_DIR.'/'.self::$plotConfigFile;
196 199
197 $appProperties["app.param.gapthreshold"] = self::$defaultGapThreshold; 200 $appProperties["app.param.gapthreshold"] = self::$defaultGapThreshold;