Permalink
Browse files

Removed lines from previous merge conflict

  • Loading branch information...
1 parent 8d19d9a commit f67d4916ec3a10cd8c5c894d6717b804e519a8e3 @elliottbiondo elliottbiondo committed Oct 30, 2012
Showing with 0 additions and 16 deletions.
  1. +0 −10 cpp/material.cpp
  2. +0 −3 pyne/cpp_material.pxd
  3. +0 −3 pyne/material.pyx
View
@@ -321,20 +321,13 @@ void pyne::Material::write_hdf5(std::string filename, std::string datapath, std:
hid_t comp_values_array_type = H5Tarray_create2(H5T_NATIVE_DOUBLE, 1, nuc_dims);
// make the data table type
-<<<<<<< HEAD
H5Tinsert(desc, "mass", HOFFSET(pyne::material_struct, mass), H5T_NATIVE_DOUBLE);
H5Tinsert(desc, "density", HOFFSET(pyne::material_struct, density),
H5T_NATIVE_DOUBLE);
H5Tinsert(desc, "atoms_per_mol", HOFFSET(pyne::material_struct, atoms_per_mol),
H5T_NATIVE_DOUBLE);
H5Tinsert(desc, "comp", HOFFSET(pyne::material_struct, comp),
comp_values_array_type);
-=======
- data_desc.insertMember("mass", HOFFSET(pyne::material_struct, mass), H5::PredType::NATIVE_DOUBLE);
- data_desc.insertMember("density", HOFFSET(pyne::material_struct, density), H5::PredType::NATIVE_DOUBLE);
- data_desc.insertMember("atoms_per_mol", HOFFSET(pyne::material_struct, atoms_per_mol), H5::PredType::NATIVE_DOUBLE);
- data_desc.insertMember("comp", HOFFSET(pyne::material_struct, comp), comp_values_array_type);
->>>>>>> 28a3807353f21ea90338f913f6b6f4892f165355
material_struct * mat_data = new material_struct[material_struct_size];
(*mat_data).mass = mass;
@@ -577,11 +570,8 @@ void pyne::Material::write_text (std::string filename)
f << "Mass " << mass << "\n";
if (0 <= density)
-<<<<<<< HEAD
f << "Density " << density << "\n";
-=======
f << "Density " << density << "\n";
->>>>>>> 28a3807353f21ea90338f913f6b6f4892f165355
if (0 <= atoms_per_mol)
f << "APerM " << atoms_per_mol << "\n";
@@ -21,10 +21,7 @@ cdef extern from "material.h" namespace "pyne":
Material(map[int, double]) except +
Material(map[int, double], double) except +
Material(map[int, double], double, double) except +
-<<<<<<< HEAD
Material(map[int, double], double, double, double) except +
-=======
->>>>>>> 28a3807353f21ea90338f913f6b6f4892f165355
Material(map[int, double], double, double, double, cpp_jsoncpp.Value) except +
Material(char *) except +
Material(char *, double) except +
View
@@ -1012,10 +1012,7 @@ cdef class _Material:
return
mbm = self.mult_by_mass()
mbm.map_ptr.erase(<int> key)
-<<<<<<< HEAD
new_matp = new cpp_material.Material(mbm.map_ptr[0], -1.0)
-=======
->>>>>>> 28a3807353f21ea90338f913f6b6f4892f165355
new_matp = new cpp_material.Material(mbm.map_ptr[0], -1.0, -1.0)
self.mat_pointer = new_matp
self._comp = None

0 comments on commit f67d491

Please sign in to comment.