Skip to content

Commit

Permalink
quick create solid
Browse files Browse the repository at this point in the history
  • Loading branch information
DanWBR committed Jun 10, 2022
1 parent 4e186cf commit 5a8438a
Show file tree
Hide file tree
Showing 12 changed files with 11,107 additions and 9,736 deletions.
1 change: 0 additions & 1 deletion DWSIM.Thermodynamics/PropertyPackages/PropertyPackage.vb
Original file line number Diff line number Diff line change
Expand Up @@ -7465,7 +7465,6 @@ Final3:
E = cprops(i).Solid_Heat_Capacity_Const_E
'<SolidHeatCapacityCp name="Solid heat capacity" units="J/kmol/K" >
Cpi = CalcCSTDepProp(eqno, A, B, C, D, E, T, 0) / 1000 / mw 'kJ/kg.K

If cprops(i).TemperatureOfFusion < 298.15 Then
HS += VMF(i) * Me.AUX_INT_CPDTi_L(298.15, cprops(i).TemperatureOfFusion, cprops(i).Name)
HS -= VMF(i) * cprops(i).EnthalpyOfFusionAtTf * 1000 / mw
Expand Down
12 changes: 12 additions & 0 deletions DWSIM/DWSIM.vbproj
Original file line number Diff line number Diff line change
Expand Up @@ -542,6 +542,12 @@
<Compile Include="Controls\ScriptEditorControlMono.vb">
<SubType>UserControl</SubType>
</Compile>
<Compile Include="Forms\CompoundCreator\FormCreateNewSolid.Designer.vb">
<DependentUpon>FormCreateNewSolid.vb</DependentUpon>
</Compile>
<Compile Include="Forms\CompoundCreator\FormCreateNewSolid.vb">
<SubType>Form</SubType>
</Compile>
<Compile Include="Forms\CompoundCreator\FormImportCompoundDataDDB.Designer.vb">
<DependentUpon>FormImportCompoundDataDDB.vb</DependentUpon>
</Compile>
Expand Down Expand Up @@ -1280,6 +1286,12 @@
<EmbeddedResource Include="Forms\AboutBox.es.resx">
<DependentUpon>AboutBox.vb</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="Forms\CompoundCreator\FormCreateNewSolid.en.resx">
<DependentUpon>FormCreateNewSolid.vb</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="Forms\CompoundCreator\FormCreateNewSolid.resx">
<DependentUpon>FormCreateNewSolid.vb</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="Forms\CompoundCreator\FormImportCompoundDataChemeo.de.resx">
<DependentUpon>FormImportCompoundDataChemeo.vb</DependentUpon>
</EmbeddedResource>
Expand Down
29 changes: 28 additions & 1 deletion DWSIM/Forms/CompoundCreator/FormCompoundCreator.en.resx
Original file line number Diff line number Diff line change
Expand Up @@ -130,25 +130,52 @@
<data name="LinkPubChem.Location" type="System.Drawing.Point, System.Drawing">
<value>629, 100</value>
</data>
<data name="TextBoxSMILES.Location" type="System.Drawing.Point, System.Drawing">
<value>116, 97</value>
</data>
<data name="TextBoxSMILES.Size" type="System.Drawing.Size, System.Drawing">
<value>291, 20</value>
</data>
<assembly alias="mscorlib" name="mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<data name="TextBoxSMILES.TabIndex" type="System.Int32, mscorlib">
<value>4</value>
</data>
<data name="TextBoxCAS.Location" type="System.Drawing.Point, System.Drawing">
<value>116, 13</value>
</data>
<data name="TextBoxCAS.TabIndex" type="System.Int32, mscorlib">
<value>1</value>
</data>
<data name="Label51.Location" type="System.Drawing.Point, System.Drawing">
<value>9, 99</value>
</data>
<data name="Label21.Text" xml:space="preserve">
<value>Formula</value>
</data>
<data name="TextBoxFormula.Location" type="System.Drawing.Point, System.Drawing">
<value>116, 67</value>
</data>
<data name="TextBoxFormula.TabIndex" type="System.Int32, mscorlib">
<value>3</value>
</data>
<data name="Label22.Size" type="System.Drawing.Size, System.Drawing">
<value>90, 13</value>
</data>
<data name="Label22.Text" xml:space="preserve">
<value>Mole Weight</value>
<value>Molecular Weight</value>
</data>
<data name="TextBoxMW.Location" type="System.Drawing.Point, System.Drawing">
<value>116, 40</value>
</data>
<data name="TextBoxMW.TabIndex" type="System.Int32, mscorlib">
<value>2</value>
</data>
<data name="lblMW.Location" type="System.Drawing.Point, System.Drawing">
<value>185, 43</value>
</data>
<data name="CheckBoxMW.Location" type="System.Drawing.Point, System.Drawing">
<value>235, 43</value>
</data>
<data name="Label60.Size" type="System.Drawing.Size, System.Drawing">
<value>384, 13</value>
</data>
Expand Down
Loading

0 comments on commit 5a8438a

Please sign in to comment.