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

Minkley burgers fixes #46

Merged
merged 13 commits into from
Aug 9, 2016
Merged

Conversation

nagelt
Copy link
Member

@nagelt nagelt commented Jun 27, 2016

This PR introduces two solid material models and tests. The changes introduced are confined to these specific material models.


SolidBurgers::~SolidBurgers()
{
smath = NULL;
Copy link
Member

@wenqing wenqing Jun 27, 2016

Choose a reason for hiding this comment

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

where is the memory of smath released?

@norihiro-w
Copy link
Contributor

@nagelt see Jenkins result. maybe the reference result has to be updated

@nagelt
Copy link
Member Author

nagelt commented Aug 4, 2016

@norihiro-w There's a pull-request open for that ..

@norihiro-w
Copy link
Contributor

sorry I missed it...

@norihiro-w
Copy link
Contributor

UJG-M/m_sdc is fixed now. But I realized now that WW-MPI/thm_quad/thm_quad is also failing due to time out. I think this is the last one to be fixed.

if (line_string.find("$AUTOMATIC_NEWTON_DAMPING") != string::npos) // NW
{
line.str(GetLineFromFile1(num_file));
line >> automatic_damping_tolerance; //if NR error decreases by less than this factor, the next step will be dampened
Copy link
Member

Choose a reason for hiding this comment

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

Suggest to remove automatic_ because that the damping factor is specified not calculated.

Copy link
Member Author

Choose a reason for hiding this comment

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

But it's automatically switched on or off : )

Copy link
Contributor

Choose a reason for hiding this comment

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

i agree with wenqing. the name is confusing

Copy link
Member

Choose a reason for hiding this comment

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

Yes, the damping should be determined by error. However, the damping factor has to be specified in advance. Actually, the tolerance of automatic_damping_tolerance should be the same as to that of the Newton such that the damping is applied when a Newton step error fails in quadratic convergence (in the strict manner) or the error increases.

If automatic_damping is used, one may think that he only need to give the keyword to enable the method. Anything else including when damping, and the value of damping are conducted by the program automatically (e.g by linear search).

Copy link
Member Author

Choose a reason for hiding this comment

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

Convinced. I suggest to first fix the general control of the NR scheme (which tolerances for which convergence measures) though and then an "automatic damping" (two follow-up PRs). All this new keyword does now is transfer the formerly hard-coded damping to input file control.

@norihiro-w
Copy link
Contributor

@nagelt please add OGS copyright header to the new source files and remove some old codes which you commented out, if there is no particular reason to keep them. then I think this PR is ready for being merged

@norihiro-w norihiro-w merged commit 95f3b87 into ufz:master Aug 9, 2016
@nagelt nagelt deleted the Minkley_Burgers_Fixes branch August 12, 2016 12:01
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.

4 participants