[root]/CCA/Components/Arches/CoalModels/fortran
Author | Changes | Lines of Code | Lines per Change |
---|---|---|---|
Totals | 14 (100.0%) | 751 (100.0%) | 53.6 |
jthornoc | 9 (64.3%) | 670 (89.2%) | 74.4 |
dav | 3 (21.4%) | 80 (10.7%) | 26.6 |
jas | 2 (14.3%) | 1 (0.1%) | 0.5 |
Update copyright date.
1 lines of code changed in 2 files:
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.
80 lines of code changed in 3 files:
Added a sub.mk file for the new fortran stuff.
46 lines of code changed in 1 file:
Adding particle adsorbtion coefficient code. Not yet plugged into the
coal model.
624 lines of code changed in 8 files: