lp:~simon-funke/fluidity/fluidity_tsunami

Created by Simon Funke and last modified
Get this branch:
bzr branch lp:~simon-funke/fluidity/fluidity_tsunami
Only Simon Funke can upload to this branch. If you are Simon Funke please log in for upload directions.

Branch merges

Related bugs

Related blueprints

Branch information

Owner:
Simon Funke
Project:
Fluidity
Status:
Development

Recent revisions

3465. By Simon Funke

a first draft of the run up forest problem described in the thuy paper.

The test already has the correct domain, but the trees are not simulated yet.

3464. By Simon Funke

diamond option which specifies the exponent order of the depth term in the manning strickler drag.

3463. By Stephan Kramer

Fix for SP build.

3462. By Patrick Farrell

In the previous change to the build process, I remarked that deleting libfluidity.a
by itself was a bad idea. Well, it turns out we had it configured so that if any
file failed to build, it deleted libfluidity.a, thus making the next build fail
confusingly. This commit turns off that deletion of libfluidity.a, so people can
make mistakes to their heart's content.

3461. By Stephan Kramer

Fix flredecomp for gfortran 4.5. Pass input and output basename strings from c to fortran using bind(c).

3460. By Patrick Farrell

An orthogonal change to the build process.

As discussed in yesterday's dev meeting, I've replaced

default: $(OBJS)
  ar ...

with

default: $(LIB)
$(LIB): $(OBJS)
  ar ..

which does /not/ execute the ar if nothing has been built. This makes
compiles from mostly-built sources much faster: on my laptop, the time
taken for make in a fully-built checkout goes from ~12s to ~4s. It would be
even faster if we could properly state the dependencies of check_options
and register_diagnostics; that would probably get it down to a second or so.
It would be even faster if we then properly stated the dependencies of
bin/fluidity, so we didn't have to recompile that unnecessarily. Then it would
take 0s!

Admittedly, this is still a little experimental. There is one known bug
that this introduces into the build system: if someone deletes lib/libfluidity.a
without deleting the */*.o, the build will fail. So don't do that (use make clean
instead, of course).

If this causes problems for anyone, feel free to revert it (or better yet, improve it).

3459. By Stephan Kramer

Finally getting rid of new_options logical.

  !------------------------------------------------------------------------
  ! Global flag for whether we are running off the new xml options file.
  ! Legacy variable - to be removed in the future
  !------------------------------------------------------------------------
  logical, parameter :: new_options = .true.

Today is the future!

3458. By Simon Mouradian

Small bug fix.

(This is the final commit, henceforth merge requests will be made)

3457. By Jon Saunders

Adding structures to the multiphase schema to enable us
to read in eos, rel perm and capillary pressure options
as required by the prototype code

3456. By Patrick Farrell

Add some documentation to the python diagnostic algorithms, mentioning
that 'time' and 'dt' are also set.

Sort the diagnostic algorithms so that the python diagnostic (the most common)
is first, and then the rest are sorted alphabetically.

Branch metadata

Branch format:
Branch format 7
Repository format:
Bazaar repository format 2a (needs bzr 1.16 or later)
Stacked on:
lp:fluidity
This branch contains Public information 
Everyone can see this information.