Commit 79a33501 authored by Charles G Waldman's avatar Charles G Waldman
Browse files

Merge branch 'cgw-enthalpy' into 'main'

add enthalpy_of_formation and reference_temperature

See merge request !192
parents e64b2d4b dbf2cbe2
Loading
Loading
Loading
Loading
Loading
+9 −6
Changes for docs/source_docs/user_guide/inputs/fluid_model.rst: 9 added lines, 6 removed lines.
Original line number Diff line number Diff line
@@ -259,7 +259,7 @@ The following inputs are defined using the prefix ``[fluid_name].specific_heat``
|                              |      :math:`c_{p,\mathrm{mixture}} = \sum_n X_n c_{p,n}`       |        |          |
|                              |                                                                |        |          |
+------------------------------+----------------------------------------------------------------+--------+----------+
| constant                     | Constant fluid specific heat                                   | Real   |  0       |
| constant                     | Constant fluid specific heat.                                  | Real   |  0       |
|                              | A value is required for ``constant`` specific heat model.      |        |          |
|                              |                                                                |        |          |
+------------------------------+----------------------------------------------------------------+--------+----------+
@@ -289,12 +289,15 @@ The following inputs are defined using the prefix ``[fluid_name].specific_heat``

The following inputs are defined using the prefix ``[fluid_name]``.

+------------------------------+----------------------------------------------------------------+--------+----------+
+--------------------------+----------------------------------------------------------------+--------+----------+
|                          | Description                                                    |  Type  | Default  |
+==============================+================================================================+========+==========+
| reference_temperature        | Reference temperature used to compute specific                 | Real   | 298.     |
|                              | enthalpy.                                                      |        |          |
+------------------------------+----------------------------------------------------------------+--------+----------+
+==========================+================================================================+========+==========+
| enthalpy_of_formation    | Enthalpy of formation of fluid.  Only used when the fluid      | Real   |  0       |
|                          | specific heat model is ``constant``.                           |        |          |
+--------------------------+----------------------------------------------------------------+--------+----------+
| reference_temperature    | Reference temperature used to compute fluid specific           | Real   | 298.0    |
|                          | enthalpy when using ``constant`` specific heat model.          |        |          |
+--------------------------+----------------------------------------------------------------+--------+----------+



+9 −4
Changes for docs/source_docs/user_guide/inputs/solids_model.rst: 9 added lines, 4 removed lines.
Original line number Diff line number Diff line
@@ -95,11 +95,16 @@ The following inputs are defined with the prefix ``solids.specific_heat``:

The following inputs are defined with the prefix  ``solids``:

+----------------------------+--------------------------------------------------------------+----------+----------+

+------------------------+----------------------------------------------------------------+--------+----------+
|                        | Description                                                    |  Type  | Default  |
+============================+==============================================================+==========+==========+
| reference_temperature      | Reference temperature used for specific enthalpy.            |  Real    |  0       |
+----------------------------+--------------------------------------------------------------+----------+----------+
+========================+================================================================+========+==========+
| enthalpy_of_formation  | Enthalpy of formation of solids.  Only used when the solids    | Real   |  0       |
|                        | specific heat model is ``constant``.                           |        |          |
+------------------------+----------------------------------------------------------------+--------+----------+
| reference_temperature  | Reference temperature used to compute solids specific          | Real   | 298.0    |
|                        | enthalpy when using ``constant`` specific heat model.          |        |          |
+------------------------+----------------------------------------------------------------+--------+----------+


Thermal conductivity
+12 −8
Changes for docs/source_docs/user_guide/inputs/species.rst: 12 added lines, 8 removed lines.
Original line number Diff line number Diff line
@@ -62,8 +62,8 @@ The following inputs are defined using the prefix ``species.specific_heat``:
|                        | Description                                                             |   Type   | Default   |
+========================+=========================================================================+==========+===========+
| model                  | Species specific heat model. This setting only applies if either        | String   |           |
|                        | ``fluid.specific_heat = mixture`` or                                    |          |           |
|                        | ``solids.specific_heat = mixture``                                      |          |           |
|                        | ``fluid.specific_heat.model = mixture`` or                              |          |           |
|                        | ``solids.specific_heat.model = mixture``                                |          |           |
|                        |                                                                         |          |           |
|                        | Options (case-insensitive):                                             |          |           |
|                        |                                                                         |          |           |
@@ -136,13 +136,17 @@ The following inputs are defined for each species using the prefix ``species.[sp

The following inputs are defined for each species using the prefix ``species.[species_name]``:

+------------------------+-------------------------------------------------------------------------+----------+-----------+

+------------------------+----------------------------------------------------------------+--------+----------+
|                        | Description                                                    |  Type  | Default  |
+========================+=========================================================================+==========+===========+
| enthalpy_of_formation  | Enthalpy of formation of species. Required only when                    |  Real    |  0        |
|                        | the specific heat model is ``constant`` and chemical reactions          |          |           |
|                        | are defined.                                                            |          |           |
+------------------------+-------------------------------------------------------------------------+----------+-----------+
+========================+================================================================+========+==========+
| enthalpy_of_formation  | Enthalpy of formation of species.  Only used when the species  | Real   |  0       |
|                        | specific heat model is ``constant`` and chemical reactions are |        |          |
|                        | defined.                                                       |        |          |
+------------------------+----------------------------------------------------------------+--------+----------+
| reference_temperature  | Reference temperature used to compute species specific         | Real   | 298.0    |
|                        | enthalpy when using ``constant`` specific heat model.          |        |          |
+------------------------+----------------------------------------------------------------+--------+----------+


Viscosity