--- a/marea_2/flux_simulation.xml	Tue Jul 30 13:59:02 2024 +0000
+++ b/marea_2/flux_simulation.xml	Tue Jul 30 14:03:15 2024 +0000
@@ -17,12 +17,12 @@
         <![CDATA[
         python $__tool_directory__/flux_simulation.py
         --tool_dir $__tool_directory__
+        --model_selector $cond_model.model_selector
+        #if $cond_model.model_selector == 'Custom'
+            --model $model
+            --model_name $model.element_identifier
+        #end if
         --input "${",".join(map(str, $inputs))}"
-        #set $names = ""
-        #for $input_temp in $inputs:
-            #set $names = $names + $input_temp.element_identifier + ","
-        #end for
-        --name $names
         --thinning 0
         #if $algorithm_param.algorithm == 'OPTGP':
         	--thinning $algorithm_param.thinning
@@ -38,6 +38,13 @@
     </command>
     <inputs>
 
+        <conditional name="cond_model">
+            <expand macro="options_ras_to_bounds_model"/>
+            <when value="Custom">
+                <param name="model" argument="--model" type="data" format="json, xml" label="Custom model" />
+            </when>
+        </conditional> 
+
         <param name="inputs" argument="--inputs" multiple="true" type="data" format="tabular, csv, tsv" label="Bound(s):" />
         
         
@@ -75,9 +82,9 @@
 
         		
     <outputs>
-        <data format="txt" name="log" label="fluxSampling - Log" />
+        <data format="txt" name="log" label="fluxSimulation - Log" />
         <collection name="results" type="list" label="${tool.name} - Samples">
-            <discover_datasets pattern="__name_and_ext__" directory="flux_sampling"/>
+            <discover_datasets pattern="__name_and_ext__" directory="flux_simulation"/>
         </collection>
     </outputs>