Merge remote-tracking branch 'origin/feature/tomstitt/temp-mem-type' into feature/apps/dev

general/mem_manager.cpp

@@ -501,10 +501,8 @@ public:
    }
    void Alloc(void **ptr, size_t bytes) { *ptr = h_allocator.allocate(bytes); }
    void Dealloc(void *ptr) { h_allocator.deallocate(ptr); }
-
    void Insert(void *ptr, size_t bytes)
-   //{ rm.registerAllocation(ptr, {ptr, bytes, strat}); }
-   { mfem_error("UmpireHostMemorySpace::Insert is unsupported"); exit(1); }
+   { mfem_error("UmpireHostMemorySpace::Insert is unsupported"); }
 };
 
 /// The Umpire device memory space

general/mem_manager.hpp

@@ -640,7 +640,7 @@ public:
    /// Get the host and device Umpire allocator ids
    static int GetUmpireHostAllocatorId() { return h_umpire_id; }
    static int GetUmpireDeviceAllocatorId() { return d_umpire_id; }
-   static int GetUmpireDeviceTempAllocatorId() { return d_umpire_id; }
+   static int GetUmpireDeviceTempAllocatorId() { return d_umpire_temp_id; }
 #endif
 
    /// Free all the device memories