Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
mantid
Manage
Activity
Members
Labels
Plan
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Deploy
Releases
Model registry
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Code review analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
mantidproject
mantid
Commits
994a6f14
Commit
994a6f14
authored
10 years ago
by
Federico Montesino Pouzols
Browse files
Options
Downloads
Patches
Plain Diff
fixes to comments and doxygen tags, re #11124
parent
bac72597
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
Code/Mantid/Framework/API/test/RemoteJobManagerFactoryTest.h
+1
-1
1 addition, 1 deletion
Code/Mantid/Framework/API/test/RemoteJobManagerFactoryTest.h
Code/Mantid/Framework/Kernel/src/ComputeResourceInfo.cpp
+3
-1
3 additions, 1 deletion
Code/Mantid/Framework/Kernel/src/ComputeResourceInfo.cpp
with
4 additions
and
2 deletions
Code/Mantid/Framework/API/test/RemoteJobManagerFactoryTest.h
+
1
−
1
View file @
994a6f14
...
@@ -122,7 +122,7 @@ public:
...
@@ -122,7 +122,7 @@ public:
Mantid
::
Kernel
::
ConfigService
::
Instance
().
getFacility
();
Mantid
::
Kernel
::
ConfigService
::
Instance
().
getFacility
();
Mantid
::
Kernel
::
ConfigService
::
Instance
().
setFacility
(
"SNS"
);
Mantid
::
Kernel
::
ConfigService
::
Instance
().
setFacility
(
"SNS"
);
// TODO: at the mo
e
mnt these two create throw a NotFoundError
// TODO: at the mom
e
nt these two create throw a NotFoundError
// because the RemoteJobManager classes are missing and have not
// because the RemoteJobManager classes are missing and have not
// done a DECLARE_REMOTEJOBMANAGER. Change this test when that is
// done a DECLARE_REMOTEJOBMANAGER. Change this test when that is
// done (ticket #11126 etc.)
// done (ticket #11126 etc.)
...
...
This diff is collapsed.
Click to expand it.
Code/Mantid/Framework/Kernel/src/ComputeResourceInfo.cpp
+
3
−
1
View file @
994a6f14
...
@@ -18,7 +18,7 @@ Logger g_log("ComputeResourceInfo");
...
@@ -18,7 +18,7 @@ Logger g_log("ComputeResourceInfo");
* Construct a compute resource from information found in a facilities
* Construct a compute resource from information found in a facilities
* definition file.
* definition file.
*
*
* @param f Facility where this (remote) compute resource is available
* @param f
ac
Facility where this (remote) compute resource is available
* @param elem A (Poco::XML::) Element to read the data from
* @param elem A (Poco::XML::) Element to read the data from
*
*
* @throw std::runtime_error if name or required attributes are not
* @throw std::runtime_error if name or required attributes are not
...
@@ -37,6 +37,8 @@ ComputeResourceInfo::ComputeResourceInfo(const FacilityInfo *fac,
...
@@ -37,6 +37,8 @@ ComputeResourceInfo::ComputeResourceInfo(const FacilityInfo *fac,
"The compute resource name is not defined, at element: "
+
elemStr
);
"The compute resource name is not defined, at element: "
+
elemStr
);
}
}
// default: Mantid web service API:
// http://www.mantidproject.org/Remote_Job_Submission_API
m_managerType
=
"MantidWebServiceAPIJobManager"
;
m_managerType
=
"MantidWebServiceAPIJobManager"
;
std
::
string
type
=
elem
->
getAttribute
(
"JobManagerType"
);
std
::
string
type
=
elem
->
getAttribute
(
"JobManagerType"
);
if
(
!
type
.
empty
())
{
if
(
!
type
.
empty
())
{
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment