lp:~david-ham/fluidity/makefile-experiments

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:fluidity at revision 3476

Jon Hill: Approve on 2011-05-24

David Ham: Needs Resubmitting on 2011-05-20

Diff: 5790 lines (+3905/-1135)

45 files modified

Makefile.in (+56/-0)
adjoint/Makefile.dependencies (+107/-0)
adjoint/Makefile.in (+7/-13)
assemble/Makefile.dependencies (+893/-0)
assemble/Makefile.in (+17/-79)
assemble/mmpde.F90 (+0/-301)
bathymetry/Makefile.dependencies (+1/-0)
bathymetry/Makefile.in (+3/-2)
configure (+31/-8)
configure.in (+28/-8)
debug/Makefile.dependencies (+14/-0)
debug/Makefile.in (+5/-10)
decomp/Makefile.dependencies (+1/-0)
decomp/Makefile.in (+1/-1)
diagnostics/Makefile.dependencies (+141/-0)
diagnostics/Makefile.in (+6/-8)
error_measures/Makefile.dependencies (+267/-0)
error_measures/Makefile.in (+4/-27)
error_measures/Residual_estimation.F90 (+0/-110)
femtools/Makefile.dependencies (+1226/-0)
femtools/Makefile.in (+32/-352)
femtools/test_element_numbering.F90 (+0/-38)
femtools/testshapefunctions.F90 (+0/-61)
forward_interfaces/Makefile.dependencies (+9/-0)
forward_interfaces/Makefile.in (+4/-7)
horizontal_adaptivity/Makefile.dependencies (+54/-0)
horizontal_adaptivity/Makefile.in (+4/-14)
hyperlight/Makefile.in (+2/-3)
libwm/Makefile.dependencies (+1/-0)
libwm/Makefile.in (+1/-1)
main/Makefile.dependencies (+118/-0)
main/Makefile.in (+4/-10)
ocean_forcing/Makefile.dependencies (+53/-0)
ocean_forcing/Makefile.in (+4/-8)
parameterisation/Makefile.dependencies (+56/-0)
parameterisation/Makefile.in (+4/-9)
preprocessor/Makefile.dependencies (+120/-0)
preprocessor/Makefile.in (+4/-14)
radiation/Makefile.dependencies (+349/-0)
radiation/Makefile.in (+4/-39)
reduced_modelling/Makefile.dependencies (+14/-0)
reduced_modelling/Makefile.in (+5/-7)
scripts/create_makefile.py (+230/-0)
sediments/Makefile.dependencies (+21/-0)
sediments/Makefile.in (+4/-5)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

3420. By David Ham on 2011-05-23

fix confdefs.h exclusion

3419. By David Ham on 2011-05-20

Add dependencies files to bzr

3418. By David Ham on 2011-05-20

adjoint merge

3417. By David Ham on 2011-05-20

zoltan detection

3416. By David Ham on 2011-05-20

Merge from trunk.

More cleanup of create_makefile.

Removal of some unused code which doesn't compile.

3415. By David Ham on 2011-05-19

significant cleanup of the python script. Split makefile dependencies out

3414. By David Ham on 2011-05-09

Check for various gfortran versions

3413. By David Ham on 2011-05-07

Correct the path of confdefs.h to ensure it is really removed.

3412. By David Ham on 2011-05-06

Merge from trunk

3411. By David Ham on 2011-05-05

Strip makefiles first as a defence against a previous failed run. Output dependencies in guaranteed order