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

give threaded general user objects their own subclass #11979

Merged
merged 1 commit into from
Aug 13, 2018

Conversation

rwcarlsen
Copy link
Contributor

Since a threaded (vs not) object requires very specific code handling,
we do not generally want the ability for objects to be dynamically
toggled between threaded vs not handling - this could easily result in
unintentional, subtle errors. Also, the new general warehouse handling
of user objects will be much better served by this as an explicit
separate class.

ref #11834

@moosebuild
Copy link
Contributor

moosebuild commented Aug 10, 2018

Job Documentation on e7a78a8 wanted to post the following:

View the site here

This comment will be updated on new commits.

@rwcarlsen
Copy link
Contributor Author

moltres was already broken for other reasons it seems.

@@ -77,4 +77,14 @@ class GeneralUserObject : public UserObject,
std::set<std::string> _supplied_vars;
};

/// An instance of this object type has one copy per thread that runs on each thread.
class ThreadedGeneralUserObject : public GeneralUserObject
Copy link
Contributor

Choose a reason for hiding this comment

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

Please put this in its own file

Copy link
Contributor Author

Choose a reason for hiding this comment

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

done

Copy link
Contributor

@friedmud friedmud left a comment

Choose a reason for hiding this comment

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

Just the one change

@moosebuild
Copy link
Contributor

Job Precheck on 5c7df5a wanted to post the following:

Your code requires style changes.

A patch was auto generated and copied here
You can directly apply the patch by running, in the top level of your repository:

curl -s http://mooseframework.inl.gov/docs/PRs/11979/style.patch | git apply -v

Alternatively, with your repository up to date and in the top level of your repository:

git clang-format 9d425eb47c0ca0d58545d9bc9b8d8ed48df37e22

Since a threaded (vs not) object requires very specific code handling,
we do not generally want the ability for objects to be dynamically
toggled between threaded vs not handling - this could easily result in
unintentional, subtle errors.  Also, the new general warehouse handling
of user objects will be much better served by this as an explicit,
separate class.

ref idaholab#11834
@friedmud friedmud added the PR: Auto Merge Add this label to have CIVET merge on success label Aug 10, 2018
@friedmud
Copy link
Contributor

friedmud commented Aug 10, 2018 via email

@andrsd andrsd merged commit 5875b00 into idaholab:devel Aug 13, 2018
@brianmoose
Copy link
Contributor

A bunch of min clang problems: https://civet.inl.gov/job/219922/

rwcarlsen added a commit to rwcarlsen/moose that referenced this pull request Aug 13, 2018
This was an oversight in idaholab#11979 - forgot to update+move the check for
tbb/openmp into the new threadedgeneraluserobject class.
@rwcarlsen rwcarlsen deleted the threaded-general-class branch September 19, 2018 21:27
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants