lp:~wence/fluidity/fixup-version-number
- Get this branch:
- bzr branch lp:~wence/fluidity/fixup-version-number
Branch merges
- Adam Candy: Needs Fixing
- Tim Bond (community): Approve
-
Diff: 232 lines (+19/-43)13 files modifiedMakefile.in (+10/-2)
configure (+0/-7)
configure.in (+0/-6)
femtools/Diagnostic_variables.F90 (+1/-0)
femtools/Makefile.dependencies (+2/-2)
include/Usage.h (+1/-0)
include/qg_usage.h (+1/-0)
libadaptivity/configure (+0/-7)
libadaptivity/configure.in (+0/-6)
libvtkfortran/configure (+0/-7)
libvtkfortran/configure.in (+0/-6)
main/Makefile.in (+2/-0)
qg_strat/Makefile.in (+2/-0)
Related bugs
Bug #814839: Revision number in usage not updated without a 'make clean' | Low | Fix Released | |
Bug #815814: create_makefile.py interferes with correct revision number report | Undecided | Fix Released |
Related blueprints
Branch information
Recent revisions
- 3558. By Lawrence Mitchell
-
buildsystem: Move version definition out of include/confdefs.h
Setting the version number of Fluidity during configure is the wrong
thing to do, and writing it into include/confdefs.h doubly so.
Instead, add a new rule to the top-level Makefile to generate
include/version.h. If you need to know __FLUIDITY_VERSION_ _ you must
now explicitly include version.h as well confdefs.h.While we're at it, remove any last vestiges of svnversion from the
configure scripts. - 3557. By Tim Bond
-
Description of the Change from Patrick:
Extensions to the python-state system to expose CSR matrices.
User code can access CSR matrices like:
m = state.csr_
matrices[ 'PressureMeshMa ssMatrix' ] The interface is quite extensive, as it subclasses scipy.sparse.
csr_matrix. So
you can do almost anything with it: multiply it by a vector (m * field.val),
solve mu = b (scipy.sparse. linalg. spsolve) , etc. This code was written by Nan Mao; I just cleaned it up and prepared it for
merging.Note that it only exposes CSR matrices that happened to exist in state when it
was passed to calculate_diagnostic_ fields. In many cases, that appears to be
precisely 0. One can test this by adding a call toget_mass_
matrix( state, velocity_mesh) just before the call to calculate_
diagnostic_ variables. When this is merged, I
will investigate the lifecycle of the CSR matrices in state so that there is
actually data to expose. - 3556. By Stephan Kramer
-
Bug-fix in interpolation manager for periodic meshes. This fixes bug https:/
/bugs.launchpad .net/fluidity/ +bug/822355 reported by Flora. - 3555. By Lawrence Mitchell
-
Fix invalid element in adaptivity_options schema
Relax-NG doesn't allow mixing string and data in a single group in an
element, so don't do it. - 3554. By Tim Bond
-
Reverting 3553; this fixes 4.6 but breaks Intel 10, and the latter is more
important to us at the moment. - 3553. By Tim Bond
-
Small bufix targetting bug:
https:/
/bugs.launchpad .net/fluidity/ +bug/823966 swapping the order of the parmetis and zoltan checks in configure.in
to fix a linking bug using gcc 4.6 on oneiric. - 3551. By Jon Hill
-
Fix for the failing flredecomp test. Probably better ways to fix this long term, but this will suffice for now
- 3550. By Adam Candy
-
Bringing partition.cpp back - effectively revoking r3549 (apologies for the break in history).
Branch metadata
- Branch format:
- Branch format 7
- Repository format:
- Bazaar repository format 2a (needs bzr 1.16 or later)
- Stacked on:
- lp:fluidity