Skip to content

Commit 5af49e9

Browse files
author
Dilawar Singh
committed
Almost all tests are passing.
1 parent d7f03bd commit 5af49e9

File tree

7 files changed

+483
-30
lines changed

7 files changed

+483
-30
lines changed

pybind11/CMakeLists.txt

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,12 @@ cmake_minimum_required(VERSION 2.8)
33
include(${CMAKE_CURRENT_SOURCE_DIR}/../CheckCXXCompiler.cmake)
44
set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/../cmake_modules/")
55

6-
pybind11_add_module(_cmoose pymoose.cpp helper.cpp Finfo.cpp MooseVec.cpp)
6+
pybind11_add_module(_cmoose
7+
pymoose.cpp
8+
helper.cpp
9+
Finfo.cpp
10+
MooseVec.cpp
11+
PyRun.cpp)
712

813
# set_target_properties(_moose PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${CMAKE_SOURCE_DIR}/python/moose)
914
set_target_properties(_cmoose PROPERTIES

pybind11/MooseVec.cpp

Lines changed: 7 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,10 @@ MooseVec::MooseVec(const string& path, unsigned int n = 0,
2323
const string& dtype = "Neutral")
2424
: path_(path)
2525
{
26-
if (! mooseExists(path)) {
26+
if (!mooseExists(path))
2727
oid_ = mooseCreate(dtype, path, n);
28-
} else {
28+
else
2929
oid_ = ObjId(path);
30-
cout << "Elements: " << oid_.element() -> numData() << endl;
31-
}
3230
}
3331

3432
MooseVec::MooseVec(const ObjId& oid) : oid_(oid), path_(oid.path())
@@ -42,7 +40,7 @@ const string MooseVec::dtype() const
4240

4341
const size_t MooseVec::size() const
4442
{
45-
if(oid_.element()->hasFields())
43+
if (oid_.element()->hasFields())
4644
return Field<unsigned int>::get(oid_, "numField");
4745
return oid_.element()->numData();
4846
}
@@ -64,8 +62,7 @@ ObjId MooseVec::getItem(const size_t i) const
6462

6563
void MooseVec::setAttrOneToAll(const string& name, const py::object& val)
6664
{
67-
for(size_t i = 0; i < size(); i++)
68-
setFieldGeneric(getItem(i), name, val);
65+
for (size_t i = 0; i < size(); i++) setFieldGeneric(getItem(i), name, val);
6966
}
7067

7168
void MooseVec::setAttrOneToOne(const string& name, const py::sequence& val)
@@ -85,7 +82,7 @@ vector<py::object> MooseVec::getAttr(const string& name)
8582
{
8683
vector<py::object> res(size());
8784
for (unsigned int i = 0; i < size(); i++)
88-
res[i] = getFieldGeneric(getItem(i), name);
85+
res[i] = getFieldGeneric(getItem(i), name);
8986
return res;
9087
}
9188

@@ -113,7 +110,7 @@ const ObjId& MooseVec::obj() const
113110
vector<ObjId> MooseVec::objs() const
114111
{
115112
vector<ObjId> items;
116-
for(size_t i = 0; i < size(); i++)
113+
for (size_t i = 0; i < size(); i++)
117114
items.push_back(ObjId(oid_.path(), i, 0));
118115
return items;
119116
}
@@ -126,8 +123,7 @@ size_t MooseVec::id() const
126123
void MooseVec::generateIterator()
127124
{
128125
iterator_.resize(size());
129-
for(size_t i = 0; i < size(); i++)
130-
iterator_[i] = getItem(i);
126+
for (size_t i = 0; i < size(); i++) iterator_[i] = getItem(i);
131127
}
132128

133129
const vector<ObjId>& MooseVec::objref() const

0 commit comments

Comments
 (0)