fixed indentation, removed unnecessary variables, fixed clang format blocks

Author: dean-krueger

src/conversion.cc

@@ -166,11 +166,9 @@ void Conversion::AcceptMatlTrades(
   for (std::vector<std::pair<Trade<Material>, Material::Ptr>>::const_iterator it =
       responses.begin(); it != responses.end(); ++it) {
 
-    Material::Ptr mat = it->second;
-    cyclus::toolkit::MatQuery mq(mat);
 
     // Add material to the input buffer
-    input.Push(mat);
+    input.Push(it->second);
 
   }
 }
@@ -183,8 +181,7 @@ void Conversion::GetMatlTrades(
   for (std::vector<Trade<Material>>::const_iterator it = trades.begin();
       it != trades.end(); ++it) {
 
-    double requested_qty = it->amt;
-    Material::Ptr response = output.Pop(requested_qty);
+    Material::Ptr response = output.Pop(it->amt);
 
     responses.push_back(std::make_pair(*it, response));
   }

src/conversion.h

@@ -87,17 +87,17 @@ class Conversion
   }
   std::vector<std::string> incommods;
 
-    #pragma cyclus var { \
-      "default": [], \
-      "doc":"preferences for each of the given commodities, in the same order."\
-      "Defauts to 1 if unspecified",\
-      "uilabel":"In Commody Preferences", \
-      "range": [None, [CY_NEAR_ZERO, CY_LARGE_DOUBLE]], \
-      "uitype":["oneormore", "range"] \
-    }
+  #pragma cyclus var { \
+    "default": [], \
+    "doc":"preferences for each of the given commodities, in the same order."\
+    "Defauts to 1 if unspecified",\
+    "uilabel":"In Commody Preferences", \
+    "range": [None, [CY_NEAR_ZERO, CY_LARGE_DOUBLE]], \
+    "uitype":["oneormore", "range"] \
+  }
   std::vector<double> incommod_prefs;
 
-   #pragma cyclus var { \
+  #pragma cyclus var { \
     "default": "", \
     "tooltip": "requested composition", \
     "doc": "name of recipe to use for material requests, where the default " \
@@ -136,7 +136,6 @@ class Conversion
   }
   double input_capacity;
 
-  // clang-format off
   /// this facility holds a certain amount of material
   #pragma cyclus var {'capacity': 'input_capacity'}
   cyclus::toolkit::ResBuf<cyclus::Material> input;