Merge branch 'master' into remove-unused-doc-png

CCSI-Toolset · Oct 1, 2024 · ac3b0a5 · ac3b0a5
2 parents 3fde66b + 6e306a6
commit ac3b0a5
Show file tree

Hide file tree

Showing 4 changed files with 34 additions and 12 deletions.
diff --git a/docs/source/chapt_flowsheet/figs/nodeEditor_AspenConfig.png b/docs/source/chapt_flowsheet/figs/nodeEditor_AspenConfig.png
diff --git a/docs/source/chapt_flowsheet/reference/flowsheet.rst b/docs/source/chapt_flowsheet/reference/flowsheet.rst
@@ -268,6 +268,28 @@ contains the columns: Name, Value, Unit, Type, Description, and Tags.
 The value of the outputs may not correspond to the inputs until the
 simulation has been run.
 
+Aspen Configuration Parameters
+------------------------------
+
+Users can modify some Aspen Consumer configuration parameters in the Node Editor panel. They can
+browse to the location of the AspenSinterConsumerConsole.xml file using the **Browse...** button.
+For installations of SimSinter 3.x or higher this will most likely be
+``C:\Program Files\Turbine\Lite\Consumers``. For older versions of SimSinter this will most likely be
+``C:\Program Files (x86)\Turbine\Lite\Consumers``.
+
+Once the correct XML file has been selected, the table will be populated with the current values for
+**TimeOutIterations**, **TimeOutSetupIterations** and **TimePostInitIterations**.
+
+Users can edit any of these three values and when they are ready click the **Update Configuration
+Parameters** button. The current XML file will get updated with the new values and a backup copy
+of the old version will get saved in the same location.
+
+.. figure:: ../figs/nodeEditor_AspenConfig.png
+   :alt: Aspen Configuration Parameters
+   :name: fig.node.editor.aspen.config.parameters
+
+   Aspen Configuration Parameters
+
 Node Script
 -----------
 

diff --git a/foqus_lib/gui/flowsheet/nodePanel_UI.ui b/foqus_lib/gui/flowsheet/nodePanel_UI.ui
@@ -6,7 +6,7 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>3440</width>
+    <width>2560</width>
     <height>1387</height>
    </rect>
   </property>
@@ -441,14 +441,14 @@
         <item>
          <widget class="QToolBox" name="toolBox">
           <property name="currentIndex">
-           <number>0</number>
+           <number>3</number>
           </property>
           <widget class="QWidget" name="page">
            <property name="geometry">
             <rect>
              <x>0</x>
              <y>0</y>
-             <width>3370</width>
+             <width>2490</width>
              <height>367</height>
             </rect>
            </property>
@@ -749,7 +749,7 @@
             <rect>
              <x>0</x>
              <y>0</y>
-             <width>3370</width>
+             <width>2490</width>
              <height>367</height>
             </rect>
            </property>
@@ -924,8 +924,8 @@
             <rect>
              <x>0</x>
              <y>0</y>
-             <width>3370</width>
-             <height>879</height>
+             <width>2490</width>
+             <height>367</height>
             </rect>
            </property>
            <attribute name="label">
@@ -958,7 +958,7 @@
             <rect>
              <x>0</x>
              <y>0</y>
-             <width>3370</width>
+             <width>2490</width>
              <height>367</height>
             </rect>
            </property>
@@ -978,7 +978,7 @@
               <item>
                <widget class="QLineEdit" name="configFile_edit">
                 <property name="text">
-                 <string>\Program Files (x86)\Turbine\Lite\Consumers\AspenSinterConsumerConsole.xml</string>
+                 <string>C:\Program Files\Turbine\Lite\Consumers\AspenSinterConsumerConsole.xml</string>
                 </property>
                </widget>
               </item>

diff --git a/foqus_lib/gui/sdoe/sdoeAnalysisDialog.py b/foqus_lib/gui/sdoe/sdoeAnalysisDialog.py
@@ -178,10 +178,10 @@ def __init__(
             self.progress2_groupBox.setHidden(True)
 
         # spin box bounds
-        self.minDesignSize_spin.setMaximum(len(candidateData.getInputData()))
-        self.maxDesignSize_spin.setMaximum(len(candidateData.getInputData()))
-        self.designSize_spin.setMaximum(len(candidateData.getInputData()))
-        self.designSizeIRSF_spin.setMaximum(len(candidateData.getInputData()))
+        self.minDesignSize_spin.setMaximum(len(candidateData.getInputData()) - 1)
+        self.maxDesignSize_spin.setMaximum(len(candidateData.getInputData()) - 1)
+        self.designSize_spin.setMaximum(len(candidateData.getInputData()) - 1)
+        self.designSizeIRSF_spin.setMaximum(len(candidateData.getInputData()) - 1)
         self.ncand_samplesIRSF_spin.setRange(1, len(candidateData.getInputData()))
         self.ncand_samplesIRSF_spin.setValue(
             int(0.1 * len(candidateData.getInputData()))