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

Manual updates #75

Merged
merged 1 commit into from
May 27, 2014
Merged

Manual updates #75

merged 1 commit into from
May 27, 2014

Conversation

tjhei
Copy link
Member

@tjhei tjhei commented May 25, 2014

  • extract .prms
  • add section explaining benchmark compilation
  • more safe escaping in .prms

@tjhei
Copy link
Member Author

tjhei commented May 25, 2014

Okay, I think I am done now. @bangerth please merge.

\label{sec:benchmark-run}

Some of the benchmarks require plugins like custom material models, boundary
conditions, or postprocessors. Not not polute \aspect{} with all these
Copy link
Contributor

Choose a reason for hiding this comment

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

"To not pollute"

@bangerth
Copy link
Contributor

Good work. Please merge after addressing the minor comments.

I'm not too fond of the style %%...% for comments -- I think it is a bit confusing to use the same character but in different numbers to denote comment start/end. But I don't feel overly strong about it, and we can always change it later.

Is it worth extending the Makefile to automatically generate the .prm.out files from the .prm files? This would make it simpler to keep things synchronized.

@tjhei
Copy link
Member Author

tjhei commented May 27, 2014

I had to change the style and using the same symbol for beginning and end didn't work if I remember correctly. I am happy to change it to something else, but it shouldn't be visible for anyone anyway.

Regarding the Makefile rule: makes sense. I will take a look.

@tjhei
Copy link
Member Author

tjhei commented May 27, 2014

The Makefile rule is somewhat problematic because you need a deal.II version from yesterday for all of this to work. Should I remove the .prm.out from the repo anyway and generate them if you run make manual.pdf?
edit: decided to go ahead with it.

@bangerth
Copy link
Contributor

Don't bother about the comment start/end.

-------- Original message --------
From: Timo Heister notifications@github.com
Date: 05/27/2014 11:02 (GMT-06:00)
To: geodynamics/aspect aspect@noreply.github.com
Cc: Wolfgang Bangerth bangerth@math.tamu.edu
Subject: Re: [aspect] Manual updates (#75)

I had to change the style and using the same symbol for beginning and end didn't work if I remember correctly. I am happy to change it to something else, but it shouldn't be visible for anyone anyway.

Regarding the Makefile rule: makes sense. I will take a look.


Reply to this email directly or view it on GitHub.

We now auto-generate the annotated .prm.out files from the .prm files when you
make manual.pdf. All prm snippets in the manual now live in external
files. This patch also contains updates to the benchmark section explaining
how to compile the shared libs for the benchmarks.

This is a combination of 9 commits:
extract more prms from manual
manual: add section explaining benchmark compilation
add missing .prm
change to more safe escaping in .prm for manual
final batch of prms extracted from the manual
rename sol_cx.prm and improve manual
rename sol_kz prm
remove all .out and generate them on demand instead
update .gitignore
tjhei added a commit that referenced this pull request May 27, 2014
@tjhei tjhei merged commit 9f82cd6 into geodynamics:master May 27, 2014
@bangerth
Copy link
Contributor

I don't understand your comment about the deal.II version. Creating the .prm.out files from the .prm file only requires a Makefile glob and calling perl, no? What dependency on deal.II would that have?

@tjhei
Copy link
Member Author

tjhei commented May 27, 2014

You are right. I confused it with update_parameters.sh that needs a newer deal.II version. I went ahead and implemented your suggestion (already merged).

@tjhei tjhei deleted the manual_updates branch February 27, 2015 22:14
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.

2 participants