Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

WIP: Add topography options to ellipsoidal geometry model #920

Closed
wants to merge 57 commits into from

Conversation

MFraters
Copy link
Member

Anne and I are working on adding topography to the ellipsoidal geometry model. The work on it hasn't finished yet (nor fully clean or squashed), but we wanted to make sure people could see it before the beginning of the hackaton, hence the pull request. Comments are of course always welcome!

MFraters and others added 30 commits June 16, 2016 11:43
Fix bracket

Change from file topography type names
Fix minor spelling and rename topo types
Changing to pointer interface to store uniform or nonuniform grid.
…psoid_topo

Conflicts:
	include/aspect/geometry_model/ellipsoidal_chunk.h
	source/geometry_model/ellipsoidal_chunk.cc
Add value function to uniform grid

Clean up

Astyle
@@ -16,19 +16,21 @@
You should have received a copy of the GNU General Public License
along with ASPECT; see the file doc/COPYING. If not see
<http://www.gnu.org/licenses/>.
*/
*/
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

?? :-)

@tjhei
Copy link
Member

tjhei commented Jun 27, 2016

Menno, let us know when we should take another look!

/run-tests

@gassmoeller
Copy link
Member

@MFraters is this PR superseded by #1395?

@MFraters
Copy link
Member Author

Yes, I would guess so. I wasn't aware any more that I had this one. I will close it therefore.

@MFraters MFraters closed this Mar 15, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants