Directory CCA/Components/Arches/CoalModels/

Lines of Code

Developers

Most Recent Commits

jpedel 2011-12-13 17:22 Rev.: 47986

updating previous model

0 lines of code changed in 2 files:

• CCA/Components/Arches/CoalModels: ShaddixHeatTransfer.cc (new)

jpedel 2011-12-12 16:31 Rev.: 47980

Fixing the comliling problem

0 lines of code changed in 2 files:

• CCA/Components/Arches/CoalModels: sub.mk (changed)

jpedel 2011-12-12 15:57 Rev.: 47979

Particle Enthalpy Model

87 lines of code changed in 13 files:

• CCA/Components/Arches/CoalModels: CharOxidationShaddix.cc (new), CharOxidationShaddix.h (+1), HeatTransfer.cc (new), HeatTransfer.h (new), YamamotoDevol.cc (+32 -13), YamamotoDevol.h (new), sub.mk (+1)

jpedel 2011-12-12 15:51 Rev.: 47978

Adding Particle Enthalpy model for DQMOM

1118 lines of code changed in 2 files:

• CCA/Components/Arches/CoalModels: EnthalpyShaddix.cc (new 910), EnthalpyShaddix.h (new 208)

jpedel 2011-11-11 11:16 Rev.: 47798

New DQMOM formulation based on weighted abscissas which conserves particle mass and momentum. This should break the regression dqmom tests 2 to 5. Gold standards will need to be replaced

232 lines of code changed in 26 files:

• CCA/Components/Arches/CoalModels: BadHawkDevol.cc (new), CharOxidation.cc (+22 -25), CharOxidationShaddix.cc (+8 -12), Devolatilization.cc (+20 -10), HeatTransfer.cc (+30 -10), HeatTransfer.h (+8), KobayashiSarofimDevol.cc (+6 -5), ModelBase.h (+4), ShaddixHeatTransfer.cc (+58 -26), ShaddixHeatTransfer.h (new), SimpleHeatTransfer.cc (new), XDragModel.cc (+8 -16), YDragModel.cc (+8 -17), YamamotoDevol.cc (+30 -4), YamamotoDevol.h (+4), ZDragModel.cc (+8 -17)

jthornoc 2011-10-26 10:54 Rev.: 47774

Fixed volume/area fraction calculation for new BC's.
Formatting changes.
Added extra local labels for coal models.

1 lines of code changed in 3 files:

• CCA/Components/Arches/CoalModels: Devolatilization.h (new), ModelBase.h (+1 -4)

jthornoc 2011-10-13 15:01 Rev.: 47712

Fixed an inadvertent redefinition of the _radiation variable.

0 lines of code changed in 1 file:

• CCA/Components/Arches/CoalModels: ShaddixHeatTransfer.h (-2)

jthornoc 2011-09-26 07:10 Rev.: 47633

Shelving Julien's commit until we can resolve the differences in the RT
or determine if we need new GS's and tests.

76 lines of code changed in 10 files:

• CCA/Components/Arches/CoalModels: CharOxidationShaddix.cc (+8 -7), HeatTransfer.cc (+2 -25), HeatTransfer.h (-8), KobayashiSarofimDevol.cc (+5 -6), ShaddixHeatTransfer.cc (+7 -34), XDragModel.cc (+16 -8), YDragModel.cc (+17 -8), YamamotoDevol.cc (+4 -30), YamamotoDevol.h (-4), ZDragModel.cc (+17 -8)

jpedel 2011-09-25 14:52 Rev.: 47630

Implementing a better formualtion for weighted DQMOM

138 lines of code changed in 10 files:

• CCA/Components/Arches/CoalModels: CharOxidationShaddix.cc (+7 -8), HeatTransfer.cc (+25 -2), HeatTransfer.h (+8), KobayashiSarofimDevol.cc (+6 -5), ShaddixHeatTransfer.cc (+34 -7), XDragModel.cc (+8 -16), YDragModel.cc (+8 -17), YamamotoDevol.cc (+30 -4), YamamotoDevol.h (+4), ZDragModel.cc (+8 -17)

jthornoc 2011-09-19 16:52 Rev.: 47614

Missing dependency in sub.mk.

1 lines of code changed in 1 file:

• CCA/Components/Arches/CoalModels: sub.mk (+1)

jthornoc 2011-09-19 11:38 Rev.: 47609

Renaming some variables.

4 lines of code changed in 2 files:

• CCA/Components/Arches/CoalModels: ShaddixHeatTransfer.cc (+2 -3), SimpleHeatTransfer.cc (+2 -3)

jthornoc 2011-09-19 11:38 Rev.: 47608

Calling the Glacier rqpart fortran code now in the correct place for
particle radiation properties.

42 lines of code changed in 8 files:

• CCA/Components/Arches/CoalModels: HeatTransfer.cc (+3 -4), HeatTransfer.h (+2 -2), ShaddixHeatTransfer.cc (+20 -12), ShaddixHeatTransfer.h (+2 -5), SimpleHeatTransfer.cc (+14 -12), SimpleHeatTransfer.h (-5), sub.mk (+1 -1)

dav 2011-09-08 17:04 Rev.: 47564

Fix for Jeremy's new CoalModel fortran linking problem. Jeremy, please
see comments below:

M CCA/Components/Arches/CoalModels/sub.mk

In order for the fortran files .h (in this case: rqpart_fort.h) to be
created, another files needs to depend on it. Normally, there would
be a "#include <.../rqpart_fort.h>" line in one of the .cc files. I
didn't see this, so I assume you aren't actually using it yet
(probably waiting for the linking issue to be resolved. :) Because of
this, I arbitrarily made DragModel.o depend on rqpart_fort.h. By
setting this dependency, the make system knows to generate the
rqpart_fort.h file (from the rqpart.fspec file). Once you know which
file really depends on it (the one that #includes it), you should
update this sub.mk file accordingly.

M CCA/Components/Arches/CoalModels/fortran/sub.mk

The CoalModel/fortran directory is NOT being used as a separate
library (.so file). Thus we do NOT need the "include
smallso_prologue.mk" and "include smallso_epilogue.mk" lines (or the
PSELIBS or LIBS being set).

I also fixed the .h dependency. The file 'rqpart.h' does not exist,
and is not generated... however, 'rqpart_fort.h' is automatically
generated from the fspec file so that is the one we need here.

D CCA/Components/Arches/CoalModels/fortran/rqpart.f
A + CCA/Components/Arches/CoalModels/fortran/rqpart.F

I renamed the fortran from from .f to .F because our make rule is
based on '.F' files. I briefly looked at the build rules, and there
is one for '.f' files, but I think it is old and out of date. With
more time, it probably should be updated or scrapped.

M CCA/Components/Arches/sub.mk

Added in the CoalModel/fortran directory. Removed some tabs and alphabetized.

2 lines of code changed in 1 file:

• CCA/Components/Arches/CoalModels: sub.mk (+2)

jthornoc 2011-08-16 17:12 Rev.: 47466

Compiler warnings.

0 lines of code changed in 1 file:

• CCA/Components/Arches/CoalModels: XDragModel.cc (-4)

jpedel 2011-08-14 17:01 Rev.: 47451

Removing unused variable

0 lines of code changed in 1 file:

• CCA/Components/Arches/CoalModels: CharOxidationShaddix.h (-1)

jpedel 2011-08-14 16:57 Rev.: 47450

Better model implementation for the weighted abscissas formualtion. Other models will be modified later.

100 lines of code changed in 9 files:

• CCA/Components/Arches/CoalModels: CharOxidationShaddix.cc (+30 -18), CharOxidationShaddix.h (+2), KobayashiSarofimDevol.cc (+29 -5), KobayashiSarofimDevol.h (new), ShaddixHeatTransfer.cc (+11 -8), XDragModel.cc (+13 -8), YDragModel.cc (+6 -7), ZDragModel.cc (+5 -8)

dav 2011-07-13 16:35 Rev.: 47337

Previous commit fixed this... don't need 'using std::abs'.

0 lines of code changed in 2 files:

• CCA/Components/Arches/CoalModels: PartVel.cc (changed)

jsutherland 2011-07-13 16:24 Rev.: 47336

more cleanup and chasing the Arches test failures.

5 lines of code changed in 3 files:

• CCA/Components/Arches/CoalModels: PartVel.cc (+2), PartVel.h (+3 -3)

dav 2011-07-13 16:01 Rev.: 47333

Fix for an issue that arose when 'using namespace std' was removed from
header files.

M CCA/Components/Arches/CoalModels/PartVel.cc

abs() only works on int's. Need 'fabs()' for floating point numbers.

M R_Tester/toplevel/generateGoldStandards.py
M R_Tester/helpers/runSusTests.py

Added a (commented out) line that makes debugging faster...

M Core/Parallel/BufferInfo.h

Don't need 'using namespace std' any more as the above update to
PartVel fixes the problem.

5 lines of code changed in 1 file:

• CCA/Components/Arches/CoalModels: PartVel.cc (+5 -5)

jpedel 2011-06-19 20:28 Rev.: 47278

Reverting Y2 to default value

1 lines of code changed in 1 file:

• CCA/Components/Arches/CoalModels: KobayashiSarofimDevol.cc (+1 -1)

(22 more)