From 7df1a2e79a6b58f14b91ea0d44ccde430583f7ca Mon Sep 17 00:00:00 2001
From: Gwen <grvosku@sandia.gov>
Date: Fri, 10 May 2024 10:32:06 -0600
Subject: [PATCH] Cleanup and formatting

---
 src/sst/core/checkpointAction.cc             | 6 ------
 src/sst/core/checkpointAction.h              | 5 ++++-
 src/sst/core/clock.h                         | 1 -
 src/sst/core/componentInfo.cc                | 4 ++--
 src/sst/core/impl/timevortex/timeVortexPQ.cc | 8 +-------
 src/sst/core/main.cc                         | 1 -
 6 files changed, 7 insertions(+), 18 deletions(-)

diff --git a/src/sst/core/checkpointAction.cc b/src/sst/core/checkpointAction.cc
index e7b4c0507..18ffb5f18 100644
--- a/src/sst/core/checkpointAction.cc
+++ b/src/sst/core/checkpointAction.cc
@@ -35,10 +35,6 @@ CheckpointAction::CheckpointAction(Config* UNUSED(cfg), int this_rank, Simulatio
 {
     sim->insertActivity(period->getFactor(), this);
     if ( (0 == this_rank) ) { lastTime = sst_get_cpu_time(); }
-    // if( (0 == this_rank) ) {
-    //     sim->insertActivity( period->getFactor(), this );
-    //     lastTime = sst_get_cpu_time();
-    // }
 }
 
 CheckpointAction::~CheckpointAction() {}
@@ -61,8 +57,6 @@ CheckpointAction::execute(void)
 
     SimTime_t next = sim->getCurrentSimCycle() + m_period->getFactor();
     sim->insertActivity(next, this);
-
-    // Print some resource usage
 }
 
 } // namespace SST
diff --git a/src/sst/core/checkpointAction.h b/src/sst/core/checkpointAction.h
index 095120b1c..ba30cb3f9 100644
--- a/src/sst/core/checkpointAction.h
+++ b/src/sst/core/checkpointAction.h
@@ -40,7 +40,10 @@ class CheckpointAction : public Action
 
     NotSerializable(SST::CheckpointAction) // Going to have to fix this
 
-        private : CheckpointAction() {};
+        private :
+
+        CheckpointAction()
+    {}
     CheckpointAction(const CheckpointAction&);
 
     void           operator=(CheckpointAction const&);
diff --git a/src/sst/core/clock.h b/src/sst/core/clock.h
index e0fe3308e..f0cfcadb1 100644
--- a/src/sst/core/clock.h
+++ b/src/sst/core/clock.h
@@ -117,7 +117,6 @@ class Clock : public Action
 
     void serialize_order(SST::Core::Serialization::serializer& ser) override;
     ImplementSerializable(SST::Clock)
-    // NotSerializable(SST::Clock)
 };
 
 
diff --git a/src/sst/core/componentInfo.cc b/src/sst/core/componentInfo.cc
index 3975f4090..fbfdd4763 100644
--- a/src/sst/core/componentInfo.cc
+++ b/src/sst/core/componentInfo.cc
@@ -223,8 +223,8 @@ ComponentInfo::serialize_order(SST::Core::Serialization::serializer& ser)
     ser& share_flags;
 
     // For SubComponents map, need to serialize map by hand since we
-    // weill need to use the track non-pointer as pointer feature in
-    // the serilzer.  This is becaues the SubComponent's ComponentInfo
+    // we will need to use the track non-pointer as pointer feature in
+    // the serializer. This is becaues the SubComponent's ComponentInfo
     // object is actually stored in the map and they may have their
     // own SubCompenents that will need to point to the data location
     // in the map.
diff --git a/src/sst/core/impl/timevortex/timeVortexPQ.cc b/src/sst/core/impl/timevortex/timeVortexPQ.cc
index 61c0ae66a..e1b979e49 100644
--- a/src/sst/core/impl/timevortex/timeVortexPQ.cc
+++ b/src/sst/core/impl/timevortex/timeVortexPQ.cc
@@ -101,13 +101,7 @@ template <bool TS>
 void
 TimeVortexPQBase<TS>::print(Output& out) const
 {
-    out.output("TimeVortex state:\n");
-
-    //  STL's priority_queue does not support iteration.
-    /*std::vector<Activity*>& act = const_cast<TimeVortexPQBase<TS>*>(this)->getContainer(data);
-        for ( auto it = act.begin(); it != act.end(); it++ ) {
-            (*it)->print("  ", out);
-        }*/
+    out.output("TimeVortex state: cannot iterate priority_queue\n");
 }
 
 template <bool TS>
diff --git a/src/sst/core/main.cc b/src/sst/core/main.cc
index 6d0cd3dc0..f1499ddb8 100644
--- a/src/sst/core/main.cc
+++ b/src/sst/core/main.cc
@@ -584,7 +584,6 @@ start_simulation(uint32_t tid, SimThreadInfo_t& info, Core::ThreadSafe::Barrier&
                 set<string> lib_names;
                 set<string> other_lib_names;
                 Factory::getFactory()->getLoadedLibraryNames(lib_names);
-                // vector<set<string> > all_lib_names;
 
                 // Send my lib_names to the next lowest rank
                 if ( info.myRank.rank == (info.world_size.rank - 1) ) {