diff --git a/include/trick/ADefParseContext.hh b/include/trick/ADefParseContext.hh
index 5355a1dc..f686ebd4 100644
--- a/include/trick/ADefParseContext.hh
+++ b/include/trick/ADefParseContext.hh
@@ -15,7 +15,7 @@ namespace Trick {
 
 class ADefParseContext {
 
-    public: 
+    public:
 
         int debug ;                          /**< -- Debug level */
         std::istream *is;                    /**< ** Input Stream */
diff --git a/include/trick/CheckPointAgent.hh b/include/trick/CheckPointAgent.hh
index ea3948a9..7bd191ad 100644
--- a/include/trick/CheckPointAgent.hh
+++ b/include/trick/CheckPointAgent.hh
@@ -21,11 +21,11 @@ namespace Trick {
     typedef struct {
         VarNameElementType type;
         int index;
-        std::string name; 
+        std::string name;
     } VarNameElement;
 
 /**
- Base Class for dumping a checkpoint. 
+ Base Class for dumping a checkpoint.
  */
     class CheckPointAgent {
 
@@ -60,7 +60,7 @@ namespace Trick {
          Push struct element name onto the left-side name stack.
          */
         virtual void push_struct_elem( const char* name) ;
-    
+
         /**
          Push array element index onto the left-side name stack.
          */
@@ -76,8 +76,8 @@ namespace Trick {
          object to the name on the left-side stack.
          */
         virtual void assign_rvalue( std::ostream& chkpnt_os,
-                                    void*       address, 
-                                    ATTRIBUTES* attr, 
+                                    void*       address,
+                                    ATTRIBUTES* attr,
                                     int         curr_dim,
                                     int         offset
                                     )=0;
diff --git a/include/trick/CheckPointRestart.hh b/include/trick/CheckPointRestart.hh
index d08f869d..8feec31e 100644
--- a/include/trick/CheckPointRestart.hh
+++ b/include/trick/CheckPointRestart.hh
@@ -218,7 +218,7 @@ namespace Trick {
              @par Python Usage:
              @code trick.checkpoint() @endcode
              @param file_name - optional: name of checkpoint file to dump (default is "chkpnt_<time>")
-             @param print_status - optional: boolean yes (C integer 1) = print the dump checkpoint status message 
+             @param print_status - optional: boolean yes (C integer 1) = print the dump checkpoint status message
              @param obj_list_str - optional: sim objects list string for checkpointing (default is dump all)
              @return always 0
              */
@@ -243,7 +243,7 @@ namespace Trick {
              @par Python Usage:
              @code trick.dmtcp_checkpoint() @endcode
              @param file_name - optional: name of checkpoint file to dump (default is "dmtcp_chkpnt_<time>")
-             @param print_status - optional: boolean yes (C integer 1) = print the dump checkpoint status message 
+             @param print_status - optional: boolean yes (C integer 1) = print the dump checkpoint status message
              @param obj_list_str - optional: sim objects list string for checkpointing (default is dump all)
              @return always 0
              */
@@ -261,7 +261,7 @@ namespace Trick {
             virtual int dmtcp_checkpoint(double in_time) ;
 
             /* helper function to generate DMTCP restart script file name */
-            void setDMTCPFilename( std::string file_name = ""); 
+            void setDMTCPFilename( std::string file_name = "");
 
             /**
              * Executes the pre_init_checkpoint
diff --git a/include/trick/ChkPtParseContext.hh b/include/trick/ChkPtParseContext.hh
index 37900e6e..b4ba984d 100644
--- a/include/trick/ChkPtParseContext.hh
+++ b/include/trick/ChkPtParseContext.hh
@@ -12,7 +12,7 @@
  */
 class ChkPtParseContext {
 
-public: 
+public:
 
     int debug ;                      /**< -- Debug level */
     int verify_input;                /**< -- Verify input runstream syntax flag */
diff --git a/include/trick/ClassicCheckPointAgent.hh b/include/trick/ClassicCheckPointAgent.hh
index ae2c41c9..bf37f59b 100644
--- a/include/trick/ClassicCheckPointAgent.hh
+++ b/include/trick/ClassicCheckPointAgent.hh
@@ -10,7 +10,7 @@ namespace Trick {
 
     /**
      This class provides checkpointing.
-     @author John M. Penn  
+     @author John M. Penn
      */
     class ClassicCheckPointAgent: public CheckPointAgent {
 
@@ -52,8 +52,8 @@ namespace Trick {
 
          @param address Address of the variable.
          @param attr ATTRIBUTES of the variable.
-         @param curr_dim 
-         @param offset 
+         @param curr_dim
+         @param offset
          */
         void assign_rvalue( std::ostream& chkpnt_os, void* address, ATTRIBUTES* attr, int curr_dim, int offset);
 
@@ -68,11 +68,11 @@ namespace Trick {
          Confirm that the value of an intrinsic typed sub-element, at the specified offset,
          within the object at the given address, is zero.
          To check the entire object at the address, call with curr_dim=0 and offset=0;
-    
+
          @param address - address of the object within which we are checking for nil values.
-         @param attr - attr describing the object at the address. 
-         @param curr_dim - dimension of the sub-element being checked. 
-         @param offset - offset of the sub-element 
+         @param attr - attr describing the object at the address.
+         @param curr_dim - dimension of the sub-element being checked.
+         @param offset - offset of the sub-element
          @param offset - if the object specified by @b address and @b attr is arrayed, then this
                          parameter specifies where, within the array, the sub-object to be
                          checked, is located.
@@ -86,7 +86,7 @@ namespace Trick {
          The pointer must be an address that is being managed by MM (the MemoryManager) or a
          character string (char* or wchar_t*).
 
-         @param pointer 
+         @param pointer
          @param attr ATTRIBUTES of the pointer.
          @param curr_dim current dimension.
          @return text expression that represents the pointer.
@@ -105,7 +105,7 @@ namespace Trick {
          */
         std::string left_side_name();
 
-        /** 
+        /**
          I NEED DOCUMENTATION!
          */
         std::string get_var_name( void*   addr,
@@ -114,19 +114,19 @@ namespace Trick {
                                   std::string name,
                                   ATTRIBUTES** left_type);
 
-        /** 
+        /**
          Write a single value of an intrinsic type located at the given address and offset.
-    
+
          @param address - address of the object that contains the value to be written.
          @param attr - ATTRIBUTES of the object that contains the value to be written.
          @param offset - if the object specified by address and attr is arrayed, then this
                          parameter specifies where, within the array the single value is
                          located. @c offset=0 means that the address points to the value
-                         to be written. 
+                         to be written.
          */
         void write_singleton( std::ostream& chkpnt_os, void* address, ATTRIBUTES* attr, int offset);
 
-        /** 
+        /**
          I NEED DOCUMENTATION!
          */
         void write_rvalue( std::ostream& chkpnt_os, void* address, ATTRIBUTES* attr, int curr_dim, int offset);
diff --git a/include/trick/CommandLineArguments.hh b/include/trick/CommandLineArguments.hh
index 1ac0fde5..1617ab8a 100644
--- a/include/trick/CommandLineArguments.hh
+++ b/include/trick/CommandLineArguments.hh
@@ -95,7 +95,7 @@ namespace Trick {
             std::string & get_input_file_ref() ;
 
             /**
-             @brief @userdesc Command to get the default directory. 
+             @brief @userdesc Command to get the default directory.
              @par Python Usage:
              @code <my_default_dir> = trick.command_line_args_get_default_dir() @endcode
              @return string default_dir
diff --git a/include/trick/DMTCP.hh b/include/trick/DMTCP.hh
index 52f92c8e..4a11f588 100644
--- a/include/trick/DMTCP.hh
+++ b/include/trick/DMTCP.hh
@@ -35,7 +35,7 @@ namespace Trick {
             void dmtcpSystemCmd( const std::string& str );
             void dmtcpCleanup();
             void dmtcpSafestoreDir();
-            void dmtcpRenameCmd();            
+            void dmtcpRenameCmd();
 
             bool isSpecialCharacter( const std::string& str );
 
diff --git a/include/trick/DRAscii.hh b/include/trick/DRAscii.hh
index 93302092..bdcc227d 100644
--- a/include/trick/DRAscii.hh
+++ b/include/trick/DRAscii.hh
@@ -56,7 +56,7 @@ namespace Trick {
 
             #ifndef SWIG
             /**
-             @brief DRAscii default constructor. 
+             @brief DRAscii default constructor.
              */
             DRAscii() {}
             #endif
@@ -94,17 +94,17 @@ namespace Trick {
              @brief @userdesc Command to set the printf format for the group's float variable values in the
              log file (default is "%20.8g").
              @par Python Usage:
-             @code <dr_group>.set_ascii_float_format("<in_ascii_float_format>") @endcode 
+             @code <dr_group>.set_ascii_float_format("<in_ascii_float_format>") @endcode
              @param in_ascii_float_format - printf format string
              @return always 0
             */
             int set_ascii_float_format(std::string in_ascii_float_format) ;
 
             /**
-             @brief @userdesc Command to set the printf format for the group's double variable values in the 
+             @brief @userdesc Command to set the printf format for the group's double variable values in the
              log file (default is "%20.16g").  If single_prec_only is set, then default is "%20.8g".
              @par Python Usage:
-             @code <dr_group>.set_ascii_double_format("<in_ascii_double_format>") @endcode 
+             @code <dr_group>.set_ascii_double_format("<in_ascii_double_format>") @endcode
              @param in_ascii_double_format - printf format string
              @return always 0
             */
@@ -115,7 +115,7 @@ namespace Trick {
              file (default is ",").  When the delimiter is a comma (","), the log file name
              extension will be .csv, otherwise the log file extension will be .txt.
              @par Python Usage:
-             @code <dr_group>.set_delimiter("<in_delimiter>") @endcode 
+             @code <dr_group>.set_delimiter("<in_delimiter>") @endcode
              @param in_delimiter - the delimiter string
              @return always 0
             */
@@ -125,7 +125,7 @@ namespace Trick {
              @brief @userdesc Command to print double variable values as single precision (float) in the log file
              to save space (default is false).
              @par Python Usage:
-             @code <dr_group>.set_single_prec_only(<in_single_prec_only>) @endcode 
+             @code <dr_group>.set_single_prec_only(<in_single_prec_only>) @endcode
              @param in_single_prec_only - boolean true indicates print doubles as single precision
              @return always 0
             */
diff --git a/include/trick/DRBinary.hh b/include/trick/DRBinary.hh
index 82cfd16f..c5ba3966 100644
--- a/include/trick/DRBinary.hh
+++ b/include/trick/DRBinary.hh
@@ -81,7 +81,7 @@ namespace Trick {
 
             #ifndef SWIG
             /**
-             @brief DRBinary default constructor. 
+             @brief DRBinary default constructor.
              */
             DRBinary() {}
             #endif
diff --git a/include/trick/DRHDF5.hh b/include/trick/DRHDF5.hh
index 1ff17eaf..a08fc28e 100644
--- a/include/trick/DRHDF5.hh
+++ b/include/trick/DRHDF5.hh
@@ -52,7 +52,7 @@ namespace Trick {
       Trick 07 to the current version.  The contents of the file are binary and is not included here.  The HDF5 layout
       of the file follows.
 
-      @verbatim 
+      @verbatim
 GROUP "/" {
     GROUP "header" {
         DATASET "file_names" {
@@ -89,7 +89,7 @@ GROUP "/" {
 
             #ifndef SWIG
             /**
-             @brief DRHDF5 default constructor. 
+             @brief DRHDF5 default constructor.
              */
             DRHDF5() {}
             #endif
diff --git a/include/trick/IntegAlgorithms.hh b/include/trick/IntegAlgorithms.hh
index ec60e52e..cb8c35bb 100644
--- a/include/trick/IntegAlgorithms.hh
+++ b/include/trick/IntegAlgorithms.hh
@@ -1,4 +1,4 @@
-/* 
+/*
  * PURPOSE:
  * ( )
 */
diff --git a/include/trick/IntegLoopManager.hh b/include/trick/IntegLoopManager.hh
index 4555cdc8..a5436ba9 100644
--- a/include/trick/IntegLoopManager.hh
+++ b/include/trick/IntegLoopManager.hh
@@ -364,7 +364,7 @@ class IntegLoopScheduler;
 
         /**
          * Create a SimObjectIntegInfo that represents the specified sim object,
-         * adding the representation to the set of such and populating the 
+         * adding the representation to the set of such and populating the
          * object with the jobs in the sim object that pertain to integration.
          * @param sim_object The sim object to be represented.
          */
diff --git a/include/trick/Integrator.hh b/include/trick/Integrator.hh
index f36cc71a..e82aa48f 100644
--- a/include/trick/Integrator.hh
+++ b/include/trick/Integrator.hh
@@ -21,7 +21,7 @@
 #endif
 */
 
-/** 
+/**
  *  Below are the supported types of integration schemes.
  */
 typedef enum {
@@ -128,7 +128,7 @@ namespace Trick {
         virtual void set_verbosity(int level);
         virtual void reset() {}
         virtual Integrator_type get_Integrator_type() { return (User_Defined); };
-        
+
     };
 
     Integrator* getIntegrator( Integrator_type Alg, unsigned int State_size, double Dt = 0.0 );
diff --git a/include/trick/Interpolator.hh b/include/trick/Interpolator.hh
index 7b9c851d..476a0fef 100644
--- a/include/trick/Interpolator.hh
+++ b/include/trick/Interpolator.hh
@@ -13,7 +13,7 @@ namespace Trick {
     : table(Table),
       breakPointArrays(BreakPointArrays),
       breakPointArraySizes(BreakPointArraySizes),
-      nParams(NParams) {};  
+      nParams(NParams) {};
 
     double eval (double param1, ...) throw(std::logic_error) ;
     double eval (double params[]) throw(std::logic_error) ;
diff --git a/include/trick/MSSharedMem.hh b/include/trick/MSSharedMem.hh
index bfbec820..5c74498e 100644
--- a/include/trick/MSSharedMem.hh
+++ b/include/trick/MSSharedMem.hh
@@ -38,7 +38,7 @@ PROGRAMMERS:
 #define MSQ_INIT(q)      q##_front = q##_back = 0
 #define MSQ_ISEMPTY(q)   (q##_front==q##_back)
 #define MSQ_FRONT(q)     q[q##_front]
-#define MSQ_POP(q)       ++q##_front %= (MSQ_MAXSIZE) 
+#define MSQ_POP(q)       ++q##_front %= (MSQ_MAXSIZE)
 #define MSQ_SIZE(q)      q##_back-q##_front
 #define MSQ_PUSH(q,data) q[q##_back] = data ; ++q##_back %= (MSQ_MAXSIZE)
 //-----------------------------------------------------------------------------
@@ -47,9 +47,9 @@ namespace Trick {
 
     /**
      * This class is shared memory based MSConnect class to connect master and slaves.
-     * It defines the master/slave connection calls as well as the calls used by 
-     * both sides to send the time and mode commands.  
-     * 
+     * It defines the master/slave connection calls as well as the calls used by
+     * both sides to send the time and mode commands.
+     *
      * @author Eddie J. Paddock (Apr 1996)
      * @author Scott Killingsworth (Sep 1997)
      * @author Many other Trick developers of the past
@@ -66,8 +66,8 @@ namespace Trick {
         MSQ_DECLARE (master_command, MS_SIM_COMMAND)
         MSQ_DECLARE (slave_command, MS_SIM_COMMAND)
         // checkpoint data is not sent every frame, so dont need a queue
-        int slave_port;                         /**< trick_units(--) slave's dmtcp checkpoint port */              
-        char chkpnt_name[256];                  /**< trick_units(--) checkpoint dir/filename */              
+        int slave_port;                         /**< trick_units(--) slave's dmtcp checkpoint port */
+        char chkpnt_name[256];                  /**< trick_units(--) checkpoint dir/filename */
     } MSSharedMemData;
 
     class MSSharedMem : public MSConnect {
@@ -88,7 +88,7 @@ namespace Trick {
             /**
              @brief Sets the wait time limit for communications between the master and slaves.
              Any @c in_limit <= 0.0 means an infinite wait limit.
-             @param in_limit - the desired wait limit.  
+             @param in_limit - the desired wait limit.
              @return always 0
              */
             virtual int set_sync_wait_limit(double in_limit) ;
diff --git a/include/trick/MapStrToPtr.h b/include/trick/MapStrToPtr.h
index 81187abf..b2f70011 100644
--- a/include/trick/MapStrToPtr.h
+++ b/include/trick/MapStrToPtr.h
@@ -57,7 +57,7 @@ typedef struct _MapStrToPtr
 
 /* create and initialize a table that maps strings to pointers.
    The size specifies the number of lists maintained by the map.  For maximum efficiency use a prime
-   number for nSize that is close to the average number of elements being stored in the table. 
+   number for nSize that is close to the average number of elements being stored in the table.
    The string to pointer map can store an arbitrary number of elements with the maximum size
    being limited by the computer's memory
 */
@@ -68,7 +68,7 @@ MapStrToPtr* SM_Create(int nSize);
 
 /* delete a map that associates strings with pointers
    this does not free the user-defined data that the table is storing.. enumerate through the table and
-   remove all user-defined data first 
+   remove all user-defined data first
 */
 
 void SM_Delete(MapStrToPtr* Map);
@@ -76,7 +76,7 @@ void SM_Delete(MapStrToPtr* Map);
 
 
 /* lookup the data that is associated with the string given by key
-   return: a pointer to the data, or NULL if the string given by key is not in the map 
+   return: a pointer to the data, or NULL if the string given by key is not in the map
 */
 
 void* SM_Lookup(char* key, MapStrToPtr* Map);
@@ -92,7 +92,7 @@ void* SM_Map(char* key, void* data, MapStrToPtr* Map);
 
 
 /* unmap a string and pointer.  This is the inverse of the map function.  The return value is a pointer to the
-   data mapped to the key.  If the key is not found, NULL is returned 
+   data mapped to the key.  If the key is not found, NULL is returned
 */
 
 void* SM_RemoveKey(char* key, MapStrToPtr* Map);
@@ -131,7 +131,7 @@ typedef struct _StrMapIterator
 }StrMapIterator;
 
 
-/* creates and initializes an iterator.  Pass the map that you want to iterate on as the map parameter 
+/* creates and initializes an iterator.  Pass the map that you want to iterate on as the map parameter
    To re-use this iterator on a different map, call SMI_Attach */
 
 StrMapIterator* SMI_Create(MapStrToPtr* Map);
@@ -147,7 +147,7 @@ void SMI_Attach(MapStrToPtr* Map,StrMapIterator* iter);
 
 
 /* gets the first element in a map, key will be modified to point to the key at this location.  Do not free
-   this key.  In Addition, always call SMI_GetFirst, before calling SMI_GetNext or SMI_GetPrev  
+   this key.  In Addition, always call SMI_GetFirst, before calling SMI_GetNext or SMI_GetPrev
    return: pointer to the data stored at this map location */
 
 void * SMI_GetFirst(char** key, StrMapIterator* iter);
diff --git a/include/trick/MemoryManager.hh b/include/trick/MemoryManager.hh
index f1c56dea..a20b64db 100644
--- a/include/trick/MemoryManager.hh
+++ b/include/trick/MemoryManager.hh
@@ -228,7 +228,7 @@ namespace Trick {
 
             /**
              Test whether the given variable_name is in use .
-             @return 0 = FALSE, 1 = TRUE. 
+             @return 0 = FALSE, 1 = TRUE.
              */
             int var_exists(std::string var_name);
 
@@ -334,35 +334,35 @@ namespace Trick {
 
             /**
              Checkpoint all allocations known to the MemoryManager to a file.
-             @param filename 
+             @param filename
              */
             void write_checkpoint( const char* filename);
 
             /**
              Checkpoint the named variable (allocation) and it dependencies to the given stream.
              @param out_s output stream.
-             @param var_name 
+             @param var_name
              */
             void write_checkpoint( std::ostream& out_s, const char* var_name);
 
             /**
              Checkpoint the named variable (allocation) and it dependencies to a file.
-             @param filename 
-             @param var_name 
+             @param filename
+             @param var_name
              */
             void write_checkpoint( const char* filename, const char* var_name);
 
             /**
              Checkpoint the named variables and their dependencies to a stream.
              @param out_s output stream.
-             @param var_name_list 
+             @param var_name_list
              */
             void write_checkpoint( std::ostream& out_s, std::vector<const char*>& var_name_list);
 
             /**
              Checkpoint the named variables and their dependencies to a file.
-             @param filename 
-             @param var_name_list 
+             @param filename
+             @param var_name_list
              */
             void write_checkpoint( const char* filename, std::vector<const char*>& var_name_list);
 
@@ -409,7 +409,7 @@ namespace Trick {
              (child) ATTRIBUTES to the attr field of the given (parent) ATTRIBUTES structure.
              @param type_name - user defined type name.
              @param attr      - pointer to parent attributes structure.
-             @return 0 on success, otherwise failure. 
+             @return 0 on success, otherwise failure.
              */
             int add_attr_info(const std::string& type_name , ATTRIBUTES* attr , const char * file_name = "None" , unsigned int line_num = 0 ) ;
 
@@ -417,7 +417,7 @@ namespace Trick {
              Adds a template name translation to our map.  The base template type is mangled to the io_src name
              @param template_name - base template type name
              @param attr_name - mangled attribute name
-             @return 0 on success, otherwise failure. 
+             @return 0 on success, otherwise failure.
              */
             int add_template_name_trans(std::string template_name , std::string attr_name) ;
 
@@ -520,12 +520,12 @@ namespace Trick {
             int get_enumerated(const char* name, V_DATA* v_data);
 
             /**
-             Return the number of array elements in the allocation. 
+             Return the number of array elements in the allocation.
              @param ptr address.
              */
             int get_size(void *addr);
 
-            /** 
+            /**
              Return the number of array elements in the allocation following ptr.
              @param ptr - pointer.
              */
@@ -732,8 +732,8 @@ namespace Trick {
             /**
              Assign the value(s) in v_tree to the variable at the given address.
              The object at the address may be a singleton or an array of up to
-             eight dimensions. If v_tree is NULL, then assign nil values. 
-            
+             eight dimensions. If v_tree is NULL, then assign nil values.
+
              @param base_addr - Base address of the variable in which data is being assigned.
              @param attr - Attributes of the variable.
              @param curr_dim - The dimension of interest in the variable.
diff --git a/include/trick/MonteCarlo.hh b/include/trick/MonteCarlo.hh
index c74aaf41..2fdee33f 100644
--- a/include/trick/MonteCarlo.hh
+++ b/include/trick/MonteCarlo.hh
@@ -258,7 +258,7 @@ namespace Trick {
         int run_queue(Trick::ScheduledJobQueue* queue, std::string in_string) ;
 
         int open_file(std::string file_name, FILE** file_ptr) ;
- 
+
         void write_to_run_files(std::string file_name) ;
 
         int initialize_sockets() ;
@@ -473,14 +473,14 @@ namespace Trick {
         bool get_dry_run();
 
         /**
-         * Returns true if executive is running as the slave, 
+         * Returns true if executive is running as the slave,
          * based on value of slave_id (which is > 0 for slave).
          */
         bool is_slave();
 
         /**
-         * Returns true if executive is running as the master, 
-         * based on the value of slave_id (which is 0 for master). 
+         * Returns true if executive is running as the master,
+         * based on the value of slave_id (which is 0 for master).
          */
         bool is_master();
 
@@ -673,7 +673,7 @@ namespace Trick {
         void stop_slave(unsigned int id);
 
         /**
-         * Disables the slave at initialization of the Master. Must be called before master_init is called               
+         * Disables the slave at initialization of the Master. Must be called before master_init is called
          * (i.e. in input file, default_data jobs, or initialization jobs with a phase number = 0)
          *
          * @param name the name of the slave to disable
@@ -696,73 +696,73 @@ namespace Trick {
         int shutdown();
 
         /** Gets #current_run being processed
-         * 
+         *
          * @return the current run number
          */
         unsigned int get_current_run() ;
 
         /** Sets the #current_run being processed
-         * 
+         *
          * @param run_num the number to set the run
          */
         void set_current_run(int run_num) ;
 
         /** Retrieves the #data_connection_device
-         * 
+         *
          * @return the address of the data_connection_device
          */
         TCDevice* get_data_connection_device();
 
-        /** Allows the user to set the port number for 
+        /** Allows the user to set the port number for
          * the listen_device
          *
          * @param port_number number for the port
          */
         void set_listen_device_port(int port_number) ;
 
-        /** Allows the user to set the port number for 
+        /** Allows the user to set the port number for
          * the data_listen_device
          *
          * @param port_number number for the port
          */
         void set_data_listen_device_port(int port_number) ;
 
-        /** Allows the user to set the port number for 
+        /** Allows the user to set the port number for
          * the connection_device
          *
          * @param port_number number for the port
          */
         void set_connection_device_port(int port_number) ;
 
-        /** Allows the user to set the port number for 
+        /** Allows the user to set the port number for
          * the data_connection_device
          *
          * @param port_number number for the port
          */
         void set_data_connection_device_port(int port_number) ;
 
-        /** Allows the user to get the port number for 
+        /** Allows the user to get the port number for
          * the listen_device
          *
          * @return the port number
          */
         int  get_listen_device_port() ;
 
-        /** Allows the user to get the port number for 
+        /** Allows the user to get the port number for
          * the data_listen_device
          *
          * @return the port number
          */
         int  get_data_listen_device_port() ;
 
-        /** Allows the user to get the port number for 
+        /** Allows the user to get the port number for
          * the connection_device
          *
          * @return the port number
          */
         int  get_connection_device_port() ;
 
-        /** Allows the user to get the port number for 
+        /** Allows the user to get the port number for
          * the data_connection_device
          *
          * @return the port number
@@ -814,7 +814,7 @@ namespace Trick {
         void read_machine_name(MonteSlave *curr_slave);
 
         void set_disconnected_state(MonteSlave *curr_slave);
- 
+
         void read_slave_port(MonteSlave *curr_slave);
 
         /**
@@ -931,7 +931,7 @@ namespace Trick {
         int instrument_job_after(Trick::JobData* instrument_job);
         int instrument_job_remove(std::string in_job);
         int write_s_job_execution(FILE* fp);
-        
+
 
         /**
          * Determines if the specified stings are equivalent, ignoring case.
diff --git a/include/trick/MonteVarCalculated.hh b/include/trick/MonteVarCalculated.hh
index 93ea07d8..335c9b71 100644
--- a/include/trick/MonteVarCalculated.hh
+++ b/include/trick/MonteVarCalculated.hh
@@ -13,7 +13,7 @@
 #include "trick/MonteVar.hh"
 #include "trick/reference.h"
 
-// This block of code disowns the pointer on the python side so you can reassign 
+// This block of code disowns the pointer on the python side so you can reassign
 // python variables without freeing the C++ class underneath
 #ifdef SWIG
 %feature("compactdefaultargs","0") ;
diff --git a/include/trick/MonteVarFile.hh b/include/trick/MonteVarFile.hh
index 6c01aefa..fd45ad94 100644
--- a/include/trick/MonteVarFile.hh
+++ b/include/trick/MonteVarFile.hh
@@ -14,7 +14,7 @@
 
 #include "trick/MonteVar.hh"
 
-// This block of code disowns the pointer on the python side so you can reassign 
+// This block of code disowns the pointer on the python side so you can reassign
 // python variables without freeing the C++ class underneath
 #ifdef SWIG
 %feature("compactdefaultargs","0") ;
@@ -23,7 +23,7 @@
         this = $action(*args)
         try: self.this.append(this)
         except: self.this = this
-        this.own(0) 
+        this.own(0)
         self.this.own(0)
 %}
 #endif
@@ -90,7 +90,7 @@ namespace Trick {
         /** Destructor. */
         virtual ~MonteVarFile();
         /**
-         * Sets the file name 
+         * Sets the file name
          *
          * @param in_file_name the name of the file containing this variable's values
          */
diff --git a/include/trick/MonteVarFixed.hh b/include/trick/MonteVarFixed.hh
index 5329ab3e..0e90665e 100644
--- a/include/trick/MonteVarFixed.hh
+++ b/include/trick/MonteVarFixed.hh
@@ -12,7 +12,7 @@
 
 #include "trick/MonteVar.hh"
 
-// This block of code disowns the pointer on the python side so you can reassign 
+// This block of code disowns the pointer on the python side so you can reassign
 // python variables without freeing the C++ class underneath
 #ifdef SWIG
 %feature("compactdefaultargs","0") ;
diff --git a/include/trick/MonteVarRandom.hh b/include/trick/MonteVarRandom.hh
index 87fb4995..2f4ba718 100644
--- a/include/trick/MonteVarRandom.hh
+++ b/include/trick/MonteVarRandom.hh
@@ -14,7 +14,7 @@
 #include "trick/rand_generator.h"
 #include "trick/StlRandomGenerator.hh"
 
-// This block of code disowns the pointer on the python side so you can reassign 
+// This block of code disowns the pointer on the python side so you can reassign
 // python variables without freeing the C++ class underneath
 #ifdef SWIG
 %feature("compactdefaultargs","0") ;
diff --git a/include/trick/PythonPrint.hh b/include/trick/PythonPrint.hh
index dd30d7e8..15e0eb09 100644
--- a/include/trick/PythonPrint.hh
+++ b/include/trick/PythonPrint.hh
@@ -35,8 +35,8 @@ class PythonPrint: public CheckPointAgent {
      object to the name on the left-side stack.
      */
     virtual void assign_rvalue( std::ostream& chkpnt_os,
-                                void*       address, 
-                                ATTRIBUTES* attr, 
+                                void*       address,
+                                ATTRIBUTES* attr,
                                 int         curr_dim,
                                 int         offset
                                 );
@@ -45,7 +45,7 @@ class PythonPrint: public CheckPointAgent {
      */
     virtual int restore( std::istream* checkpoint_stream);
 
-    /** 
+    /**
      Write a single value of an intrinsic type located at the given address and offset.
 
      @param address - address of the object that contains the value to be written.
@@ -53,12 +53,12 @@ class PythonPrint: public CheckPointAgent {
      @param offset - if the object specified by address and attr is arrayed, then this
                      parameter specifies where, within the array the single value is
                      located. @c offset=0 means that the address points to the value
-                     to be written. 
+                     to be written.
      */
     static void write_singleton( std::ostream& chkpnt_os, void* address,
      ATTRIBUTES* attr, int offset, bool write_units = true , bool in_list = false );
 
-    /** 
+    /**
      I NEED DOCUMENTATION!
      */
     static void write_rvalue( std::ostream& chkpnt_os, void* address,
@@ -69,8 +69,8 @@ class PythonPrint: public CheckPointAgent {
      suitable for the right side of an assignment statement.
      The pointer must be an address that is being managed by MM (the MemoryManager) or a
      character string (char* or wchar_t*).
- 
-     @param pointer 
+
+     @param pointer
      @param attr ATTRIBUTES of the pointer.
      @param curr_dim current dimension.
      @return text expression that represents the pointer.
diff --git a/include/trick/RefParseContext.hh b/include/trick/RefParseContext.hh
index b5d5bebf..7fcf02a0 100644
--- a/include/trick/RefParseContext.hh
+++ b/include/trick/RefParseContext.hh
@@ -15,7 +15,7 @@
  */
 class RefParseContext {
 
-public: 
+public:
 
     int debug ;                      /**< -- Debug level */
     int verify_input;                /**< -- Verify input runstream syntax flag */
diff --git a/include/trick/Scheduler.hh b/include/trick/Scheduler.hh
index bbe392dc..2ff99b3d 100644
--- a/include/trick/Scheduler.hh
+++ b/include/trick/Scheduler.hh
@@ -59,7 +59,7 @@ namespace Trick {
 
             /**
              * Formats cyclic jobs to be written to the S_job_execution file
-             * @param fp - open file pointer to write jobs data 
+             * @param fp - open file pointer to write jobs data
              * @param curr_queue - queue to parse and write to file
              * @return always 0
              */
diff --git a/include/trick/SimObject.hh b/include/trick/SimObject.hh
index 68f317d2..1dbb6a8c 100644
--- a/include/trick/SimObject.hh
+++ b/include/trick/SimObject.hh
@@ -21,7 +21,7 @@ namespace Trick {
      * jobs instantiated within the SimObject and the call functions to actually call the functions.
      * Typcally children classes are defined in the S_define file and the call_function routines are
      * auto generated by CP.
-     *  
+     *
      * @author Alexander S. Lin
      *
      * @date Jan. 2010
diff --git a/include/trick/StlRandomGenerator.hh b/include/trick/StlRandomGenerator.hh
index 19598b5c..d3524a5e 100644
--- a/include/trick/StlRandomGenerator.hh
+++ b/include/trick/StlRandomGenerator.hh
@@ -63,21 +63,21 @@ public:
     ///@warning with GCC 4.4.7, -std=c++0x, MINSTD_RAND_ENGINE,MT19937_ENGINE
     ///         'engines' return pseudo-random numbers outside the cannonical range of 0 <= x < 1.
     ///
-    ///                 This causes an __INFINITE LOOP__ within the std::normal_distribution. 
+    ///                 This causes an __INFINITE LOOP__ within the std::normal_distribution.
     ///
     ///
     ///         For TR1 compilers with this problem, use RANLUX_BASE_01_ENGINE or RANLUX_64_BASE_01_ENGINE
-    ///         which return within the cannonical range. 
+    ///         which return within the cannonical range.
     ///
-    ///@note when adding new engine types, coordinate values with MonteVarRandom. 
+    ///@note when adding new engine types, coordinate values with MonteVarRandom.
     enum StlEngine {
         TRICK_DEFAULT_ENGINE     = 1, /**< -- std::ranlux_base_01 for TR1, std::mt19937 for _HAVE_STD_RANDOM */
-        
+
 #ifdef _HAVE_TR1_RANDOM
         RANLUX_BASE_01_ENGINE    = 2, /**< -- TR1 only std::ranlux_base_01 Engine, note: replaced for c++11 */
         RANLUX_64_BASE_01_ENGINE = 3, /**< -- TR1 only std::ranlux64_base_01 Engine, note: replaced for c++11 */
 #endif
-        
+
 #ifdef _HAVE_STL_RANDOM
         // NOTE: MINSTD_RAND_ENGINE and MT19937_ENGINE return out of canonical range
         // for (at least) GCC 4.4.7,so are not provided for _HAVE_TR1_RANDOM
@@ -85,24 +85,24 @@ public:
         MT19937_ENGINE           = 3, /**< -- std::mt19937 Mersenne Twister Engine */
 
         MT19937_64_ENGINE        = 4, /**< -- std::mt19937_64  64 bit Mersenne Twister Engine. Not available TR1 */
-        
+
         RANLUX_24_BASE_ENGINE    = 5, /**< -- std::ranlux24_base Engine */
         RANLUX_44_BASE_ENGINE    = 6, /**< -- std::ranlux48_base Engine */
-        
+
         RANLUX_24_ENGINE         = 7, /**< -- std::ranlux24 Engine */
         RANLUX_44_ENGINE         = 8, /**< -- std::ranlux48 Engine */
-        
+
         KNUTH_B_ENGINE           = 9 /**< -- std::knuth_b Engine */
 #endif
     };
-    
+
     /** A random distribution. */
     enum StlDistribution {
         GAUSSIAN = TRICK_GSL_GAUSS,  /**< -- Gaussian distribution */
         FLAT     = TRICK_GSL_FLAT,   /**< -- flat distribution */
         POISSON  = TRICK_GSL_POISSON /**< -- Poisson distribution */
     };
-    
+
     ///@param in_param_a first parameter in distribution::param_type
     ///                  min for FLAT, mean for GAUSSIAN and POISSON
     ///
@@ -115,17 +115,17 @@ public:
     ///
     explicit StlRandomGenerator(double        in_param_a = 0.0,
                                 double        in_param_b = 1.0,
-                                unsigned long in_seed    = 12345, 
+                                unsigned long in_seed    = 12345,
                                 StlRandomGenerator::StlDistribution in_dist_type   = StlRandomGenerator::FLAT,
                                 StlRandomGenerator::StlEngine       in_engine_type = StlRandomGenerator::TRICK_DEFAULT_ENGINE
                                 );
 
     virtual ~StlRandomGenerator();
-    
+
     ///@brief return next pseudo-random number
     ///@note POISSON distribution returns an int type,
-    ///  so this would need to either cast to double or return a union class like 
-    ///  the Trick rand routines already do in order to fit in. 
+    ///  so this would need to either cast to double or return a union class like
+    ///  the Trick rand routines already do in order to fit in.
     virtual TRICK_GSL_RETURN_TYPE operator()() = 0;
 
     ///@brief reset seed for pseudo-random number engine
@@ -134,14 +134,14 @@ public:
     ///@brief reset parameters for the distribution
     ///@param a is min for FLAT, mean for GAUSSION and POISSON
     ///@param b is max for FLAT, sigma for GAUSSION and unused for POISSON
-    ///@note For TR1, set_param replaces the distribution via operator= 
+    ///@note For TR1, set_param replaces the distribution via operator=
     virtual void set_param(double a, double b = 0.0) = 0;
-    
+
     double get_param_a() const { return param_a; }
     double get_param_b() const { return param_b; }
 
 protected:
-    
+
     double           param_a;        /**< -- first param in distribution::param_type, min for FLAT, mean for GAUSSIAN and POISSON */
     double           param_b;        /**< -- second param in distribution::param_type, max for FLAT, std deviation for GAUSSIAN, (unused for POISSON) */
     int              initialSeed;    /**< -- starting seed */
@@ -178,7 +178,7 @@ protected:
 
 #else
     // do nothing class may be needed if no <random> ??
-    // may not if the base class is always a pointer (nullpointer) if not instantiated. 
+    // may not if the base class is always a pointer (nullpointer) if not instantiated.
 
 #endif // _HAVE_TR1_RANDOM or _HAVE_STL_RANDOM
 
diff --git a/include/trick/StlRandomGeneratorSub.hh b/include/trick/StlRandomGeneratorSub.hh
index 660d276d..3f709eb7 100644
--- a/include/trick/StlRandomGeneratorSub.hh
+++ b/include/trick/StlRandomGeneratorSub.hh
@@ -6,10 +6,10 @@
 
 ///@brief return the correct param_type loaded with the input values
 ///
-///@details Provides a way for a common input interface to return the correct param_type 
+///@details Provides a way for a common input interface to return the correct param_type
 ///         for all implemented distributions, without the calling code having to hardcode the distribution.
-///         (Because multiple hardcodes won't work for templated distributions where the 
-///         initialization signatures aren't all the same. 
+///         (Because multiple hardcodes won't work for templated distributions where the
+///         initialization signatures aren't all the same.
 ///
 ///         Common signature of static wrapper methods for all implemented 'Distribution' types:
 ///
@@ -18,9 +18,9 @@
 ///
 ///         This allows user to use a single call: dist.param( ParamWrapper::param(dist, a,b) )
 ///         and the compiler will choose the correct ParamWrapper method to match dist.param's
-///         need for a Distribution::param_type class object, based on the type of the 'dist' input argument. 
+///         need for a Distribution::param_type class object, based on the type of the 'dist' input argument.
 ///
-///         (Otherwise, it is difficult to use the param_type system without knowing the 
+///         (Otherwise, it is difficult to use the param_type system without knowing the
 ///         distribution type at compile time.)
 ///
 class ParamWrapper {
@@ -33,15 +33,15 @@ public:
     static std::uniform_real_distribution<double>::param_type
     param(__attribute__((unused)) const std::uniform_real_distribution<double>& dist, double min, double max = 0.0)
     { return std::uniform_real_distribution<double>::param_type(min,max); }
-    
+
     static std::normal_distribution<double>::param_type
     param(__attribute__((unused)) const std::normal_distribution<double>& dist, double mean, double std_dev = 0.0)
     { return std::normal_distribution<double>::param_type(mean,std_dev); }
-    
+
     static std::poisson_distribution<STL_POISSON_TEMPLATE_TYPES>::param_type
     param(__attribute__((unused)) const std::poisson_distribution<STL_POISSON_TEMPLATE_TYPES>& dist, double mean, __attribute__((unused)) double unused = 0.0)
     { return std::poisson_distribution<STL_POISSON_TEMPLATE_TYPES>::param_type(mean); }
-    
+
     ///@}
 private:
     ParamWrapper();
@@ -64,38 +64,38 @@ public:
 #ifdef _HAVE_STL_RANDOM
     static TRICK_GSL_RETURN_TYPE return_value(__attribute__((unused)) const std::uniform_real_distribution<double>& dist, double ret_val)
 #endif
-    { 
+    {
         TRICK_GSL_RETURN_TYPE output;
-        output.d = ret_val; 
+        output.d = ret_val;
         return output;
     }
-    
+
     static TRICK_GSL_RETURN_TYPE return_value(__attribute__((unused)) const std::normal_distribution<double>& dist, double ret_val)
-    { 
+    {
         TRICK_GSL_RETURN_TYPE output;
-        output.d = ret_val; 
+        output.d = ret_val;
         return output;
     }
-    
+
     static TRICK_GSL_RETURN_TYPE return_value(__attribute__((unused)) const std::poisson_distribution<STL_POISSON_TEMPLATE_TYPES>& dist, int ret_val)
-    { 
+    {
         TRICK_GSL_RETURN_TYPE output;
-        output.ii = ret_val; 
+        output.ii = ret_val;
         return output;
     }
-    
+
 };
 #endif
 
 
 ///@brief Sub class for object that includes a <random> engine and a distribution
 ///
-///@note partial specialization exists for Distribution = std::poisson_distribution<int> 
-///      because TR1 doesn't implement param_type system, thus has no way to generally 
-///      init the class! (No way to use a common 2 parameter interface and ignore the 
+///@note partial specialization exists for Distribution = std::poisson_distribution<int>
+///      because TR1 doesn't implement param_type system, thus has no way to generally
+///      init the class! (No way to use a common 2 parameter interface and ignore the
 ///      second parameter for single parameter param_type distributions.)
 ///
-///@note The partial specialization is NOT required when c++0x support is dropped. 
+///@note The partial specialization is NOT required when c++0x support is dropped.
 ///
 ///      Also, TR1 Distributions can not have their parameters changed after construction.
 ///      This results in the need for template full method specialization to provide the type specific init.
@@ -104,7 +104,7 @@ template <class Engine, class Distribution>
 class StlRandomGeneratorSub : public StlRandomGenerator
 {
 public:
-    
+
 #ifdef _HAVE_STD_RANDOM  // (Concept doesn't exist in TR1)
     typedef typename Distribution::param_type ParamType;
 #endif
@@ -115,45 +115,45 @@ public:
     explicit StlRandomGeneratorSub(
         double                              in_param_a = 0.0,
         double                              in_param_b = 1.0,
-        unsigned long                       in_seed    = 12345, 
+        unsigned long                       in_seed    = 12345,
         StlRandomGenerator::StlDistribution in_dist_type   = FLAT,
         StlRandomGenerator::StlEngine       in_engine_type = TRICK_DEFAULT_ENGINE
-    ) 
+    )
     :   StlRandomGenerator(in_param_a, in_param_b, in_seed, in_dist_type, in_engine_type),
         engine(in_seed)
     {
         // (Note: distribution member can't be input initialized in the initializer list
         //        because various distributions have different signatures.
         //
-        //      NOTE: For the TR1 implementation, The set_param method 
-        //            _re-constructs_ the object with the desired parameters. 
-        //            (TR1 Distributions can only be initialized at construction time.) 
+        //      NOTE: For the TR1 implementation, The set_param method
+        //            _re-constructs_ the object with the desired parameters.
+        //            (TR1 Distributions can only be initialized at construction time.)
         //
         set_param(in_param_a, in_param_b);
     }
 
     virtual ~StlRandomGeneratorSub() { }
-    
-    
+
+
     ///@brief return next pseudo-random number
-    virtual TRICK_GSL_RETURN_TYPE operator()() 
-    { 
+    virtual TRICK_GSL_RETURN_TYPE operator()()
+    {
 #if (defined(_HAVE_TR1_RANDOM) || defined(_HAVE_STL_RANDOM))
-        return StlReturnWrapper::return_value(distribution, distribution(engine)); 
+        return StlReturnWrapper::return_value(distribution, distribution(engine));
 #else
-        // without either, won't ever be called. But to compile, return zero. 
+        // without either, won't ever be called. But to compile, return zero.
         TRICK_GSL_RETURN_TYPE output;
-        output.d = 0.0; 
+        output.d = 0.0;
         return output;
 #endif
     }
 
-    
+
     ///@brief reset seed for underlying uniform pseudo-random number generator
-    virtual void set_seed(unsigned long in_seed) 
-    { 
+    virtual void set_seed(unsigned long in_seed)
+    {
         initialSeed = in_seed;
-        engine.seed(initialSeed); 
+        engine.seed(initialSeed);
     }
 
 
@@ -162,7 +162,7 @@ public:
     ///@param a is min for FLAT, mean for GAUSSION and POISSON
     ///@param b is max for FLAT, sigma for GAUSSION and unused for POISSON
     ///
-    ///@note For the TR1 implementation, The set_param method 
+    ///@note For the TR1 implementation, The set_param method
     ///      _re-constructs_ the object with the desired parameters.
     ///
     ///      (C++11 allows changing the parameters on the fly.)
@@ -171,50 +171,50 @@ public:
     {
         param_a = a;
         param_b = b;
-        
+
 #ifdef _HAVE_STL_RANDOM
         // (this param_type interface is not provided in TR1)
         distribution.param( ParamWrapper::param(distribution, a,b) );
 #else
-        // TR1 implementation must use this hokey 
+        // TR1 implementation must use this hokey
         // full template specialization solution.
         tr1_init_distribution(a, b);
 #endif
     }
 
 protected:
-    
+
     Engine          engine;          /**< -- STL random number engine object */
     Distribution    distribution;    /**< -- STL random number distribution object */
 
 private:
-    
+
 #ifdef _HAVE_TR1_RANDOM
-    ///@brief For TR1, replace the default initialized distribution with a new one. 
+    ///@brief For TR1, replace the default initialized distribution with a new one.
     ///
     ///@details because TR1 only allows initialization of Distribution parameters at
     /// construction time (C++11 provides the param_type system for doing this post-construction),
     /// this method with full template specializations is used to get around this
-    /// lack of generality for the few so-far implemented distribution options. 
-    /// 
-    /// Once C++11 is required, these can be removed and the simpler C++11 set_param 
-    /// method used for all. 
+    /// lack of generality for the few so-far implemented distribution options.
+    ///
+    /// Once C++11 is required, these can be removed and the simpler C++11 set_param
+    /// method used for all.
     ///
     void tr1_init_distribution(double a, double b)
     {
-        // All two parameter signature distributions can use this method. 
-        // Deviant sets must implement a full template specialization for this method. 
-        distribution = Distribution(a, b); 
+        // All two parameter signature distributions can use this method.
+        // Deviant sets must implement a full template specialization for this method.
+        distribution = Distribution(a, b);
     }
 #endif
-    
+
 };
 
 
 
 #ifdef _HAVE_TR1_RANDOM
 
-// implement one of these template FULL specializations 
+// implement one of these template FULL specializations
 // for each implemented TR1 StlRandomGenerator::StlEngine enums
 //
 // So far, only the Poisson distribution requires a single parameter,
@@ -225,9 +225,9 @@ private:
 
 template<>
 inline
-void 
-StlRandomGeneratorSub<std::minstd_rand, 
-                      std::poisson_distribution<STL_POISSON_TEMPLATE_TYPES> 
+void
+StlRandomGeneratorSub<std::minstd_rand,
+                      std::poisson_distribution<STL_POISSON_TEMPLATE_TYPES>
                      >::tr1_init_distribution(double a, double __attribute__((unused)) b)
 {
     distribution = std::poisson_distribution<STL_POISSON_TEMPLATE_TYPES>(a);
@@ -235,9 +235,9 @@ StlRandomGeneratorSub<std::minstd_rand,
 
 template<>
 inline
-void 
-StlRandomGeneratorSub<std::mt19937, 
-                      std::poisson_distribution<STL_POISSON_TEMPLATE_TYPES> 
+void
+StlRandomGeneratorSub<std::mt19937,
+                      std::poisson_distribution<STL_POISSON_TEMPLATE_TYPES>
                      >::tr1_init_distribution(double a, double __attribute__((unused)) b)
 {
     distribution = std::poisson_distribution<STL_POISSON_TEMPLATE_TYPES>(a);
@@ -247,9 +247,9 @@ StlRandomGeneratorSub<std::mt19937,
 
 template<>
 inline
-void 
-StlRandomGeneratorSub<std::ranlux_base_01, 
-                      std::poisson_distribution<STL_POISSON_TEMPLATE_TYPES> 
+void
+StlRandomGeneratorSub<std::ranlux_base_01,
+                      std::poisson_distribution<STL_POISSON_TEMPLATE_TYPES>
                      >::tr1_init_distribution(double a, double __attribute__((unused)) b)
 {
     distribution = std::poisson_distribution<STL_POISSON_TEMPLATE_TYPES>(a);
@@ -257,9 +257,9 @@ StlRandomGeneratorSub<std::ranlux_base_01,
 
 template<>
 inline
-void 
-StlRandomGeneratorSub<std::ranlux64_base_01, 
-                      std::poisson_distribution<STL_POISSON_TEMPLATE_TYPES> 
+void
+StlRandomGeneratorSub<std::ranlux64_base_01,
+                      std::poisson_distribution<STL_POISSON_TEMPLATE_TYPES>
                      >::tr1_init_distribution(double a, double __attribute__((unused)) b)
 {
     distribution = std::poisson_distribution<STL_POISSON_TEMPLATE_TYPES>(a);
diff --git a/include/trick/attributes.h b/include/trick/attributes.h
index c94d17f9..3f8dfaea 100644
--- a/include/trick/attributes.h
+++ b/include/trick/attributes.h
@@ -39,7 +39,7 @@ typedef struct {
 typedef struct {
     int size;       /**< -- If ATTRIBUTES.type == TRICK_BITFIELD or ATTRIBUTES.type ==
                             TRICK_UNSIGNED_BITFIELD, then ATTRIBUTES.index.size[0]
-                            represents the number of bits in the bitfield. 
+                            represents the number of bits in the bitfield.
 
                             Otherwise:
 
@@ -58,7 +58,7 @@ typedef struct {
  * ATTRIBUTES are data structures that represent detailed descriptions of data
  * types, including how an instance of a datatype is represented in memory.
  * ATTRIBUTES are fundemental to the design of Trick's Memory Management.
- * 
+ *
  * The ICG code generator generates arrays of ATTRIBUTES, of varying lengths,
  * for each of the structured datat types that it finds in a header (.h or .hh)
  * file. These generated ATTRIBUTES are stored in a directory entitled ./io_src.
diff --git a/include/trick/bst.h b/include/trick/bst.h
index 4a59bd71..d84d2df7 100644
--- a/include/trick/bst.h
+++ b/include/trick/bst.h
@@ -6,7 +6,7 @@
 
 #define RIGHTLEAF 1   /* get right inner leaf in delete */
 #define LEFTLEAF 0    /* get left inner leaf in delete */
- 
+
 
 #ifdef __cplusplus
 extern "C" {
@@ -47,7 +47,7 @@ bstNode *bstGetParent(bstNode *node);            /* get the parent node of a nod
 void *bstDelete(bstNode *node,BST *bst);         /* delete a node from the tree */
 void bstDeleteNodes (BST * bst, bstNode * node);
 int bstGetCount(BST *bst);                       /* get the number of nodes in the tree */
-bstNode* bstInsert(void *info,BST *bst);         /* insert a new node into the tree */  
+bstNode* bstInsert(void *info,BST *bst);         /* insert a new node into the tree */
 void bstPrintAscending(FILE *output, BST *bst);  /* print the nodes in ascending order */
 void bstPrintDescending(FILE *output, BST *bst); /* print the nodes in descending order */
 void bstInit(BST *bst);                          /* intialize the BST structure */
diff --git a/include/trick/checkpoint_sequence_stl.hh b/include/trick/checkpoint_sequence_stl.hh
index aed918bc..f5bd106b 100644
--- a/include/trick/checkpoint_sequence_stl.hh
+++ b/include/trick/checkpoint_sequence_stl.hh
@@ -241,7 +241,7 @@ int restore_sequence_i(STL & in_stl , std::string object_name , std::string var_
 
     //message_publish(1, "RESTORE_SEQUENCE_STL %s_%s\n", object_name.c_str() , var_name.c_str()) ;
 
-    items_ref = ref_attributes((char *)(object_name + std::string("_") + var_name).c_str()) ; 
+    items_ref = ref_attributes((char *)(object_name + std::string("_") + var_name).c_str()) ;
 
     if ( items_ref != NULL ) {
         in_stl.clear() ;
diff --git a/include/trick/dllist.h b/include/trick/dllist.h
index 11c57abd..53649a65 100644
--- a/include/trick/dllist.h
+++ b/include/trick/dllist.h
@@ -47,7 +47,7 @@ typedef struct _DLLIST
     DLLNODE* tail;
     int (*compare)(void* info1,void* info2);
 }DLLIST;
-      
+
 
 
 /******************** function prototypes ********************/
@@ -74,21 +74,21 @@ DLLPOS DLL_FindIndex(int n,DLLIST*);          /* find position at given index */
                                               /* return: position of nth element */
 
 void* DLL_GetAt(DLLPOS pos,DLLIST*);          /* gets info at a position */
-                                              /* return: the info at pos */ 
+                                              /* return: the info at pos */
 
 void* DLL_SetAt(DLLPOS pos,void* data,DLLIST*);          /* sets info at a position */
-                                              /* return: the info previously at pos */ 
+                                              /* return: the info previously at pos */
 
 void* DLL_RemoveAt(DLLPOS,DLLIST*);           /* removes a position from the list */
                                               /* return: the info at the position being removed */
 
 void DLL_RemoveAll(DLLIST*);                  /* removes all elements in the list */
-                                              /* return: none */ 
+                                              /* return: none */
 
 DLLPOS DLL_InsertBefore(DLLPOS pos,void* data,DLLIST*);  /* inserts an element before pos */
                                               /* return: the new pos holding data */
 
-DLLPOS DLL_InsertAfter(DLLPOS pos,void* data,DLLIST*);   /* inserts an element after pos */    
+DLLPOS DLL_InsertAfter(DLLPOS pos,void* data,DLLIST*);   /* inserts an element after pos */
                                               /* return: the new pos holding data */
 
 void* DLL_GetNext(DLLPOS*,DLLIST*);            /* gets the next position in the list */
diff --git a/include/trick/dmtcp_checkpoint_c_intf.hh b/include/trick/dmtcp_checkpoint_c_intf.hh
index 260c3789..54c3a838 100644
--- a/include/trick/dmtcp_checkpoint_c_intf.hh
+++ b/include/trick/dmtcp_checkpoint_c_intf.hh
@@ -20,7 +20,7 @@ int dmtcp_is_enabled() ;
 /* call DMTCP funcion dmtcpRunCommand() */
 int call_dmtcp();
 
-/* DMTCP jobs to run pre, post, and restart. Arguments for dmtcpInstallHooks() - defined in dmtcp/src/dmtcpaware.c */ 
+/* DMTCP jobs to run pre, post, and restart. Arguments for dmtcpInstallHooks() - defined in dmtcp/src/dmtcpaware.c */
 void dmtcp_pre_checkpoint() ;
 void dmtcp_post_checkpoint() ;
 void dmtcp_restart() ;
diff --git a/include/trick/matrix_macros.h b/include/trick/matrix_macros.h
index 9aad8f99..3e398591 100644
--- a/include/trick/matrix_macros.h
+++ b/include/trick/matrix_macros.h
@@ -40,7 +40,7 @@ M =
 \begin{bmatrix}
  0.0 & 0.0 & 0.0 \\
  0.0 & 0.0 & 0.0 \\
- 0.0 & 0.0 & 0.0 
+ 0.0 & 0.0 & 0.0
 \end{bmatrix}
 \f]
 */
@@ -61,7 +61,7 @@ M =
 \begin{bmatrix}
  1.0 & 0.0 & 0.0 \\
  0.0 & 1.0 & 0.0 \\
- 0.0 & 0.0 & 1.0 
+ 0.0 & 0.0 & 1.0
 \end{bmatrix}
 \f]
 */
diff --git a/include/trick/memorymanager_c_intf.h b/include/trick/memorymanager_c_intf.h
index 0e38c891..23bc7f14 100644
--- a/include/trick/memorymanager_c_intf.h
+++ b/include/trick/memorymanager_c_intf.h
@@ -13,14 +13,14 @@
 extern "C" {
 #endif
 
-void* TMM_declare_var( TRICK_TYPE type, const char*class_name, int n_stars, const char* var_name, int n_cdims, int *cdims); 
+void* TMM_declare_var( TRICK_TYPE type, const char*class_name, int n_stars, const char* var_name, int n_cdims, int *cdims);
 void* TMM_declare_var_1d( const char* elem_decl, int e_elems) ;
 void* TMM_declare_var_s( const char* declaration ) ;
 void* alloc_type( int e_elems, const char* enh_type_spec) ;
 
 void* TMM_declare_operatornew_var( const char * class_name, unsigned int alloc_size, unsigned int element_size );
 
-void* TMM_declare_ext_var( void* addr, TRICK_TYPE type, const char*class_name, int n_stars, const char* var_name, int n_cdims, int *cdims); 
+void* TMM_declare_ext_var( void* addr, TRICK_TYPE type, const char*class_name, int n_stars, const char* var_name, int n_cdims, int *cdims);
 void* TMM_declare_ext_var_1d( void* addr, const char* elem_decl, int e_elems) ;
 void* TMM_declare_ext_var_s( void* addr, const char* declaration);
 
diff --git a/include/trick/montecarlo_c_intf.h b/include/trick/montecarlo_c_intf.h
index 1fc18ab6..fee6f41b 100644
--- a/include/trick/montecarlo_c_intf.h
+++ b/include/trick/montecarlo_c_intf.h
@@ -229,37 +229,37 @@ void mc_set_data_listen_device_port(int port_number) ;
 
 /**
  * @relates Trick::MonteCarlo
- * Sets the port for the connection_device. 
+ * Sets the port for the connection_device.
  */
 void mc_set_connection_device_port(int port_number) ;
 
 /**
  * @relates Trick::MonteCarlo
- * Sets the port for the data_connection_device. 
+ * Sets the port for the data_connection_device.
  */
 void mc_set_data_connection_device_port(int port_number) ;
 
 /**
  * @relates Trick::MonteCarlo
- * Gets the port for the listen_device. 
+ * Gets the port for the listen_device.
  */
 int  mc_get_listen_device_port() ;
 
 /**
  * @relates Trick::MonteCarlo
- * Gets the port for the data_listen_device. 
+ * Gets the port for the data_listen_device.
  */
 int  mc_get_data_listen_device_port() ;
 
 /**
  * @relates Trick::MonteCarlo
- * Gets the port for the connection_device. 
+ * Gets the port for the connection_device.
  */
 int  mc_get_connection_device_port() ;
 
 /**
  * @relates Trick::MonteCarlo
- * Gets the port for the data_connection_device. 
+ * Gets the port for the data_connection_device.
  */
 int  mc_get_data_connection_device_port() ;
 
diff --git a/include/trick/outdllist.h b/include/trick/outdllist.h
index 73472557..25c4fea5 100644
--- a/include/trick/outdllist.h
+++ b/include/trick/outdllist.h
@@ -30,7 +30,7 @@ typedef struct _DLLIST {
     DLLNODE* tail;
     int (*compare)(void* info1,void* info2);
 }DLLIST;
- 
+
 
 DLLIST* DLL_Create();
 
diff --git a/include/trick/rand_generator.h b/include/trick/rand_generator.h
index 78582daa..7a986d2f 100644
--- a/include/trick/rand_generator.h
+++ b/include/trick/rand_generator.h
@@ -28,9 +28,9 @@ typedef enum {
 
     UNIFORM_RND_1,      /* Single Linear Congruential Generator */
     UNIFORM_RND_TRIPLE, /* Triple Linear Congruential Generator */
-    GAUSS_RND_PSEUDO,   /* Normalized Quasi-Gaussian Triangular 
+    GAUSS_RND_PSEUDO,   /* Normalized Quasi-Gaussian Triangular
                                Generator */
-    GAUSS_RND_BELL,     /* Normalized Gaussian Bell-Shaped 
+    GAUSS_RND_BELL,     /* Normalized Gaussian Bell-Shaped
                                Generator */
     RND_NUM_1           /* Return a value of 1 */
 } rand_generator;
@@ -45,22 +45,22 @@ typedef enum {
 
 typedef struct {
 
-    rand_generator option;      /* -- Random number generator 
+    rand_generator option;      /* -- Random number generator
                                       option */
-    uniform_generator uniform;  /* -- Uniform Random number 
+    uniform_generator uniform;  /* -- Uniform Random number
                                       generator option */
-    unsigned long seed_1;  /* -- Seed for uniform RNG 
+    unsigned long seed_1;  /* -- Seed for uniform RNG
                                  single LCG */
-    long seed_trpl;        /* -- Seed for uniform RNG 
-                                 triple LCG make this seed 
+    long seed_trpl;        /* -- Seed for uniform RNG
+                                 triple LCG make this seed
                                  negative for initializing
                                  the RNG table */
-    int iff;               /* -- Initialization flag for 
+    int iff;               /* -- Initialization flag for
                                  triple LCG */
     double table[98];      /* -- Table for RNG triple LCG */
     int sigma_range;       /* -- Sigma range for output random num
                                  Must be > 0 for triangular gauss.
-                                 Must be >= 0 for bell gauss, 
+                                 Must be >= 0 for bell gauss,
                                  0 gives infinite sigma. */
     long ix1;              /* -- Intermidiate Radom Number */
     long ix2;              /* -- Intermidiate Radom Number */
@@ -69,7 +69,7 @@ typedef struct {
 } RAND_GENERATOR;
 
 /*
- * Trick's interface to the GNU Scientific Library's 
+ * Trick's interface to the GNU Scientific Library's
  * random number generators
  */
 typedef enum {
@@ -95,7 +95,7 @@ typedef struct {
     int rel_max;          /* -- Maximum is a relative maximum */
     int sigma_range;      /* --  Sigma range for output random num
                                  Must be > 0 for triangular gauss.
-                                 Must be >= 0 for bell gauss, 
+                                 Must be >= 0 for bell gauss,
                                  0 gives infinite sigma.            */
     uniform_generator uniform; /* -- Uniform Random number generator option */
 
diff --git a/include/trick/record_array.h b/include/trick/record_array.h
index 1cd0ef50..3bc209dd 100644
--- a/include/trick/record_array.h
+++ b/include/trick/record_array.h
@@ -22,16 +22,16 @@ typedef struct
    /* create and initialize a record array */
 RecordArray* Array_Create(void);
 
-   /* Appends a record to the end of the array (allocating memory if necessary) 
-    * And returns a pointer to the start of that record 
+   /* Appends a record to the end of the array (allocating memory if necessary)
+    * And returns a pointer to the start of that record
     */
 
 void* Array_AddRecord(RecordArray* pArray);
 
 
    /* Gets a pointer to the record stored at the zero based record index given by nRecord.
-    * If nRecord is greater than the record count - 1, realloc is called to make the 
-    * record buffer larger 
+    * If nRecord is greater than the record count - 1, realloc is called to make the
+    * record buffer larger
     */
 
 void* Array_GetAt(int nRecord,RecordArray* pArray);
@@ -64,7 +64,7 @@ void* Array_GetBuffer(RecordArray* pArray);
 
 
    /* returns a pointer to the buffer prefixed with an INT32 value which holds the
-      record count 
+      record count
     */
 
 void* Array_GetBufferWithSize(RecordArray* pArray);
diff --git a/include/trick/reference.h b/include/trick/reference.h
index 64ec2ec2..d30a8252 100644
--- a/include/trick/reference.h
+++ b/include/trick/reference.h
@@ -60,14 +60,14 @@ typedef struct {
     V_DATA v_data;          /**< ** Value */
     ATTRIBUTES* attr;       /**< -- Parameter attributes */
     ATTRIBUTES* ref_attr;   /**< -- Dynamically allocated reference attribute. */
-    int create_add_path ;   /**< ** bool to shortcut to resolve address */ 
-    DLLIST * address_path ; /**< ** shortcut to resolve address */ 
+    int create_add_path ;   /**< ** bool to shortcut to resolve address */
+    DLLIST * address_path ; /**< ** shortcut to resolve address */
 } REF2;
 
 /**
  * Get the value of the variable referenced by R.
  * @param R variable reference.
- * @param V pointer to V_DATA object into which the value is to be assigned. 
+ * @param V pointer to V_DATA object into which the value is to be assigned.
  * @todo isn't this obsolete?
  */
 int ref_to_value( REF2* R, V_DATA* V);
diff --git a/include/trick/reference_frame.h b/include/trick/reference_frame.h
index 24223958..d056cf9e 100644
--- a/include/trick/reference_frame.h
+++ b/include/trick/reference_frame.h
@@ -29,10 +29,10 @@ typedef enum {
 typedef struct {
 
     Euler_Seq euler_sequence;   /* --   Euler rotation sequence */
-    double euler_angles[3];     /* (rad)  Euler rot angles from 
+    double euler_angles[3];     /* (rad)  Euler rot angles from
                                         Frame 1 to Frame 2 */
-    double location[3];         /* (m)  Frame 1 origin to Frame 2 
-                                        origin vector, referenced 
+    double location[3];         /* (m)  Frame 1 origin to Frame 2
+                                        origin vector, referenced
                                         to Frame 1 */
 } TRANSFORM;
 
diff --git a/include/trick/regula_falsi.h b/include/trick/regula_falsi.h
index 80904ca2..54f14cea 100644
--- a/include/trick/regula_falsi.h
+++ b/include/trick/regula_falsi.h
@@ -22,11 +22,11 @@ extern "C" {
 
 typedef enum {
 
-    Decreasing = -1,   /* Sets time to go = 0 only 
+    Decreasing = -1,   /* Sets time to go = 0 only
                           for a decreasing err function */
-    Any,               /* Sets time to go = 0, 
+    Any,               /* Sets time to go = 0,
                           decreasing/increasing err function */
-    Increasing         /* Sets time to go = 0 only for 
+    Increasing         /* Sets time to go = 0 only for
                           an increasing err function */
 } Regula_Falsi;
 
@@ -34,7 +34,7 @@ typedef struct {
 
     int lower_set;       /* --  Yes = Lower bounds has been set */
     int upper_set;       /* --  Yes = Upper bounds has been set */
-    int iterations;      /* --  Total num of iterations 
+    int iterations;      /* --  Total num of iterations
                                 used to fire event */
     int fires;           /* --  Total num of times event fired */
     double x_lower;      /* --  Lower value from error func */
@@ -45,7 +45,7 @@ typedef struct {
     double error;        /* --  New Error value from err func */
     double last_error;   /* --  Last pass error value */
     double last_tgo;     /* s   Last pass Time to go value */
-    double error_tol;    /* --  Tolerance on error below 
+    double error_tol;    /* --  Tolerance on error below
                                 which tgo=0 */
     Regula_Falsi mode;   /* --  Operating mode for regula falsi */
     Regula_Falsi function_slope;  /* --  Operating mode for regula falsi */
diff --git a/include/trick/release.h b/include/trick/release.h
index 9521fcd3..85b0383c 100644
--- a/include/trick/release.h
+++ b/include/trick/release.h
@@ -3,7 +3,7 @@ PURPOSE:
     (This header file defines the "RELEASE()" macro for supported platforms.
      The release function should yield the processor from the processes that
      makes the call. This allows the UNIX schedular to arbitrate process
-     priorities during spinloops based on the status of processes waiting 
+     priorities during spinloops based on the status of processes waiting
      to run)
 PROGRAMMER:
     (((Eddie J. Paddock ) (LinCom) (2/96) (--) (Realtime))
@@ -13,7 +13,7 @@ PROGRAMMER:
 #ifndef RELEASE_H
 #define RELEASE_H
 
-#if __sgi 
+#if __sgi
 
 #define RELEASE() sginap(0)
 #define RELEASE_1() sginap(1)
diff --git a/include/trick/sim_mode.h b/include/trick/sim_mode.h
index 258e35c9..e8ca159e 100644
--- a/include/trick/sim_mode.h
+++ b/include/trick/sim_mode.h
@@ -1,5 +1,5 @@
 /*
-PURPOSE: 
+PURPOSE:
     (For master/slave sim, this is slave info)
 PROGRAMMERS:
     (((Eddie J. Paddock) (LinCom) (April 1996) (--) (Initial Version))
diff --git a/include/trick/sizedata.h b/include/trick/sizedata.h
index 3ba6e20e..2c49ac0e 100644
--- a/include/trick/sizedata.h
+++ b/include/trick/sizedata.h
@@ -1,6 +1,6 @@
 /* This is an attempt at keeping data sizes consistent across machines
-by defining a INT8,INT16, and INT32 type for use as 8,16,and 32 bit 
-integers.  These won't work well with i/o like printf, but are useful 
+by defining a INT8,INT16, and INT32 type for use as 8,16,and 32 bit
+integers.  These won't work well with i/o like printf, but are useful
 for transfering binary data from one machine to another. */
 
 #ifndef SIZEDATA_H
diff --git a/include/trick/swig/swig_macros.hh b/include/trick/swig/swig_macros.hh
index af802be7..9c54aec7 100644
--- a/include/trick/swig/swig_macros.hh
+++ b/include/trick/swig/swig_macros.hh
@@ -6,27 +6,27 @@
 #define __attribute__(x)
 #endif
 
-#ifndef SWIG_as_voidptr 
-#define SWIG_as_voidptr(a) const_cast< void * >(static_cast< const void * >(a)) 
+#ifndef SWIG_as_voidptr
+#define SWIG_as_voidptr(a) const_cast< void * >(static_cast< const void * >(a))
 #endif
 
-#ifndef SWIG_as_voidptrptr 
-#define SWIG_as_voidptrptr(a) ((void)SWIG_as_voidptr(*a),reinterpret_cast< void** >(a)) 
+#ifndef SWIG_as_voidptrptr
+#define SWIG_as_voidptrptr(a) ((void)SWIG_as_voidptr(*a),reinterpret_cast< void** >(a))
 #endif
 
 #ifndef SWIG_IsOK
 #define SWIG_IsOK(r)               (r >= 0)
 #endif
 
-#ifndef SWIG_Error 
+#ifndef SWIG_Error
 #define SWIG_Error(code, msg) std::cout<<"SWIG_Error(errorcode, "<<msg<<")"<<std::endl
 #endif
 
-#ifndef SWIG_exception_fail 
-#define SWIG_exception_fail(code, msg) std::cout<<"SWIG_exception_fail(errorcode, "<<msg<<")"<<std::endl 
+#ifndef SWIG_exception_fail
+#define SWIG_exception_fail(code, msg) std::cout<<"SWIG_exception_fail(errorcode, "<<msg<<")"<<std::endl
 #endif
 
-#ifndef Py_RETURN_TRUE 
+#ifndef Py_RETURN_TRUE
 #define Py_RETURN_TRUE return Py_INCREF(Py_True), Py_True
 #endif
 
@@ -34,6 +34,6 @@
 #define Py_RETURN_FALSE return Py_INCREF(Py_False), Py_False
 #endif
 
-#ifndef Py_RETURN_NONE 
+#ifndef Py_RETURN_NONE
 #define Py_RETURN_NONE return Py_INCREF(Py_None), Py_None
 #endif
diff --git a/include/trick/tc.h b/include/trick/tc.h
index e95a7307..012c32db 100644
--- a/include/trick/tc.h
+++ b/include/trick/tc.h
@@ -103,7 +103,7 @@ typedef enum {
     TC_COMM_ENABLED = 1     /* -- Enabled flag value  */
 } TCCommFlag;
 
-/* 
+/*
  * WARNING : These flags are the reverse logic of BLOCKIO and NOBLOCKIO.
  *           This is so that if a user does not set the blockio_flag
  *          in a device, the device will default to blocking
@@ -112,7 +112,7 @@ typedef enum {
     TC_COMM_BLOCKIO = 0,        /* -- Set blocking I/O     */
     TC_COMM_NOBLOCKIO = 1,      /* -- Set non-blocking I/O */
     TC_COMM_TIMED_BLOCKIO = 2,  /* -- Set timed software block_io */
-    TC_COMM_ALL_OR_NOTHING = 3  /* -- Set non-blocking to 
+    TC_COMM_ALL_OR_NOTHING = 3  /* -- Set non-blocking to
                                           all or nothing */
 } TCCommBlocking;
 
@@ -147,7 +147,7 @@ typedef struct {
     char addr[40];                  /* ** address of connection */
     int port;                       /* ** port of connection */
     int pid;                        /* ** pid of connection */
-    int conn_initiated;             /* ** Return flag to initiate 
+    int conn_initiated;             /* ** Return flag to initiate
                                           connection */
     int disabled;                   /* ** 0=Communication enabled
                                           1=device disabled */
diff --git a/include/trick/tc_proto.h b/include/trick/tc_proto.h
index d1c59ecf..60abf039 100644
--- a/include/trick/tc_proto.h
+++ b/include/trick/tc_proto.h
@@ -55,8 +55,8 @@ int tc_blockio(TCDevice * device, TCCommBlocking blockflag);
 /* Check to see if a connection is valid */
 int tc_isValid(TCDevice * device);
 
-/* Set the time in secs that a blocking read 
- * will wait before timing out 
+/* Set the time in secs that a blocking read
+ * will wait before timing out
  */
 int tc_set_blockio_timeout_limit(TCDevice * device, double limit);
 
diff --git a/include/trick/trick_error_hndlr.h b/include/trick/trick_error_hndlr.h
index 5c24078e..0c4a8102 100644
--- a/include/trick/trick_error_hndlr.h
+++ b/include/trick/trick_error_hndlr.h
@@ -24,23 +24,23 @@ extern "C" {
 
 typedef enum {
     TRICK_ERROR_ALL = 0,      /* -- No error: Report everything. */
-    TRICK_ERROR_TRIVIAL = 1,  /* -- Trivial level: 
+    TRICK_ERROR_TRIVIAL = 1,  /* -- Trivial level:
                                     Informational: can ignore  */
-    TRICK_ERROR_ADVISORY = 2, /* -- Advisory level: 
+    TRICK_ERROR_ADVISORY = 2, /* -- Advisory level:
                                     Can probably ignore these  */
 
-    TRICK_ERROR_CAUTION = 3,  /* -- Caution level: 
+    TRICK_ERROR_CAUTION = 3,  /* -- Caution level:
                                     May not want to ignore these */
-    TRICK_ERROR_WARNING = 4,  /* -- Warning level: 
+    TRICK_ERROR_WARNING = 4,  /* -- Warning level:
                                     Should probably not ignore */
-    TRICK_ERROR_ALERT = 5,    /* -- Alert level: 
-                                    Should be corrected, 
+    TRICK_ERROR_ALERT = 5,    /* -- Alert level:
+                                    Should be corrected,
                                     may not recover */
-    TRICK_ERROR_FATAL = 6,  /* -- Fatal level: 
+    TRICK_ERROR_FATAL = 6,  /* -- Fatal level:
                                   Must be corrected, no recovery */
-    TRICK_ERROR_ABORT = 7,  /* -- Abort level: 
+    TRICK_ERROR_ABORT = 7,  /* -- Abort level:
                                   Things are too bad, just abort */
-    TRICK_ERROR_SILENT = 8  /* -- Silent: Do not report 
+    TRICK_ERROR_SILENT = 8  /* -- Silent: Do not report
                                       any error of any kind */
 } TrickErrorLevel;
 
@@ -69,7 +69,7 @@ typedef struct _TrickErrorHndlr {
 
 
 /* Define error object access functions */
-void trick_error_func_default( 
+void trick_error_func_default(
         TrickErrorHndlr * error_hndlr, /* IN: -- Error object */
         TrickErrorLevel level,         /* IN: -- Error level */
         char *file,        /* IN: -- File in which error ocurred */
@@ -99,9 +99,9 @@ void trick_error_set_report_level(
 
 void trick_error_set_stream(
         TrickErrorHndlr * error_hndlr, /* INOUT: -- Err handler data */
-        TrickErrorLevel level,         /* IN: -- Err reporting level 
+        TrickErrorLevel level,         /* IN: -- Err reporting level
                                                  stream to set. */
-        FILE * stream);                /* IN: -- Err stream for 
+        FILE * stream);                /* IN: -- Err stream for
                                                  reporting level. */
 
 void trick_error_set_all_streams(
@@ -114,14 +114,14 @@ void trick_error_copy_streams(
 
 void trick_error_set_send_hs_flag(
         TrickErrorHndlr * error_hndlr, /* INOUT: -- Err handler data */
-        TrickErrorLevel level,         /* IN: -- Error reporting level 
+        TrickErrorLevel level,         /* IN: -- Error reporting level
                                                  stream to set. */
         int use_send_hs);              /* IN: -- 1=use send_hs;
                                                  else use fprintf */
 
 void trick_error_set_all_send_hs_flags(
         TrickErrorHndlr * error_hndlr,  /* INOUT: -- Err handler data */
-        int use_send_hs);               /* IN: -- 1= use send_hs; 
+        int use_send_hs);               /* IN: -- 1= use send_hs;
                                                   else use fprintf */
 
 void trick_error_copy_send_hs_flags(
@@ -139,7 +139,7 @@ TrickErrorLevel trick_error_get_report_level(
 
 FILE *trick_error_get_stream(
         TrickErrorHndlr * error_hndlr,  /* INOUT: -- Error hdler data */
-        TrickErrorLevel level);         /* IN: -- Error reporting 
+        TrickErrorLevel level);         /* IN: -- Error reporting
                                                   level stream to get */
 
 FILE *trick_error_get_curr_stream(
@@ -147,15 +147,15 @@ FILE *trick_error_get_curr_stream(
 
 int trick_error_get_send_hs_flag(
         TrickErrorHndlr * error_hndlr,  /* INOUT: -- Err hdler data */
-        TrickErrorLevel level);         /* IN: -- Err report level 
+        TrickErrorLevel level);         /* IN: -- Err report level
                                                   stream to get. */
 
 int trick_error_get_curr_send_hs_flag(
         TrickErrorHndlr * error_hndlr); /* INOUT: -- Err hdler data */
 
-void trick_error_report(        
+void trick_error_report(
         TrickErrorHndlr * error_hndlr, /* IN: -- Error object */
-        TrickErrorLevel error_level,   /* IN: -- Err level for 
+        TrickErrorLevel error_level,   /* IN: -- Err level for
                                                  this error */
         const char *file,              /* IN: -- File in which error_ occured */
         int line,                      /* IN: -- Line number where error_ occured */
diff --git a/include/trick/trick_math_error.h b/include/trick/trick_math_error.h
index a18fb87c..be97db3e 100644
--- a/include/trick/trick_math_error.h
+++ b/include/trick/trick_math_error.h
@@ -1,6 +1,6 @@
 
 /*
-PURPOSE: (Define the Error conditions and error messages for the 
+PURPOSE: (Define the Error conditions and error messages for the
           trick math routines)
 PROGRAMMERS: (((Alex Lin) (NASA) (8/02) () (--)))
 */
diff --git a/include/trick/trick_math_proto.h b/include/trick/trick_math_proto.h
index dc4ef109..0d3ac50e 100644
--- a/include/trick/trick_math_proto.h
+++ b/include/trick/trick_math_proto.h
@@ -33,7 +33,7 @@ int LUT_inv(double **y, double **a, int n);
 
 /**
 * @ingroup TRICK_MATH
-* 
+*
 */
 void LU_bksb(double *b, double **a, int n, int *indx);
 
@@ -253,7 +253,7 @@ void dmxv(double prod[], double mat[3][3], double vect[]);
 
 /**
  * @ingroup TRICK_MATH
- * 
+ *
  */
 double drandom_gaussian(double std_deviation, int range);
 
@@ -571,7 +571,7 @@ double gauss_rnd_bell(RAND_GENERATOR * G);
          euler312( ang, mat, method, prev, __FILE__, __LINE__ )
 #define euler_321( ang, mat, method, prev ) \
          euler321( ang, mat, method, prev, __FILE__, __LINE__ )
-	 
+
 #define deuler_123_quat( ang, quat, method ) \
           euler123_quat( ang, quat, method, (double*)0 )
 #define deuler_132_quat( ang, quat, method ) \
@@ -584,5 +584,5 @@ double gauss_rnd_bell(RAND_GENERATOR * G);
           euler312_quat( ang, quat, method, (double*)0 )
 #define deuler_321_quat( ang, quat, method ) \
           euler321_quat( ang, quat, method, (double*)0 )
-	  	 	 
+
 #endif
diff --git a/include/trick/units_conv.h b/include/trick/units_conv.h
index 87ae6683..e348d9eb 100644
--- a/include/trick/units_conv.h
+++ b/include/trick/units_conv.h
@@ -71,7 +71,7 @@ typedef struct {
 
 /**
  * @ingroup UNITS_C_INTF
- * Allocate and initialize a new Units_t according to the given units specifier. 
+ * Allocate and initialize a new Units_t according to the given units specifier.
  */
 Units_t *new_units (const char *units_s);
 
@@ -85,7 +85,7 @@ Conv_Status_t conv_fn_u(const Units_t *f_units,     /* IN  */
 
 /**
  * @ingroup UNITS_C_INTF
- * Create a conversion object (UnitsConvFn_t) that converts from f_units to t_units. 
+ * Create a conversion object (UnitsConvFn_t) that converts from f_units to t_units.
  */
 Conv_Status_t conv_fn_s(const char    *f_units_s,   /* IN  */
                         const char    *t_units_s,   /* IN  */
diff --git a/include/trick/unix_commands.h b/include/trick/unix_commands.h
index c26d4654..530e4ef4 100644
--- a/include/trick/unix_commands.h
+++ b/include/trick/unix_commands.h
@@ -6,7 +6,7 @@
 #ifndef _UNIX_COMMANDS
 #define _UNIX_COMMANDS
 
-#if __sgi 
+#if __sgi
 #define unix_ssh "/usr/freeware/bin/ssh"
 #define unix_rsh "/usr/bsd/rsh"
 #elif __sun
diff --git a/include/trick/value.h b/include/trick/value.h
index da654dfa..4891fbec 100644
--- a/include/trick/value.h
+++ b/include/trick/value.h
@@ -62,12 +62,12 @@ typedef struct {
  it may represent data array of up to 8 dimensions.
  @dot
  digraph V_TREE {
-    { node 
+    { node
         [ shape = plaintext,
           label = "V_TREE*\n(to initialize a \[3\]\[2\] array )"]
         p
     }
-    { node 
+    { node
         [shape = record, label="{V_TREE|{<f0>data|<f1>down|<f2>next}}" ]
         n0 n1 n2
         n00 n01 n10 n11 n20 n21
diff --git a/include/trick/variable_server.h b/include/trick/variable_server.h
index 813c2477..163b2d3e 100644
--- a/include/trick/variable_server.h
+++ b/include/trick/variable_server.h
@@ -20,7 +20,7 @@ extern "C" {
 typedef struct {
     REF2 ref;
     double scale_factor;
-    double bias;  
+    double bias;
 } VARIABLE_NODE;
 
 typedef struct {
diff --git a/include/trick/vector_macros.h b/include/trick/vector_macros.h
index 2505164c..97de9df7 100644
--- a/include/trick/vector_macros.h
+++ b/include/trick/vector_macros.h
@@ -131,7 +131,7 @@ p_i = v_i \cdot S: i \in 0..2
 An expression of type double, which represents the scalar magnitude of
 the vector V.
 \f[
-\left | V \right | \equiv \sqrt{ \sum_{i=0}^{2}v_{i}^2 } 
+\left | V \right | \equiv \sqrt{ \sum_{i=0}^{2}v_{i}^2 }
 \f]
 */
 #define V_MAG( vect ) \
@@ -169,8 +169,8 @@ storing it in the matrix skew ( double[3][3] ).
 \f[
 SKEW =
 \begin{bmatrix}
-   0 & -v_2 &  v_1 \\ 
- v_2 &    0 & -v_0 \\ 
+   0 & -v_2 &  v_1 \\
+ v_2 &    0 & -v_0 \\
 -v_1 &  v_0 &  0
 \end{bmatrix}
 \f]
@@ -187,8 +187,8 @@ SKEW =
 \b V_DOT(A, B)
 
 An expression returning type double, which represents the
-dot product (scalar product) of A and B.  
-It is equivalent to: 
+dot product (scalar product) of A and B.
+It is equivalent to:
 \f[
 \sum_{i=0}^{2} a_i \cdot b_i
 \f]
@@ -224,9 +224,9 @@ outer_{i,j} = v_i \cdot v_j: i,j \in 0..2
 \b V_CROSS(CROSS, A, B )
 
 Assign cross product of vectors A and B to vector CROSS.
-This is equivalent to: 
+This is equivalent to:
 \f[
-CROSS =  
+CROSS =
 \left \langle
 \left ( a_1 \cdot b_2 - a_2 \cdot b_1 \right ),
 \left ( a_2 \cdot b_0 - a_0 \cdot b_2 \right ),
@@ -246,7 +246,7 @@ CROSS =
 \b VxV_ADD(C, A, B)
 
 \f[
-C = C + A * B 
+C = C + A * B
 \f]
 */
 #define VxV_ADD( sum, vect1, vect2 ) { \
@@ -260,7 +260,7 @@ C = C + A * B
 \b VxV_SUB(C , A, B )
 
 \f[
-C = C - A * B 
+C = C - A * B
 \f]
 */
 #define VxV_SUB( diff , vect1, vect2 ) { \
@@ -342,7 +342,7 @@ S=S+I
 @page VECTOR_MACROS
 \b V_NEGATE(D, S)
 
-Assign the negative of vector S to the vector D. 
+Assign the negative of vector S to the vector D.
 \f[
 D=-S
 \f]
diff --git a/include/trick/wave_form.h b/include/trick/wave_form.h
index 6742b4e9..6542ed44 100644
--- a/include/trick/wave_form.h
+++ b/include/trick/wave_form.h
@@ -49,44 +49,44 @@ typedef struct {
     Wave_Form type; /* -- Type of wave form */
     double start;   /* s  Start time for wave */
     double stop;    /* s  Stop time for wave */
-    double ramp;    /* s  Time to ramp wave output from 0 to 1 
+    double ramp;    /* s  Time to ramp wave output from 0 to 1
                           and 1 to 0 */
-    double pause;   /* s  Pause time between end of first doublet 
+    double pause;   /* s  Pause time between end of first doublet
                           pulse and start of second doublet pulse */
     double frequency; /* (1/s) Frequency of oscillating waves */
-    double phase;     /* (rad)  Phase offset for start of 
+    double phase;     /* (rad)  Phase offset for start of
                             oscillating waves */
 
-    /* 
-     * Uniform and gaussian random noise generator data 
+    /*
+     * Uniform and gaussian random noise generator data
      */
-    int init_random;           /* -- Yes = Initialize random 
+    int init_random;           /* -- Yes = Initialize random
                                            number generator */
-    unsigned long random_seed; /* -- Seed for random noise 
+    unsigned long random_seed; /* -- Seed for random noise
                                      generator */
 
-    /* 
-     * Gaussian random noise generator data 
+    /*
+     * Gaussian random noise generator data
      */
-    int sigma_range;        /* -- Range of output in standard 
+    int sigma_range;        /* -- Range of output in standard
                                   deviations,
                                   3 = 3sigma, 6 = 6sigma, etc. */
 
-    /* 
-     * User defined wave data 
+    /*
+     * User defined wave data
      */
-    int init_user_data;     /* -- Yes = Open user defined wave 
+    int init_user_data;     /* -- Yes = Open user defined wave
                                   form data file */
-    char *user_data;        /* -- File name for user defined 
+    char *user_data;        /* -- File name for user defined
                                   wave form */
-    FILE *fp;               /* -- File pointer for user 
+    FILE *fp;               /* -- File pointer for user
                                   defined wave form */
     double next_time;       /* s  Next user time from user_data */
-    double next_val;        /* -- Next user wave value from 
+    double next_val;        /* -- Next user wave value from
                                   user_data */
-    double user_time;       /* s  Current user time from 
+    double user_time;       /* s  Current user time from
                                   user_data */
-    double user_val;        /* -- Current user wave value from 
+    double user_val;        /* -- Current user wave value from
                                   user_data */
 
 } WAVE_FORM;
diff --git a/test/SIM_stls/models/STLCheckpoint.hh b/test/SIM_stls/models/STLCheckpoint.hh
index 98db5205..aca8de93 100644
--- a/test/SIM_stls/models/STLCheckpoint.hh
+++ b/test/SIM_stls/models/STLCheckpoint.hh
@@ -1,5 +1,5 @@
 /*
-    PURPOSE: (Illustrate how to checkpoint STLs) 
+    PURPOSE: (Illustrate how to checkpoint STLs)
     LIBRARY_DEPENDENCIES: (
       (STLCheckpoint.o)
     )
@@ -21,7 +21,7 @@
 class STLCheckpoint {
 
     public:
-    
+
         STLCheckpoint() ;
         STLCheckpoint(std::string in_name) ;
         int speak() ;
diff --git a/test/SIM_test_dp/models/dp/include/dp.h b/test/SIM_test_dp/models/dp/include/dp.h
index 4aa287ba..ca8267fe 100644
--- a/test/SIM_test_dp/models/dp/include/dp.h
+++ b/test/SIM_test_dp/models/dp/include/dp.h
@@ -1,7 +1,7 @@
 /********************************* TRICK HEADER *******************************
-PURPOSE:                     ( Data products test ) 
+PURPOSE:                     ( Data products test )
 REFERENCES:                  ( None )
-ASSUMPTIONS AND LIMITATIONS: ( None ) 
+ASSUMPTIONS AND LIMITATIONS: ( None )
 PROGRAMMERS:                 ( (Keith Vetter) (Titan) (8-20-2002) )
 *******************************************************************************/
 
@@ -10,7 +10,7 @@ PROGRAMMERS:                 ( (Keith Vetter) (Titan) (8-20-2002) )
 
 typedef struct {
 
-   short          si[3] ;   /*  ohm -- */ 
+   short          si[3] ;   /*  ohm -- */
    int             i[3] ;   /*  m -- */
    long            l[3] ;   /*  amp -- */
    float           f[3] ;   /*  m/s2 -- */
@@ -29,10 +29,10 @@ typedef struct {
 } STRUCT_2 ;
 
 typedef struct {
- 
+
    STRUCT_2 s2[3][2] ;      /* -- */
 
-} STRUCT_3 ; 
+} STRUCT_3 ;
 
 typedef struct {
 
diff --git a/test/SIM_test_dp/models/dp/src/dp.c b/test/SIM_test_dp/models/dp/src/dp.c
index ef66c608..2a27a620 100644
--- a/test/SIM_test_dp/models/dp/src/dp.c
+++ b/test/SIM_test_dp/models/dp/src/dp.c
@@ -1,6 +1,6 @@
 /********************************* TRICK HEADER *******************************
 PURPOSE:                     ( Test data products )
-REFERENCE:                   ( None ) 
+REFERENCE:                   ( None )
 ASSUMPTIONS AND LIMITATIONS: ( None )
 CLASS:                       ( scheduled )
 LIBRARY DEPENDENCY:          ( dp.o )
@@ -28,14 +28,14 @@ int dp(
 
    int i,j,k,l,m,n ;
 
-   LOOP DP->s3[n].s2[m][l].s1[k][j].si[i]  = (short)          (i+1) ;  
-   LOOP DP->s3[n].s2[m][l].s1[k][j].i[i]   = (int)            (i+1) ;  
-   LOOP DP->s3[n].s2[m][l].s1[k][j].l[i]   = (long)           (i+1) ;  
-   LOOP DP->s3[n].s2[m][l].s1[k][j].f[i]   = (float)          (i+1) ;  
-   LOOP DP->s3[n].s2[m][l].s1[k][j].d[i]   = (double)         (i+1) ;  
-   LOOP DP->s3[n].s2[m][l].s1[k][j].us[i]  = (unsigned short) (i+1) ;  
-   LOOP DP->s3[n].s2[m][l].s1[k][j].ui[i]  = (unsigned int)   (i+1) ;  
-   LOOP DP->s3[n].s2[m][l].s1[k][j].ul[i]  = (unsigned long)  (i+1) ;  
+   LOOP DP->s3[n].s2[m][l].s1[k][j].si[i]  = (short)          (i+1) ;
+   LOOP DP->s3[n].s2[m][l].s1[k][j].i[i]   = (int)            (i+1) ;
+   LOOP DP->s3[n].s2[m][l].s1[k][j].l[i]   = (long)           (i+1) ;
+   LOOP DP->s3[n].s2[m][l].s1[k][j].f[i]   = (float)          (i+1) ;
+   LOOP DP->s3[n].s2[m][l].s1[k][j].d[i]   = (double)         (i+1) ;
+   LOOP DP->s3[n].s2[m][l].s1[k][j].us[i]  = (unsigned short) (i+1) ;
+   LOOP DP->s3[n].s2[m][l].s1[k][j].ui[i]  = (unsigned int)   (i+1) ;
+   LOOP DP->s3[n].s2[m][l].s1[k][j].ul[i]  = (unsigned long)  (i+1) ;
    LOOP DP->s3[n].s2[m][l].s1[k][j].ll[i]  = (long long)      (i+1) ;
 
    /* LOOP printf("\"dp.test.s3[%d].s2[%d][%d].s1[%d][%d].d[%d]\" ,\n",
diff --git a/test/SIM_test_dr/models/dr/include/DR.hh b/test/SIM_test_dr/models/dr/include/DR.hh
index 34f31320..0afebe8c 100644
--- a/test/SIM_test_dr/models/dr/include/DR.hh
+++ b/test/SIM_test_dr/models/dr/include/DR.hh
@@ -1,7 +1,7 @@
 /********************************* TRICK HEADER *******************************
-*	PURPOSE:                     ( Data record test ) 
+*	PURPOSE:                     ( Data record test )
 *	REFERENCES:                  ( None )
-*	ASSUMPTIONS AND LIMITATIONS: ( None ) 
+*	ASSUMPTIONS AND LIMITATIONS: ( None )
 *	PROGRAMMERS:                 ( (Lindsay Landry) (L3) (7-22-2013) )
 ********************************************************************************/
 #include <wchar.h>
@@ -20,32 +20,32 @@ typedef enum {
 
 typedef struct {
     unsigned int var1 :14;
-    unsigned int var2 :5; 
+    unsigned int var2 :5;
     unsigned int var3 :12;
-    unsigned int var4 :1; 
+    unsigned int var4 :1;
 } UINT_BITS;
-   
+
 typedef struct {
-    int var1 :7; 
+    int var1 :7;
     int var2 :16;
-    int var3 :3; 
-    int var4 :6; 
+    int var3 :3;
+    int var4 :6;
 } INT_BITS;
-    
+
 typedef struct {
-    unsigned char var1 :3; 
-    unsigned char var2 :2; 
-    unsigned char var3 :2; 
-    unsigned char var4 :1; 
+    unsigned char var1 :3;
+    unsigned char var2 :2;
+    unsigned char var3 :2;
+    unsigned char var4 :1;
 } UCHAR_BITS;
-    
+
 typedef struct {
-    char var1 :2; 
-    char var2 :2; 
-    char var3 :2; 
-    char var4 :2; 
+    char var1 :2;
+    char var2 :2;
+    char var3 :2;
+    char var4 :2;
 } CHAR_BITS;
-  
+
 typedef struct {
     unsigned short var1 :4;
     unsigned short var2 :2;
@@ -70,7 +70,7 @@ typedef struct {
 } MIX_BITS;
 
 
-class DRTypes { 
+class DRTypes {
 	public:
 
 		char 				a;
@@ -103,7 +103,7 @@ class DRTypes {
 		int init();
 
 	private:
-		void bitfieldInit(int bitSizes[], bool sign);	
+		void bitfieldInit(int bitSizes[], bool sign);
 };
 
 #endif
diff --git a/test/SIM_test_dr/models/dr/src/DR.cpp b/test/SIM_test_dr/models/dr/src/DR.cpp
index 2d403d30..0a68d726 100644
--- a/test/SIM_test_dr/models/dr/src/DR.cpp
+++ b/test/SIM_test_dr/models/dr/src/DR.cpp
@@ -1,6 +1,6 @@
 /******************************TRICK HEADER*************************************
 PURPOSE:                     ( Test data record )
-REFERENCE:                   ( None ) 
+REFERENCE:                   ( None )
 ASSUMPTIONS AND LIMITATIONS: ( None )
 CLASS:                       ( scheduled )
 LIBRARY DEPENDENCY:          ( DR.o )
diff --git a/test/SIM_test_dr/models/dr/src/DR_default_data.cpp b/test/SIM_test_dr/models/dr/src/DR_default_data.cpp
index 1ed68b6b..77586c42 100644
--- a/test/SIM_test_dr/models/dr/src/DR_default_data.cpp
+++ b/test/SIM_test_dr/models/dr/src/DR_default_data.cpp
@@ -1,6 +1,6 @@
 /******************************TRICK HEADER*************************************
 PURPOSE:                     ( Test data record )
-REFERENCE:                   ( None ) 
+REFERENCE:                   ( None )
 ASSUMPTIONS AND LIMITATIONS: ( None )
 CLASS:                       ( scheduled )
 LIBRARY DEPENDENCY:          ( DR.o )
diff --git a/test/SIM_test_ip/models/test_ip/include/ClassOfEverything.hh b/test/SIM_test_ip/models/test_ip/include/ClassOfEverything.hh
index 60f062b4..704c1d59 100644
--- a/test/SIM_test_ip/models/test_ip/include/ClassOfEverything.hh
+++ b/test/SIM_test_ip/models/test_ip/include/ClassOfEverything.hh
@@ -65,7 +65,7 @@ typedef const struct ConstStruct_ {
 } ConstStruct ;
 #endif
 
-class AlsoCannotCopy { 
+class AlsoCannotCopy {
    friend class InputProcessor ;
    friend void init_attrClassOfEverything() ;
 
@@ -140,7 +140,7 @@ class TTT {
 } ;
 
 //typedef TTT< int , double > my_TTT_int_double ;
-    
+
 #define NUM 8
 
 typedef union {
diff --git a/test/SIM_test_sched/models/sched/src/sched_amf.c b/test/SIM_test_sched/models/sched/src/sched_amf.c
index 897837d3..8b5ba8f6 100644
--- a/test/SIM_test_sched/models/sched/src/sched_amf.c
+++ b/test/SIM_test_sched/models/sched/src/sched_amf.c
@@ -1,6 +1,6 @@
 /********************************* TRICK HEADER *******************************
 PURPOSE:                     ( Test scheduling )
-REFERENCE:                   ( None ) 
+REFERENCE:                   ( None )
 ASSUMPTIONS AND LIMITATIONS: ( None )
 CLASS:                       ( asynchronous_mustfinish )
 LIBRARY DEPENDENCY:          ( sched_amf.o )
@@ -23,7 +23,7 @@ int sched_amf(
       sprintf(test, "Test %d", i);
       add_test_result("sched_amf: Things are in order", test, "");
       i++;
-      S->amf = 1 ; 
+      S->amf = 1 ;
    } else {
       /* Things are out of order */
       sprintf(test, "Test %d", i);
diff --git a/test/SIM_test_sched/models/sched/src/sched_async.c b/test/SIM_test_sched/models/sched/src/sched_async.c
index 9facbf6a..a8eae53e 100644
--- a/test/SIM_test_sched/models/sched/src/sched_async.c
+++ b/test/SIM_test_sched/models/sched/src/sched_async.c
@@ -1,6 +1,6 @@
 /********************************* TRICK HEADER *******************************
 PURPOSE:                     ( Test scheduling )
-REFERENCE:                   ( None ) 
+REFERENCE:                   ( None )
 ASSUMPTIONS AND LIMITATIONS: ( None )
 CLASS:                       ( asynchronous )
 LIBRARY DEPENDENCY:          ( sched_async.o )
diff --git a/test/SIM_test_sched/models/sched/src/sched_default_data.c b/test/SIM_test_sched/models/sched/src/sched_default_data.c
index 1244d25e..e584757b 100644
--- a/test/SIM_test_sched/models/sched/src/sched_default_data.c
+++ b/test/SIM_test_sched/models/sched/src/sched_default_data.c
@@ -11,7 +11,7 @@ PROGRAMMERS:                 ((vetter) (Tue Aug 26 13:22:44 CDT 2003))
 
 /* RETURN: -- Always return zero */
 /* INOUT:  -- Parameter */
-int sched_default_data(SCHEDULE *S) 
+int sched_default_data(SCHEDULE *S)
 {
 #define BIG_TGO 10000
 #define No 0
@@ -35,5 +35,5 @@ int sched_default_data(SCHEDULE *S)
     S->rf.error_tol  = 1.0e-6 ;
     S->rf.mode       = Increasing ;
 
-    return(0) ; 
+    return(0) ;
 }
diff --git a/test/SIM_test_sched/models/sched/src/sched_effector.c b/test/SIM_test_sched/models/sched/src/sched_effector.c
index ea00a3f6..eb7615d6 100644
--- a/test/SIM_test_sched/models/sched/src/sched_effector.c
+++ b/test/SIM_test_sched/models/sched/src/sched_effector.c
@@ -1,6 +1,6 @@
 /********************************* TRICK HEADER *******************************
 PURPOSE:                     ( Test scheduling )
-REFERENCE:                   ( None ) 
+REFERENCE:                   ( None )
 ASSUMPTIONS AND LIMITATIONS: ( None )
 CLASS:                       ( effector )
 LIBRARY DEPENDENCY:          ( sched_effector.o )
diff --git a/test/SIM_test_sched/models/sched/src/sched_effector_emitter.c b/test/SIM_test_sched/models/sched/src/sched_effector_emitter.c
index 6bab8dd2..9bda7998 100644
--- a/test/SIM_test_sched/models/sched/src/sched_effector_emitter.c
+++ b/test/SIM_test_sched/models/sched/src/sched_effector_emitter.c
@@ -1,6 +1,6 @@
 /********************************* TRICK HEADER *******************************
 PURPOSE:                     ( Test scheduling )
-REFERENCE:                   ( None ) 
+REFERENCE:                   ( None )
 ASSUMPTIONS AND LIMITATIONS: ( None )
 CLASS:                       ( effector_emitter )
 LIBRARY DEPENDENCY:          ( sched_effector_emitter.o )
diff --git a/test/SIM_test_sched/models/sched/src/sched_effector_receiver.c b/test/SIM_test_sched/models/sched/src/sched_effector_receiver.c
index 2d1364e8..0ef0b7ba 100644
--- a/test/SIM_test_sched/models/sched/src/sched_effector_receiver.c
+++ b/test/SIM_test_sched/models/sched/src/sched_effector_receiver.c
@@ -1,6 +1,6 @@
 /********************************* TRICK HEADER *******************************
 PURPOSE:                     ( Test scheduling )
-REFERENCE:                   ( None ) 
+REFERENCE:                   ( None )
 ASSUMPTIONS AND LIMITATIONS: ( None )
 CLASS:                       ( effector_receiver )
 LIBRARY DEPENDENCY:          ( sched_effector_receiver.o )
diff --git a/test/SIM_test_sched/models/sched/src/sched_init.c b/test/SIM_test_sched/models/sched/src/sched_init.c
index c67751b3..e5856a7b 100644
--- a/test/SIM_test_sched/models/sched/src/sched_init.c
+++ b/test/SIM_test_sched/models/sched/src/sched_init.c
@@ -15,5 +15,5 @@ int sched_init(
 
 {
        S->mass = S->mass*1.0000013 + 0.0000013 ; /* Massive masses */
-       return(0) ; 
+       return(0) ;
 }
diff --git a/test/SIM_test_sched/models/sched/src/sched_logging.c b/test/SIM_test_sched/models/sched/src/sched_logging.c
index 61a9557e..57c04ce8 100644
--- a/test/SIM_test_sched/models/sched/src/sched_logging.c
+++ b/test/SIM_test_sched/models/sched/src/sched_logging.c
@@ -1,6 +1,6 @@
 /********************************* TRICK HEADER *******************************
 PURPOSE:                     ( Test scheduling )
-REFERENCE:                   ( None ) 
+REFERENCE:                   ( None )
 ASSUMPTIONS AND LIMITATIONS: ( None )
 CLASS:                       ( logging )
 LIBRARY DEPENDENCY:          ( sched_logging.o )
diff --git a/test/SIM_test_sched/models/sched/src/sched_scheduled.c b/test/SIM_test_sched/models/sched/src/sched_scheduled.c
index 5506846a..5957b67b 100644
--- a/test/SIM_test_sched/models/sched/src/sched_scheduled.c
+++ b/test/SIM_test_sched/models/sched/src/sched_scheduled.c
@@ -1,6 +1,6 @@
 /********************************* TRICK HEADER *******************************
 PURPOSE:                     ( Test scheduling )
-REFERENCE:                   ( None ) 
+REFERENCE:                   ( None )
 ASSUMPTIONS AND LIMITATIONS: ( None )
 CLASS:                       ( scheduled )
 LIBRARY DEPENDENCY:          ( sched_scheduled.o )
diff --git a/test/SIM_test_sched/models/sched/src/sched_sensor.c b/test/SIM_test_sched/models/sched/src/sched_sensor.c
index d49ee353..f78d4fff 100644
--- a/test/SIM_test_sched/models/sched/src/sched_sensor.c
+++ b/test/SIM_test_sched/models/sched/src/sched_sensor.c
@@ -1,6 +1,6 @@
 /********************************* TRICK HEADER *******************************
 PURPOSE:                     ( Test scheduling )
-REFERENCE:                   ( None ) 
+REFERENCE:                   ( None )
 ASSUMPTIONS AND LIMITATIONS: ( None )
 CLASS:                       ( sensor )
 LIBRARY DEPENDENCY:          ( sched_sensor.o )
diff --git a/test/SIM_test_sched/models/sched/src/sched_sensor_emitter.c b/test/SIM_test_sched/models/sched/src/sched_sensor_emitter.c
index be225f84..ad3bd776 100644
--- a/test/SIM_test_sched/models/sched/src/sched_sensor_emitter.c
+++ b/test/SIM_test_sched/models/sched/src/sched_sensor_emitter.c
@@ -1,6 +1,6 @@
 /********************************* TRICK HEADER *******************************
 PURPOSE:                     ( Test scheduling )
-REFERENCE:                   ( None ) 
+REFERENCE:                   ( None )
 ASSUMPTIONS AND LIMITATIONS: ( None )
 CLASS:                       ( sensor_emitter )
 LIBRARY DEPENDENCY:          ( sched_sensor_emitter.o )
diff --git a/test/SIM_test_sched/models/sched/src/sched_sensor_receiver.c b/test/SIM_test_sched/models/sched/src/sched_sensor_receiver.c
index ab7cdcec..a9a33b41 100644
--- a/test/SIM_test_sched/models/sched/src/sched_sensor_receiver.c
+++ b/test/SIM_test_sched/models/sched/src/sched_sensor_receiver.c
@@ -1,6 +1,6 @@
 /********************************* TRICK HEADER *******************************
 PURPOSE:                     ( Test scheduling )
-REFERENCE:                   ( None ) 
+REFERENCE:                   ( None )
 ASSUMPTIONS AND LIMITATIONS: ( None )
 CLASS:                       ( sensor_receiver )
 LIBRARY DEPENDENCY:          ( sched_sensor_receiver.o )
diff --git a/test/SIM_test_sched/models/sched/src/sched_sensor_reflector.c b/test/SIM_test_sched/models/sched/src/sched_sensor_reflector.c
index 15ac22d2..b9803f32 100644
--- a/test/SIM_test_sched/models/sched/src/sched_sensor_reflector.c
+++ b/test/SIM_test_sched/models/sched/src/sched_sensor_reflector.c
@@ -1,6 +1,6 @@
 /********************************* TRICK HEADER *******************************
 PURPOSE:                     ( Test scheduling )
-REFERENCE:                   ( None ) 
+REFERENCE:                   ( None )
 ASSUMPTIONS AND LIMITATIONS: ( None )
 CLASS:                       ( sensor_reflector )
 LIBRARY DEPENDENCY:          ( sched_sensor_reflector.o )
diff --git a/test/SIM_test_varserv/models/varserv/include/VS.hh b/test/SIM_test_varserv/models/varserv/include/VS.hh
index cdb6faae..69d9654e 100644
--- a/test/SIM_test_varserv/models/varserv/include/VS.hh
+++ b/test/SIM_test_varserv/models/varserv/include/VS.hh
@@ -1,7 +1,7 @@
 /********************************* TRICK HEADER *******************************
-PURPOSE:                     ( Variable server test ) 
+PURPOSE:                     ( Variable server test )
 REFERENCES:                  ( None )
-ASSUMPTIONS AND LIMITATIONS: ( None ) 
+ASSUMPTIONS AND LIMITATIONS: ( None )
 PROGRAMMERS:                 ( (Lindsay Landry) (L3) (9-12-2013) )
 ********************************************************************************/
 #include <wchar.h>
@@ -11,7 +11,7 @@ PROGRAMMERS:                 ( (Lindsay Landry) (L3) (9-12-2013) )
 
 #ifndef VS_HH
 #define VS_HH
-class VSTest { 
+class VSTest {
 	public:
 
 		unsigned short port_num;
@@ -25,7 +25,7 @@ class VSTest {
 		unsigned char 		b;
 		short				c;
 		unsigned short  	d;
-		int 				e; /*  M xy-position */ 
+		int 				e; /*  M xy-position */
 		unsigned int 		f;
 		long				g;
 		unsigned long		h;
diff --git a/test/SIM_test_varserv/models/varserv/src/VS.cpp b/test/SIM_test_varserv/models/varserv/src/VS.cpp
index ec6ba7e5..b7b3cf72 100644
--- a/test/SIM_test_varserv/models/varserv/src/VS.cpp
+++ b/test/SIM_test_varserv/models/varserv/src/VS.cpp
@@ -1,6 +1,6 @@
 /******************************TRICK HEADER*************************************
 PURPOSE:                     ( Test variable server )
-REFERENCE:                   ( None ) 
+REFERENCE:                   ( None )
 ASSUMPTIONS AND LIMITATIONS: ( None )
 CLASS:                       ( scheduled )
 LIBRARY DEPENDENCY:          ( VS.o )
diff --git a/test/SIM_test_varserv/models/varserv/src/VS_default_data.cpp b/test/SIM_test_varserv/models/varserv/src/VS_default_data.cpp
index 76ff8aa5..09cd1244 100644
--- a/test/SIM_test_varserv/models/varserv/src/VS_default_data.cpp
+++ b/test/SIM_test_varserv/models/varserv/src/VS_default_data.cpp
@@ -1,6 +1,6 @@
 /******************************TRICK HEADER*************************************
 PURPOSE:                     ( Test variable server )
-REFERENCE:                   ( None ) 
+REFERENCE:                   ( None )
 ASSUMPTIONS AND LIMITATIONS: ( None )
 CLASS:                       ( scheduled )
 LIBRARY DEPENDENCY:          ( VS.o )
diff --git a/test/SIM_test_varserv/models/varserv/src/VS_init.cpp b/test/SIM_test_varserv/models/varserv/src/VS_init.cpp
index 08b763d2..94439ffb 100644
--- a/test/SIM_test_varserv/models/varserv/src/VS_init.cpp
+++ b/test/SIM_test_varserv/models/varserv/src/VS_init.cpp
@@ -1,6 +1,6 @@
 /******************************TRICK HEADER*************************************
 PURPOSE:                     ( Test variable server )
-REFERENCE:                   ( None ) 
+REFERENCE:                   ( None )
 ASSUMPTIONS AND LIMITATIONS: ( None )
 CLASS:                       ( scheduled )
 LIBRARY DEPENDENCY:          ( VS.o )
@@ -38,7 +38,7 @@ int VSTest::init() {
 	// default cycle rate
 	cycle_rate = 0.01;
 	sprintf(msg,"trick.var_cycle(%.2f)\n", cycle_rate);
-	vs_write(msg);	
+	vs_write(msg);
 
 	return (0);
 }
diff --git a/test/SIM_test_varserv/models/varserv/src/VS_shutdown.cpp b/test/SIM_test_varserv/models/varserv/src/VS_shutdown.cpp
index c1d68e15..f340c282 100644
--- a/test/SIM_test_varserv/models/varserv/src/VS_shutdown.cpp
+++ b/test/SIM_test_varserv/models/varserv/src/VS_shutdown.cpp
@@ -1,6 +1,6 @@
 /******************************TRICK HEADER*************************************
 PURPOSE:                     ( Test variable server )
-REFERENCE:                   ( None ) 
+REFERENCE:                   ( None )
 ASSUMPTIONS AND LIMITATIONS: ( None )
 CLASS:                       ( scheduled )
 LIBRARY DEPENDENCY:          ( VS.o )
@@ -10,8 +10,8 @@ PROGRAMMERS:                 ( (Lindsay Landry) (L3) (9-12-2013) )
 #include "../include/VS.hh"
 
 int VSTest::shutdown() {
-	
+
 	tc_disconnect(&bob);
-	
+
 	return(0);
 }
diff --git a/test/SIM_test_varserv/models/varserv/src/VS_tests.cpp b/test/SIM_test_varserv/models/varserv/src/VS_tests.cpp
index f83cdc03..9dffc393 100644
--- a/test/SIM_test_varserv/models/varserv/src/VS_tests.cpp
+++ b/test/SIM_test_varserv/models/varserv/src/VS_tests.cpp
@@ -1,6 +1,6 @@
 /******************************TRICK HEADER*************************************
 PURPOSE:                     ( Test variable server )
-REFERENCE:                   ( None ) 
+REFERENCE:                   ( None )
 ASSUMPTIONS AND LIMITATIONS: ( None )
 CLASS:                       ( scheduled )
 LIBRARY DEPENDENCY:          ( VS.o )
@@ -36,12 +36,12 @@ int VSTest::strcmp_IgnoringWhiteSpace(const char* s1, const char* s2) {
 
 // Expect cycle time of 0.01 s
 int VSTest::testCycle() {
-    char msg[256]; 
+    char msg[256];
     char suite[] = "VariableServerTest";
 /*
     int num, num2;
     double cpu_t, cpu_st;
-    struct rusage cpu_usg;    
+    struct rusage cpu_usg;
 
     sprintf(msg,"trick.var_add(\"vsx.vst.l\")\n");
     vs_write(msg);
@@ -49,7 +49,7 @@ int VSTest::testCycle() {
     // currently bad programming, could get stuck in this loop
     while (true) {
         getrusage(RUSAGE_SELF, &cpu_usg);
-        cpu_st = ((double) cpu_usg.ru_utime.tv_sec) + ((double) cpu_usg.ru_utime.tv_usec/1000000.0);  
+        cpu_st = ((double) cpu_usg.ru_utime.tv_sec) + ((double) cpu_usg.ru_utime.tv_usec/1000000.0);
 
         num = tc_pending(&bob);
         //first read.
@@ -60,15 +60,15 @@ int VSTest::testCycle() {
 
     while (true) {
         getrusage(RUSAGE_SELF, &cpu_usg);
-        cpu_t = ((double) cpu_usg.ru_utime.tv_sec) + ((double) cpu_usg.ru_utime.tv_usec/1000000.0);          
+        cpu_t = ((double) cpu_usg.ru_utime.tv_sec) + ((double) cpu_usg.ru_utime.tv_usec/1000000.0);
 
         num2 = tc_pending(&bob);
-       
+
         if (num2 == 2*num) {
             break;
-        }       
+        }
     }
-    
+
     //std::cout << cpu_t - cpu_st << std::endl;
 
     sprintf(msg,"trick.var_clear()\n");
@@ -119,7 +119,7 @@ int VSTest::testAddRemove() {
     vs_read();
     result = strcmp_IgnoringWhiteSpace("0  -1234  -405039 {ft}", got_read);
     TRICK_EXPECT_EQ(result, 0, suite, "VariableChangeUnits")
-    trick_test_add_parent( suite , "VariableChangeUnits" , "2710769246");    
+    trick_test_add_parent( suite , "VariableChangeUnits" , "2710769246");
 
     // REMOVE SINGLE VARIABLE
     sprintf(msg,"trick.var_remove(\"vsx.vst.e\")\n");
@@ -127,7 +127,7 @@ int VSTest::testAddRemove() {
     vs_read();
     result = strcmp_IgnoringWhiteSpace("0  -1234", got_read);
     TRICK_EXPECT_EQ(result, 0, suite, "VariableRemove")
-    trick_test_add_parent( suite , "VariableRemove" , "806750761");   
+    trick_test_add_parent( suite , "VariableRemove" , "806750761");
 
     // CLEAR VARIABLE SERVER
     sprintf(msg,"trick.var_clear()\n");
@@ -175,7 +175,7 @@ int VSTest::testPause() {
     vs_write(msg);
     sprintf(msg,"trick.var_add(\"vsx.vst.i\")\n");
     vs_write(msg);
-    
+
     // PAUSE
     sprintf(msg,"trick.var_pause()\n");
     vs_write(msg);
diff --git a/test/SIM_test_varserv/models/varserv/src/VS_unittests.cpp b/test/SIM_test_varserv/models/varserv/src/VS_unittests.cpp
index 439ba5e3..d3ab5cc5 100644
--- a/test/SIM_test_varserv/models/varserv/src/VS_unittests.cpp
+++ b/test/SIM_test_varserv/models/varserv/src/VS_unittests.cpp
@@ -1,6 +1,6 @@
 /******************************TRICK HEADER*************************************
 PURPOSE:                     ( Test variable server )
-REFERENCE:                   ( None ) 
+REFERENCE:                   ( None )
 ASSUMPTIONS AND LIMITATIONS: ( None )
 CLASS:                       ( scheduled )
 LIBRARY DEPENDENCY:          ( VS.o )
@@ -14,7 +14,7 @@ int VSTest::test() {
 
 	var_ascii();
 
-	
+
 
 	return(0);
 }
diff --git a/trick_sims/Cannon/models/cannon/aero/src/cannon_impact_monte.c b/trick_sims/Cannon/models/cannon/aero/src/cannon_impact_monte.c
index 6bc14e04..1a648538 100644
--- a/trick_sims/Cannon/models/cannon/aero/src/cannon_impact_monte.c
+++ b/trick_sims/Cannon/models/cannon/aero/src/cannon_impact_monte.c
@@ -17,11 +17,11 @@ double cannon_impact_monte( CANNON_AERO* C)
 
     tgo = regula_falsi( get_integ_time() , &(C->rf) ) ;
     if (tgo == 0.0) {
-   
-        now = get_integ_time() ; 
+
+        now = get_integ_time() ;
         /*  Ball impact */
         reset_regula_falsi( now , &(C->rf) ) ;
-           
+
         C->vel[0] = 0.0 ; C->vel[1] = 0.0 ; C->vel[2] = 0.0 ;
         C->acc[0] = 0.0 ; C->acc[1] = 0.0 ; C->acc[2] = 0.0 ;
         C->g = 0.0 ;
diff --git a/trick_sims/Cannon/models/cannon/aero/src/cannon_jet_control.c b/trick_sims/Cannon/models/cannon/aero/src/cannon_jet_control.c
index d9914d48..55330dac 100644
--- a/trick_sims/Cannon/models/cannon/aero/src/cannon_jet_control.c
+++ b/trick_sims/Cannon/models/cannon/aero/src/cannon_jet_control.c
@@ -10,17 +10,17 @@ int cannon_jet_control( CANNON_AERO* C )
 {
         double sim_time ;
 
-#define CANNON_EQUALS(X,Y) ( fabs(X  - Y) < 1.0e-9 ) ? 1 : 0 
+#define CANNON_EQUALS(X,Y) ( fabs(X  - Y) < 1.0e-9 ) ? 1 : 0
 
         sim_time = exec_get_sim_time() ;
 
         if ( CANNON_EQUALS(sim_time, roundoff(0.1, C->time_to_fire_jet_1)) ||
              CANNON_EQUALS(sim_time, roundoff(0.1, C->time_to_fire_jet_2)) ||
              CANNON_EQUALS(sim_time, roundoff(0.1, C->time_to_fire_jet_3)) ||
-             CANNON_EQUALS(sim_time, roundoff(0.1, C->time_to_fire_jet_4)) ) { 
+             CANNON_EQUALS(sim_time, roundoff(0.1, C->time_to_fire_jet_4)) ) {
 
                 C->jet_on = 1 ;
 
         }
-        return(0) ; 
+        return(0) ;
 }
diff --git a/trick_sims/Cannon/models/cannon/aero/src/cannon_monte_default_data.c b/trick_sims/Cannon/models/cannon/aero/src/cannon_monte_default_data.c
index a6d7b23f..7a979f88 100644
--- a/trick_sims/Cannon/models/cannon/aero/src/cannon_monte_default_data.c
+++ b/trick_sims/Cannon/models/cannon/aero/src/cannon_monte_default_data.c
@@ -23,7 +23,7 @@ int cannon_monte_default_data(CANNON_AERO* C)
 
 
     /* Regula Falsi impact critter setup */
-    #define MY_BIG_TGO 10000                                                                              
+    #define MY_BIG_TGO 10000
     C->rf.lower_set  = No ;
     C->rf.upper_set  = No ;
     C->rf.iterations = 0 ;
diff --git a/trick_sims/Cannon/models/cannon/gravity/src/cannon_analytic.c b/trick_sims/Cannon/models/cannon/gravity/src/cannon_analytic.c
index 629d4b07..66777fbb 100644
--- a/trick_sims/Cannon/models/cannon/gravity/src/cannon_analytic.c
+++ b/trick_sims/Cannon/models/cannon/gravity/src/cannon_analytic.c
@@ -9,10 +9,10 @@ int cannon_analytic( CANNON* C )
 {
     C->acc[0] =  0.00;
     C->acc[1] = -9.81 ;
-    C->vel[0] = C->vel0[0] + C->acc[0] * C->time ; 
-    C->vel[1] = C->vel0[1] + C->acc[1] * C->time ; 
-    C->pos[0] = C->pos0[0] + (C->vel0[0] + (0.5) * C->acc[0] * C->time) * C->time ; 
-    C->pos[1] = C->pos0[1] + (C->vel0[1] + (0.5) * C->acc[1] * C->time) * C->time ; 
+    C->vel[0] = C->vel0[0] + C->acc[0] * C->time ;
+    C->vel[1] = C->vel0[1] + C->acc[1] * C->time ;
+    C->pos[0] = C->pos0[0] + (C->vel0[0] + (0.5) * C->acc[0] * C->time) * C->time ;
+    C->pos[1] = C->pos0[1] + (C->vel0[1] + (0.5) * C->acc[1] * C->time) * C->time ;
     if (C->pos[1] < 0.0) {
         C->impactTime = (- C->vel0[1] - sqrt( C->vel0[1] * C->vel0[1] - 2 * C->pos0[1]))/C->acc[1];
         C->pos[0] = C->impactTime * C->vel0[0];
@@ -32,5 +32,5 @@ int cannon_analytic( CANNON* C )
      */
     C->time += 0.01 ;
 
-    return 0 ; 
+    return 0 ;
 }
diff --git a/trick_sims/Cannon/models/cannon/gravity/src/cannon_default_data.c b/trick_sims/Cannon/models/cannon/gravity/src/cannon_default_data.c
index beb13c68..e8d9feab 100644
--- a/trick_sims/Cannon/models/cannon/gravity/src/cannon_default_data.c
+++ b/trick_sims/Cannon/models/cannon/gravity/src/cannon_default_data.c
@@ -9,7 +9,7 @@ LIBRARY_DEPENDENCY: ((cannon_default_data.o))
 
 int cannon_default_data( CANNON* C ) {
 
-    const double PI = 3.1415926535; 
+    const double PI = 3.1415926535;
 
     C->acc[0] = 0.0;
     C->acc[1] = -9.81;
diff --git a/trick_sims/Cannon/models/cannon/gravity/src/cannon_deriv.c b/trick_sims/Cannon/models/cannon/gravity/src/cannon_deriv.c
index 44a8e327..b4a2029d 100644
--- a/trick_sims/Cannon/models/cannon/gravity/src/cannon_deriv.c
+++ b/trick_sims/Cannon/models/cannon/gravity/src/cannon_deriv.c
@@ -10,5 +10,5 @@ int cannon_deriv( CANNON* C ) {
           C->acc[1] = -9.81 ;
           C->timeRate = 1.00;
       }
-      return 0 ; 
+      return 0 ;
 }
diff --git a/trick_sims/Cannon/models/cannon/gravity/src/cannon_impact.c b/trick_sims/Cannon/models/cannon/gravity/src/cannon_impact.c
index ca5c6be5..b4b9fd78 100644
--- a/trick_sims/Cannon/models/cannon/gravity/src/cannon_impact.c
+++ b/trick_sims/Cannon/models/cannon/gravity/src/cannon_impact.c
@@ -25,7 +25,7 @@ double cannon_impact( CANNON* C ) {
 
         C->vel[0] = 0.0 ; C->vel[1] = 0.0 ;
         C->acc[0] = 0.0 ; C->acc[1] = 0.0 ;
-        C->impactTime = C->time; 
+        C->impactTime = C->time;
 
         fprintf(stderr, "\n\nIMPACT: SimTime = %.9f, ModelTime = %.9f, pos = %.9f\n\n", now, C->impactTime, C->pos[0] ) ;
     }
diff --git a/trick_sims/Cannon/models/cannon/gravity/src/cannon_init.c b/trick_sims/Cannon/models/cannon/gravity/src/cannon_init.c
index 522f8754..aaa52294 100644
--- a/trick_sims/Cannon/models/cannon/gravity/src/cannon_init.c
+++ b/trick_sims/Cannon/models/cannon/gravity/src/cannon_init.c
@@ -1,20 +1,20 @@
 /*****************************************************************************
-PURPOSE: (Initialize the cannonball) 
+PURPOSE: (Initialize the cannonball)
 *****************************************************************************/
 #include <math.h>
 #include "../include/cannon_common.h"
 
 int cannon_init( CANNON* C) {
-   
+
         C->vel0[0] = C->init_speed*cos(C->init_angle);
         C->vel0[1] = C->init_speed*sin(C->init_angle);
 
-        C->vel[0] = C->vel0[0] ; 
-        C->vel[1] = C->vel0[1] ; 
+        C->vel[0] = C->vel0[0] ;
+        C->vel[1] = C->vel0[1] ;
 
         C->impactTime = 0.0;
         C->impact = 0.0;
 
-        return 0 ; 
+        return 0 ;
 }
 
diff --git a/trick_sims/Cannon/models/cannon/optim/include/amoeba.h b/trick_sims/Cannon/models/cannon/optim/include/amoeba.h
index 7ae022dc..aa73111b 100644
--- a/trick_sims/Cannon/models/cannon/optim/include/amoeba.h
+++ b/trick_sims/Cannon/models/cannon/optim/include/amoeba.h
@@ -1,5 +1,5 @@
 /*
- * Vetter's implementation of the Nelder-Mead "amoeba" algorithm. 
+ * Vetter's implementation of the Nelder-Mead "amoeba" algorithm.
  * Was made strictly for Trick tutorial.  Was a whim.
  * Reference for algorithm (not code):
  * http://www.research.ibm.com/infoecon/paps/html/amec99_bundle/node8.html
@@ -8,10 +8,10 @@
 #ifndef AMOEBA_H
 #define AMOEBA_H
 
-#define AMOEBA_ALPHA 1.0     /* reflection constant */ 
-#define AMOEBA_BETA  1.0     /* expansion constant */ 
-#define AMOEBA_ZETA  0.5     /* contraction constant */ 
-#define AMOEBA_ETA   0.5     /* shrinkage constant */ 
+#define AMOEBA_ALPHA 1.0     /* reflection constant */
+#define AMOEBA_BETA  1.0     /* expansion constant */
+#define AMOEBA_ZETA  0.5     /* contraction constant */
+#define AMOEBA_ETA   0.5     /* shrinkage constant */
 
 typedef enum {
 
@@ -37,8 +37,8 @@ typedef struct {
         double*  x_refl ;       /* -- Point of reflection */
         double*  x_expa ;       /* -- Point of expansion */
         double*  x_cont ;       /* -- Point of contraction */
-        double*  curr_point ;   /* -- Current point of interest for sim use: 
-                                      Simplex vertice, centroid, reflection, 
+        double*  curr_point ;   /* -- Current point of interest for sim use:
+                                      Simplex vertice, centroid, reflection,
                                       expansion or contraction point */
         int curr_vertex ;       /* -- Current vertex for sim state machine */
         AMOEBA_STATE state ;    /* -- For sim's amoeba state machine */
@@ -48,7 +48,7 @@ typedef struct {
 #ifdef __cplusplus
 extern "C" {
 #endif
-void amoeba_init( AMOEBA* A, int num_dims, double epsilon, int max_steps, 
+void amoeba_init( AMOEBA* A, int num_dims, double epsilon, int max_steps,
                   double* simplex_point, double simplex_size ) ;
 void amoeba_print( AMOEBA* A ) ;
 void amoeba_print_point( int num_dims, double* point ) ;
diff --git a/trick_sims/Cannon/models/cannon/optim/include/amoeba_proto.h b/trick_sims/Cannon/models/cannon/optim/include/amoeba_proto.h
index 83686fdf..a0631263 100644
--- a/trick_sims/Cannon/models/cannon/optim/include/amoeba_proto.h
+++ b/trick_sims/Cannon/models/cannon/optim/include/amoeba_proto.h
@@ -20,7 +20,7 @@ int cannon_pre_master(CANNON_AERO*, AMOEBA*);
 int cannon_post_master(CANNON_AERO*, AMOEBA*);
 int cannon_post_slave(CANNON_AERO*);
 int cannon_pre_slave(CANNON_AERO*);
- 
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/trick_sims/Cannon/models/cannon/optim/src/amoeba.c b/trick_sims/Cannon/models/cannon/optim/src/amoeba.c
index ab61c896..2aae4083 100644
--- a/trick_sims/Cannon/models/cannon/optim/src/amoeba.c
+++ b/trick_sims/Cannon/models/cannon/optim/src/amoeba.c
@@ -68,7 +68,7 @@ void amoeba_shrink( AMOEBA* A ) {
         for ( ii = 0 ; ii < A->num_vertices ; ii++ ) {
                 x = A->vertices[ii] ;
                 for ( jj = 0 ; jj < A->num_dims ; jj++ ) {
-                        x[jj] = x_0[jj] + AMOEBA_ETA*( x[jj] - x_0[jj] ) ; 
+                        x[jj] = x_0[jj] + AMOEBA_ETA*( x[jj] - x_0[jj] ) ;
                 }
         }
 
@@ -120,8 +120,8 @@ int amoeba_contract( AMOEBA* A ) {
                 fprintf(stderr,">> Try contraction.\n");
         }
 
-        /* Contract if F(x_r) < F(x_n-1) */ 
-        if ( my_func(x_r) >= my_func(x_n_1) ) { 
+        /* Contract if F(x_r) < F(x_n-1) */
+        if ( my_func(x_r) >= my_func(x_n_1) ) {
                 if ( A->debug ) {
                         fprintf(stderr,">> Reject contraction.\n");
                 }
@@ -129,7 +129,7 @@ int amoeba_contract( AMOEBA* A ) {
         }
 
         /* Calculate contraction point
-         * x_contract = x_center + zeta*(x_center - x_worst) 
+         * x_contract = x_center + zeta*(x_center - x_worst)
          */
         for ( ii = 0 ; ii < A->num_dims ; ii++ ) {
                 x_cont[ii] = x_c[ii] + AMOEBA_ZETA*(x_c[ii] - x_n[ii]) ;
@@ -138,45 +138,45 @@ int amoeba_contract( AMOEBA* A ) {
         if ( my_func(x_cont) >= my_func(x_n) ) {
                 /* Accept contraction point */
 
-                if ( A->debug ) { 
+                if ( A->debug ) {
                         fprintf(stderr,">> Accept contraction about x_cont(");
                         amoeba_print_point( A->num_dims, x_cont ) ;
-                        fprintf(stderr,")  F(x_cont)=%.2lf \n", 
+                        fprintf(stderr,")  F(x_cont)=%.2lf \n",
                                 my_func(x_cont) ) ;
                 }
 
                 for ( ii = 0 ; ii < A->num_dims+1 ; ii++ ) {
-                        x_n[ii] = x_cont[ii] ; 
+                        x_n[ii] = x_cont[ii] ;
                 }
 
                 return 1 ;
 
         } else {
                 /* Reject contraction point */
-                if ( A->debug ) { 
+                if ( A->debug ) {
                         fprintf(stderr,">> Reject contraction about x_cont(");
                         amoeba_print_point( A->num_dims, x_cont ) ;
-                        fprintf(stderr,")  F(x_cont)=%.2lf \n", 
+                        fprintf(stderr,")  F(x_cont)=%.2lf \n",
                                 my_func(x_cont) ) ;
                 }
 
                 return 0 ;
-        } 
+        }
 
 }
 
 void amoeba_calc_expansion_point( AMOEBA* A ) {
-                                                                                
+
         int ii ;
         double* x_r ;
         double* x_c ;
         double* x_e ;
-                                                                                
+
         /* Short hand */
         x_r = A->x_refl ;
         x_c = A->x_cent ;
         x_e = A->x_expa ;
-                                                                                
+
         /* Calculate expansion point
          * x_expa = x_refl + beta*(x_refl - x_cent)
          */
@@ -204,8 +204,8 @@ int amoeba_expand( AMOEBA* A ) {
                 fprintf(stderr,">> Try expansion.\n");
         }
 
-        /* Expand if F(x_r) > F(x_0) */ 
-        if ( my_func(x_r) <= my_func(x_0) ) { 
+        /* Expand if F(x_r) > F(x_0) */
+        if ( my_func(x_r) <= my_func(x_0) ) {
                 if ( A->debug ) {
                         fprintf(stderr,">> Reject expansion.\n");
                 }
@@ -218,38 +218,38 @@ int amoeba_expand( AMOEBA* A ) {
 
         if ( my_func(x_e) >= my_func(x_r) ) {
                 /* Accept expansion point */
-                if ( A->debug ) { 
+                if ( A->debug ) {
                         fprintf(stderr,"Accept x_e(");
                         amoeba_print_point( A->num_dims, x_e ) ;
                         fprintf(stderr,")  F(x_e)=%.2lf \n", my_func(x_e) ) ;
                 }
 
                 for ( ii = 0 ; ii < A->num_dims+1 ; ii++ ) {
-                        x_n[ii] = x_e[ii] ; 
+                        x_n[ii] = x_e[ii] ;
                 }
         } else {
                 /* Accept reflection point */
-                if ( A->debug ) { 
+                if ( A->debug ) {
                         fprintf(stderr,"Accept x_r(");
                         amoeba_print_point( A->num_dims, x_r ) ;
                         fprintf(stderr,")  F(x_r)=%.2lf \n", my_func(x_r) ) ;
                 }
                 for ( ii = 0 ; ii < A->num_dims+1 ; ii++ ) {
-                        x_n[ii] = x_r[ii] ; 
+                        x_n[ii] = x_r[ii] ;
                 }
-        } 
+        }
 
         return 1 ;
 }
 
-double amoeba_distance_between( int num_dims, double* x, double* y ) { 
+double amoeba_distance_between( int num_dims, double* x, double* y ) {
 
         int ii ;
         double sum_squares ;
 
         sum_squares = 0 ;
         for ( ii = 0 ; ii < num_dims ; ii++ ) {
-                sum_squares += (x[ii] - y[ii])*(x[ii] - y[ii]); 
+                sum_squares += (x[ii] - y[ii])*(x[ii] - y[ii]);
         }
 
         return ( sqrt(sum_squares) ) ;
@@ -280,13 +280,13 @@ int amoeba_satisfied( AMOEBA* A ) {
                 x = A->vertices[ii] ;
                 for ( jj = ii+1 ; jj < A->num_vertices ; jj++ ) {
                         y = A->vertices[jj] ;
-                        dist = amoeba_distance_between( A->num_dims, x, y ) ; 
-                        if ( dist > max_dist ) { 
+                        dist = amoeba_distance_between( A->num_dims, x, y ) ;
+                        if ( dist > max_dist ) {
                                 max_dist = dist ;
                         }
                 }
         }
-        if ( max_dist < A->epsilon ) { 
+        if ( max_dist < A->epsilon ) {
                 return 1 ;
         }
 
@@ -299,14 +299,14 @@ int amoeba_satisfied( AMOEBA* A ) {
                 for ( jj = ii+1 ; jj < A->num_vertices ; jj++ ) {
                         f2 = A->vertices[jj][A->num_dims] ;
                         dist = fabs( f1 - f2 ) ;
-                        if ( dist > max_dist ) { 
+                        if ( dist > max_dist ) {
                                 max_dist = dist ;
                         }
                 }
         }
         if ( max_dist < A->epsilon ) {
                 return 1 ;
-        } 
+        }
 
         /*
          * Unsatisfied amoeba :-(
@@ -359,7 +359,7 @@ int amoeba_reflect( AMOEBA* A ) {
                         fprintf(stderr,")  F(x_r)=%.2lf \n", my_func(x_r) ) ;
                 }
                 for ( ii = 0 ; ii < A->num_dims+1 ; ii++ ) {
-                        x_n[ii] = x_r[ii] ; 
+                        x_n[ii] = x_r[ii] ;
                 }
                 return 1 ;
         } else {
@@ -379,7 +379,7 @@ void amoeba_order( AMOEBA* A ) {
         /* Order vertices based on function results.
          * Order from best to worst (i.e. max to min)
          */
-        qsort( A->vertices, 
+        qsort( A->vertices,
                A->num_vertices, sizeof(double*),
                amoeba_compare_vertices) ;
 
@@ -391,7 +391,7 @@ void amoeba_order( AMOEBA* A ) {
                 for ( ii = 0 ; ii < A->num_vertices - 1 ; ii++ ) {
                         A->x_cent[jj] +=  A->vertices[ii][jj] ;
                 }
-                A->x_cent[jj] /= (double)(A->num_vertices - 1.0 ) ; 
+                A->x_cent[jj] /= (double)(A->num_vertices - 1.0 ) ;
         }
 
         if ( A->debug ) {
@@ -405,8 +405,8 @@ int amoeba_compare_vertices( const void* ap, const void* bp ) {
 
         double a, b ;
 
-        a = my_func( *((double**) ap) ) ; 
-        b = my_func( *((double**) bp) ) ; 
+        a = my_func( *((double**) ap) ) ;
+        b = my_func( *((double**) bp) ) ;
 
         if ( a > b ) {
                 return -1 ;
@@ -418,10 +418,10 @@ int amoeba_compare_vertices( const void* ap, const void* bp ) {
 }
 
 /*
- * num_dims: Number of dimensions in domain space.  
- *           Example: If the function we are maximizing is F(x,y,z) 
+ * num_dims: Number of dimensions in domain space.
+ *           Example: If the function we are maximizing is F(x,y,z)
  *                    The number of dims is 3.
- * 
+ *
  * epsilon: The error tolerance before amoeba algorithm stops
  *          A good number is something like: 1.0e-9
  *
@@ -435,7 +435,7 @@ int amoeba_compare_vertices( const void* ap, const void* bp ) {
  * Second : If "simplex_point" is NULL, it is assumed user setup
  *          A->init_simplex before entering amoeba_init.
  */
-void amoeba_init(  AMOEBA* A, int num_dims, double epsilon, int max_steps, 
+void amoeba_init(  AMOEBA* A, int num_dims, double epsilon, int max_steps,
                   double* simplex_point, double simplex_size ) {
 
         int ii, jj ;
@@ -456,15 +456,15 @@ void amoeba_init(  AMOEBA* A, int num_dims, double epsilon, int max_steps,
 
         A->vertices = (double**) malloc (A->num_vertices*sizeof(double));
         for ( ii = 0 ; ii < A->num_vertices ; ii++ ) {
-                A->vertices[ii] = (double*) malloc 
+                A->vertices[ii] = (double*) malloc
                                      ((A->num_dims+1)*sizeof(double));
         }
 
         if ( simplex_point != NULL ) {
-                /*  
+                /*
                  * Use "simplex_point" as one vertice of first simplex. Then
-                 * move in "simplex_size" along unit vectors to create the 
-                 * rest of the first guess simplex. 
+                 * move in "simplex_size" along unit vectors to create the
+                 * rest of the first guess simplex.
                  *
                  * First_simplex = simplex_point + simplex_size*unit_vecs
                  */
@@ -473,11 +473,11 @@ void amoeba_init(  AMOEBA* A, int num_dims, double epsilon, int max_steps,
                 }
                 /* Load function vals with zero */
                 A->vertices[0][jj] = 0.0 ;
-        
-                for ( ii = 1 ; ii < A->num_vertices ; ii++ ) { 
+
+                for ( ii = 1 ; ii < A->num_vertices ; ii++ ) {
                         for ( jj = 0 ; jj < A->num_dims ; jj++ ) {
                                 if ( jj+1 == ii ) {
-                                        A->vertices[ii][jj] = 
+                                        A->vertices[ii][jj] =
                                               simplex_point[jj] - simplex_size ;
                                 } else {
                                        A->vertices[ii][jj] = simplex_point[jj] ;
@@ -489,7 +489,7 @@ void amoeba_init(  AMOEBA* A, int num_dims, double epsilon, int max_steps,
 
         } else {
                 /* Assume user has defined first simplex */
-                for ( ii = 0 ; ii < A->num_vertices ; ii++ ) { 
+                for ( ii = 0 ; ii < A->num_vertices ; ii++ ) {
                         for ( jj = 0 ; jj < A->num_dims ; jj++ ) {
                                 A->vertices[ii][jj] = A->init_simplex[ii][jj] ;
                         }
@@ -535,7 +535,7 @@ void amoeba_print_point( int num_dims, double* point ) {
 
         int ii;
 
-        for ( ii = 0 ; ii < num_dims-1 ; ii++ ) { 
+        for ( ii = 0 ; ii < num_dims-1 ; ii++ ) {
                 fprintf(stderr,"%.2lf   ", point[ii]);
         }
         fprintf(stderr,"%.2lf", point[num_dims-1]);
@@ -545,7 +545,7 @@ void amoeba_print( AMOEBA* A ) {
 
         int ii, jj ;
 
-        for ( ii = 0 ; ii < A->num_vertices ; ii++ ) { 
+        for ( ii = 0 ; ii < A->num_vertices ; ii++ ) {
                 for ( jj = 0 ; jj < A->num_dims ; jj++ ) {
                         fprintf(stderr,"%.2lf   ", A->vertices[ii][jj] ) ;
                 }
diff --git a/trick_sims/Cannon/models/cannon/optim/src/cannon_init_amoeba.c b/trick_sims/Cannon/models/cannon/optim/src/cannon_init_amoeba.c
index c84f1025..6e467ea5 100644
--- a/trick_sims/Cannon/models/cannon/optim/src/cannon_init_amoeba.c
+++ b/trick_sims/Cannon/models/cannon/optim/src/cannon_init_amoeba.c
@@ -9,8 +9,8 @@ PROGRAMMERS: (Keith)
 #include "../include/amoeba_proto.h"
 
 int cannon_init_amoeba(
-      AMOEBA* A  )           
+      AMOEBA* A  )
 {
         amoeba_init( A, 4, 1.0e-3, 100, NULL, 0.0 ) ;
-        return ( 0 ); 
+        return ( 0 );
 }
diff --git a/trick_sims/Cannon/models/cannon/optim/src/monte_shutdown.c b/trick_sims/Cannon/models/cannon/optim/src/monte_shutdown.c
index 9cadecab..5290f4d4 100644
--- a/trick_sims/Cannon/models/cannon/optim/src/monte_shutdown.c
+++ b/trick_sims/Cannon/models/cannon/optim/src/monte_shutdown.c
@@ -21,5 +21,5 @@ int cannon_master_shutdown()
     }
     trick_test_add_parent("Sim_Monte Simulation", "MonteCarlo Analysis", "1452306647");
     call_write_output();
-    return ( 0 ); 
+    return ( 0 );
 }
diff --git a/trick_sims/SIM_Ball++_L1/models/BallStateInteg.cpp b/trick_sims/SIM_Ball++_L1/models/BallStateInteg.cpp
index 0a3a68d3..cffd8d72 100644
--- a/trick_sims/SIM_Ball++_L1/models/BallStateInteg.cpp
+++ b/trick_sims/SIM_Ball++_L1/models/BallStateInteg.cpp
@@ -54,7 +54,7 @@ int Ball::state_integ() {
        &state_out->velocity[1] ,
        &state_out->acceleration[0] ,
        &state_out->acceleration[1] ,
-       NULL 
+       NULL
    );
 
    /* CALL THE TRICK INTEGRATION SERVICE */
diff --git a/trick_sims/SIM_satellite/models/Satellite/graphics/Ball.c b/trick_sims/SIM_satellite/models/Satellite/graphics/Ball.c
index 866520ca..c2544938 100644
--- a/trick_sims/SIM_satellite/models/Satellite/graphics/Ball.c
+++ b/trick_sims/SIM_satellite/models/Satellite/graphics/Ball.c
@@ -1,4 +1,4 @@
-#if ( __APPLE__ ) 
+#if ( __APPLE__ )
 #       include <GLUT/glut.h>
 #else
 #       include <GL/glut.h>
@@ -32,29 +32,29 @@ void Ball_initialize() {
         glEnable(GL_LIGHTING);
         glBindTexture(GL_TEXTURE_2D, earthTextureID);
         glEnable(GL_TEXTURE_2D);
- 
+
 
         for(ii = 0; ii <= n_lats; ii++) {
 
             double lat0 = PI * (-0.5 + (double) (ii - 1) / n_lats);
             double z0  = sin(lat0);
             double zr0 = cos(lat0);
-    
+
             double lat1 = PI * (-0.5 + (double) ii / n_lats);
             double z1 = sin(lat1);
             double zr1 = cos(lat1);
-    
+
             glBegin(GL_QUAD_STRIP);
             for(jj = 0; jj <= n_lons; jj++) {
                 double lon = 2 * PI * (double) (jj - 1) / n_lons;
                 double x = cos(lon);
                 double y = sin(lon);
 
-                glTexCoord2d( 0.0, 0.0); 
+                glTexCoord2d( 0.0, 0.0);
                 glNormal3d(x * zr0, y * zr0, z0);
                 glVertex3d(x * zr0, y * zr0, z0);
 
-                glTexCoord2d( 1.0, 1.0); 
+                glTexCoord2d( 1.0, 1.0);
                 glNormal3d(x * zr1, y * zr1, z1);
                 glVertex3d(x * zr1, y * zr1, z1);
             }
@@ -66,7 +66,7 @@ void Ball_initialize() {
 
 void Ball_display(void) {
 
-    glMatrixMode(GL_MODELVIEW);  
+    glMatrixMode(GL_MODELVIEW);
     glPushMatrix();
     glScaled(6367500.0, 6367500.0, 6367500.0);
     glCallList(BallListID);
diff --git a/trick_sims/SIM_satellite/models/Satellite/graphics/Camera.hh b/trick_sims/SIM_satellite/models/Satellite/graphics/Camera.hh
index cdfee88b..77618079 100644
--- a/trick_sims/SIM_satellite/models/Satellite/graphics/Camera.hh
+++ b/trick_sims/SIM_satellite/models/Satellite/graphics/Camera.hh
@@ -3,7 +3,7 @@
 class Camera {
 
 public:
-    Camera(); 
+    Camera();
     void look();
 
     double pos[3];
diff --git a/trick_sims/SIM_satellite/models/Satellite/graphics/SatelliteModel.c b/trick_sims/SIM_satellite/models/Satellite/graphics/SatelliteModel.c
index 39133687..6be46e4c 100644
--- a/trick_sims/SIM_satellite/models/Satellite/graphics/SatelliteModel.c
+++ b/trick_sims/SIM_satellite/models/Satellite/graphics/SatelliteModel.c
@@ -41,7 +41,7 @@ void Satellite_initialize(void) {
    nozzleTextureID = MakeTexture(Nozzle_texture, NOZZLE_TEXTURE_WIDTH, NOZZLE_TEXTURE_HEIGHT);
 
   if (displayListID == 0) {
-      /* Build Display list.*/   
+      /* Build Display list.*/
       double cosine[33];
       double sine[33];
 
@@ -62,12 +62,12 @@ void Satellite_initialize(void) {
 
       double radius6 = 1.016;
       double station6 = -4.8260;
- 
+
       double radius7 = 1.27;
       double station7 = -6.0858;
 
       int ii;
-      for(ii=0 ; ii <= 32 ; ii++) {   
+      for(ii=0 ; ii <= 32 ; ii++) {
           double angle = (PI*2*ii)/32.0;
           cosine[ii] = cos(angle);
           sine[ii] = sin(angle);
@@ -82,9 +82,9 @@ void Satellite_initialize(void) {
           glEnable(GL_TEXTURE_2D);
 
           glBegin(GL_QUAD_STRIP);
-          for(ii=0 ; ii <= 32 ; ii++) {   
+          for(ii=0 ; ii <= 32 ; ii++) {
 
-              double t = (double)ii/32.0;  
+              double t = (double)ii/32.0;
 
               glTexCoord2d( 0.0, t);
               glNormal3d( (station2-station1)/radius2-radius1, sine[ii], cosine[ii]);
@@ -135,7 +135,7 @@ void Satellite_initialize(void) {
 
           glBegin(GL_QUAD_STRIP);
           for(ii=0 ; ii <= 32 ; ii++) {
-              double t = (double)ii/32.0;  
+              double t = (double)ii/32.0;
               glTexCoord2d( 0.0, t);
               glNormal3d( 0.0, sine[ii], cosine[ii]);
               glVertex3d( station5, sine[ii]*radius5, cosine[ii]*radius5);
@@ -148,7 +148,7 @@ void Satellite_initialize(void) {
 
           glBegin(GL_QUAD_STRIP);
           for(ii=0 ; ii <= 32 ; ii++) {
-              double t = (double)ii/32.0;  
+              double t = (double)ii/32.0;
               glTexCoord2d( 0.5, t);
               glNormal3d( 0.0, sine[ii], cosine[ii]);
               glVertex3d( station6, sine[ii]*radius6, cosine[ii]*radius6);
@@ -158,12 +158,12 @@ void Satellite_initialize(void) {
           }
           glEnd();
 
-      glEndList(); 
+      glEndList();
   }
 }
 
 void Satellite_display(void) {
 
-    glCallList(displayListID); 
+    glCallList(displayListID);
 
 }
diff --git a/trick_sims/SIM_satellite/models/Satellite/graphics/Scene.cpp b/trick_sims/SIM_satellite/models/Satellite/graphics/Scene.cpp
index 5a19042b..097a3bd0 100644
--- a/trick_sims/SIM_satellite/models/Satellite/graphics/Scene.cpp
+++ b/trick_sims/SIM_satellite/models/Satellite/graphics/Scene.cpp
@@ -1,4 +1,4 @@
-#if ( __APPLE__ ) 
+#if ( __APPLE__ )
 #include <GLUT/glut.h>
 #else
 #include <GL/glut.h>
@@ -93,7 +93,7 @@ void keyboard(unsigned char key, int x, int y) {
 
 
 void display() {
- 
+
     glClear (GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT );
 
     glLoadIdentity();
@@ -196,7 +196,7 @@ void comm_read() {
         // Camera up is in the positive World-Z direction;
         satellite_camera->up[0] = 0.0;
         satellite_camera->up[1] = 0.0;
-        satellite_camera->up[2] = 1.0; 
+        satellite_camera->up[2] = 1.0;
 
         glutPostRedisplay();
 
diff --git a/trick_sims/SIM_satellite/models/Satellite/graphics/SceneElement.cpp b/trick_sims/SIM_satellite/models/Satellite/graphics/SceneElement.cpp
index 8aec499e..ac17a7e0 100644
--- a/trick_sims/SIM_satellite/models/Satellite/graphics/SceneElement.cpp
+++ b/trick_sims/SIM_satellite/models/Satellite/graphics/SceneElement.cpp
@@ -1,4 +1,4 @@
-#if ( __APPLE__ ) 
+#if ( __APPLE__ )
 #       include <GLUT/glut.h>
 #else
 #       include <GL/glut.h>
@@ -67,7 +67,7 @@ SceneElement::SceneElement(const char* model_name) {
 void SceneElement::init() {
     if (model_init_func != 0) {
       (*model_init_func)();
-    } 
+    }
 }
 
 void SceneElement::display() {
@@ -78,7 +78,7 @@ void SceneElement::display() {
     glMultMatrixd((GLdouble*)R);
     if (model_display_func != 0) {
       (*model_display_func)();
-    } 
+    }
     glPopMatrix();
 
 }
diff --git a/trick_sims/SIM_satellite/models/Satellite/src/Planet.cpp b/trick_sims/SIM_satellite/models/Satellite/src/Planet.cpp
index 834eb809..3f947b2d 100644
--- a/trick_sims/SIM_satellite/models/Satellite/src/Planet.cpp
+++ b/trick_sims/SIM_satellite/models/Satellite/src/Planet.cpp
@@ -2,7 +2,7 @@
 
 Planet::Planet() {
     mass = EARTH_MASS;
-    radius = EARTH_RADIUS; 
+    radius = EARTH_RADIUS;
     for (int ii = 0; ii<3 ; ii++ ) {
         pos[ii] = 0.0;
     }
diff --git a/trick_sims/SIM_sun/models/Sun/include/lh_coords.h b/trick_sims/SIM_sun/models/Sun/include/lh_coords.h
index 9a3eb02b..ab1d5ce4 100644
--- a/trick_sims/SIM_sun/models/Sun/include/lh_coords.h
+++ b/trick_sims/SIM_sun/models/Sun/include/lh_coords.h
@@ -10,7 +10,7 @@ void equatorial_to_local_horiz(double lat,   /* Observer's latitude       IN */
                                double ra,    /* Right Ascension (degrees) IN */
                                double decl,  /* Declination (degrees)     IN */
                                double *az,   /* Azimuth (degrees)         OUT */
-                               double *el) ; /* Elevation (degrees)       OUT */ 
+                               double *el) ; /* Elevation (degrees)       OUT */
 
 #ifdef __cplusplus
 }
diff --git a/trick_sims/SIM_sun/models/Sun/include/sun_pos.h b/trick_sims/SIM_sun/models/Sun/include/sun_pos.h
index 3506eef4..cefc55ea 100644
--- a/trick_sims/SIM_sun/models/Sun/include/sun_pos.h
+++ b/trick_sims/SIM_sun/models/Sun/include/sun_pos.h
@@ -6,7 +6,7 @@ extern "C" {
 #endif
 
 /**
- * Calculate the Sun's position at the given Julian day number. 
+ * Calculate the Sun's position at the given Julian day number.
  * @param JD The Julian day number.
  * @param sun_right_ascension.
  * @param sun_declination.
diff --git a/trick_sims/SIM_sun/models/Sun/src/lh_coords.c b/trick_sims/SIM_sun/models/Sun/src/lh_coords.c
index 3ece4d1c..2acc9461 100644
--- a/trick_sims/SIM_sun/models/Sun/src/lh_coords.c
+++ b/trick_sims/SIM_sun/models/Sun/src/lh_coords.c
@@ -1,4 +1,4 @@
-/******************************************************************* 
+/*******************************************************************
  * Reference(s):
  * (1) Meeus,Jean."Astronomical Algorithms",
  * 2nd Edition, Willmann-Bell, Inc.
@@ -7,7 +7,7 @@
  */
 
 #include <math.h>
-#include "lh_coords.h" 
+#include "lh_coords.h"
 
 #ifndef PI
 #define PI 3.14159264
diff --git a/trick_sims/SIM_sun/models/Sun/src/sidereal.c b/trick_sims/SIM_sun/models/Sun/src/sidereal.c
index 3cdbe4db..cf373a50 100644
--- a/trick_sims/SIM_sun/models/Sun/src/sidereal.c
+++ b/trick_sims/SIM_sun/models/Sun/src/sidereal.c
@@ -1,4 +1,4 @@
-/******************************************************************* 
+/*******************************************************************
  * Reference(s):
  * (1) Meeus,Jean."Astronomical Algorithms",
  * 2nd Edition, Willmann-Bell, Inc.
@@ -53,7 +53,7 @@ void GST_secs_time( double JD, double *GST ) {
      }
 
      /*  Ref(1), page 87 */
-     theta_0 = UT * 1.00273790935 + cap_theta_0; 
+     theta_0 = UT * 1.00273790935 + cap_theta_0;
 
      if (theta_0 >= 0.0) {
           theta_0 = fmod(theta_0, 86400.0);
@@ -61,7 +61,7 @@ void GST_secs_time( double JD, double *GST ) {
           theta_0 = fmod(theta_0, 86400.0) + 86400.0;
      }
 
-     *GST = theta_0; 
+     *GST = theta_0;
 
 }
 
diff --git a/trick_sims/SIM_sun/models/Sun/src/sun_pos.c b/trick_sims/SIM_sun/models/Sun/src/sun_pos.c
index 982f608a..c4063d1e 100644
--- a/trick_sims/SIM_sun/models/Sun/src/sun_pos.c
+++ b/trick_sims/SIM_sun/models/Sun/src/sun_pos.c
@@ -1,4 +1,4 @@
-/******************************************************************* 
+/*******************************************************************
  * Reference(s):
  * (1) Meeus,Jean."Astronomical Algorithms",
  * 2nd Edition, Willmann-Bell, Inc.
@@ -72,7 +72,7 @@ int sun_pos_at_JD (double JD,
      right_ascension = norm_mod(right_ascension, 360.0);
 
      tmp_d = sin( epsilon * DEG_TO_RAD ) * sin (Suns_true_longitude * DEG_TO_RAD);
-     declination = RAD_TO_DEG * asin (tmp_d); 
+     declination = RAD_TO_DEG * asin (tmp_d);
 
      *sun_right_ascension = right_ascension;
      *sun_declination     = declination;
diff --git a/trick_sims/SIM_sun/models/Sun/src/sun_pred_cyclic.c b/trick_sims/SIM_sun/models/Sun/src/sun_pred_cyclic.c
index 3e85ae2f..b1374d08 100644
--- a/trick_sims/SIM_sun/models/Sun/src/sun_pred_cyclic.c
+++ b/trick_sims/SIM_sun/models/Sun/src/sun_pred_cyclic.c
@@ -33,7 +33,7 @@ int sun_pred_cyclic( SUN_PRED* S,
        JD_to_Calendar_Date (S->JD, &S->utc.year, &S->utc.month, &dday );
 
        S->utc.day  = (int)dday;
-       tsec = (dday - S->utc.day ) * SECONDS_PER_DAY + 0.5; 
+       tsec = (dday - S->utc.day ) * SECONDS_PER_DAY + 0.5;
        S->utc.hour = (int)( tsec / 3600.0 ); tsec = tsec - ( S->utc.hour * 3600.0 );
        S->utc.min  = (int)( tsec / 60.0 );   tsec = tsec - ( S->utc.min  * 60.0 );
        S->utc.sec  = (int)( tsec );
@@ -45,7 +45,7 @@ int sun_pred_cyclic( SUN_PRED* S,
        JD_to_Calendar_Date (JDL, &S->local_time.year, &S->local_time.month, &dday );
 
        S->local_time.day  = (int)dday;
-       tsec = (dday - S->local_time.day ) * SECONDS_PER_DAY + 0.5; 
+       tsec = (dday - S->local_time.day ) * SECONDS_PER_DAY + 0.5;
        S->local_time.hour = (int)( tsec / 3600.0 ); tsec = tsec - ( S->local_time.hour * 3600.0 );
        S->local_time.min  = (int)( tsec / 60.0 );   tsec = tsec - ( S->local_time.min  * 60.0 );
        S->local_time.sec  = (int)( tsec );
@@ -64,12 +64,12 @@ int sun_pred_cyclic( SUN_PRED* S,
                return -1;
        }
 
-       /* Calculate the local hour angle of the Sun. */  
-       S->hour_angle = S->sidereal_time_at_Greenwich * ( 360.0 / 86400.0 ) - 
+       /* Calculate the local hour angle of the Sun. */
+       S->hour_angle = S->sidereal_time_at_Greenwich * ( 360.0 / 86400.0 ) -
                S->observer_longitude - S->right_ascension;
 
 
-       /* Calculate the local azimuth and elevation of the Sun. */ 
+       /* Calculate the local azimuth and elevation of the Sun. */
        equatorial_to_local_horiz(S->observer_latitude,
                                  S->hour_angle,
                                  S->right_ascension,
diff --git a/trick_sims/SIM_wheelbot/models/Battery/src/DCBattery.cpp b/trick_sims/SIM_wheelbot/models/Battery/src/DCBattery.cpp
index adc89066..1e3aa286 100644
--- a/trick_sims/SIM_wheelbot/models/Battery/src/DCBattery.cpp
+++ b/trick_sims/SIM_wheelbot/models/Battery/src/DCBattery.cpp
@@ -11,7 +11,7 @@ void DCBattery :: update ()
 {
     actualVoltage = idealVoltage - internalResistance * current;
     actualVoltage = std :: min (idealVoltage, actualVoltage);
-    actualVoltage = std :: max (0.0, actualVoltage);      
+    actualVoltage = std :: max (0.0, actualVoltage);
 }
 double DCBattery :: getActualVoltage ()
 {
diff --git a/trick_sims/SIM_wheelbot/models/Battery/test/DCBatteryTest.cpp b/trick_sims/SIM_wheelbot/models/Battery/test/DCBatteryTest.cpp
index c0df790a..a96e18bf 100644
--- a/trick_sims/SIM_wheelbot/models/Battery/test/DCBatteryTest.cpp
+++ b/trick_sims/SIM_wheelbot/models/Battery/test/DCBatteryTest.cpp
@@ -30,7 +30,7 @@ TEST( BatteryTest , four ) {
     battery.setCurrent(6.0);
     battery.update ();
     EXPECT_DOUBLE_EQ( 0.0, battery.actualVoltage );
-    
+
 }
 
 TEST( BatteryTest , five ) {
@@ -39,7 +39,7 @@ TEST( BatteryTest , five ) {
     battery.setCurrent(4.0);
     battery.update ();
     EXPECT_DOUBLE_EQ( 1.0, battery.actualVoltage );
-    
+
 }
 
 TEST( BatteryTest , six ) {
@@ -48,5 +48,5 @@ TEST( BatteryTest , six ) {
     battery.setCurrent(-4.0);
     battery.update ();
     EXPECT_DOUBLE_EQ( 9.0, battery.actualVoltage );
-    
+
 }
diff --git a/trick_sims/SIM_wheelbot/models/Guidance/test/ArenaTest.cpp b/trick_sims/SIM_wheelbot/models/Guidance/test/ArenaTest.cpp
index 1902d7a6..3073ce14 100644
--- a/trick_sims/SIM_wheelbot/models/Guidance/test/ArenaTest.cpp
+++ b/trick_sims/SIM_wheelbot/models/Guidance/test/ArenaTest.cpp
@@ -65,20 +65,20 @@ TEST( ArenaTest, calcOffset_three )
 
 TEST ( ArenaTest, getGridSquare_one)
 {
-  //Tests to make sure getGridSquare gets the gridSquare pointer at the location specified 
+  //Tests to make sure getGridSquare gets the gridSquare pointer at the location specified
   //Which in this case is the first gridSquare
   Arena arena(10,7);
   GridSquare *agridsquare = arena.getGridSquare(0,0);
-  EXPECT_EQ (agridsquare, arena.grid); 
+  EXPECT_EQ (agridsquare, arena.grid);
 }
 
 TEST ( ArenaTest, getGridSquare_two)
 {
-  //Tests if the gridSquare that getGridSquare picked up is the correct gridSquare 
+  //Tests if the gridSquare that getGridSquare picked up is the correct gridSquare
   //by counting the spaces in memory
   Arena arena(10,7);
   GridSquare *agridsquare = arena.getGridSquare(2,3);
-  EXPECT_EQ (agridsquare, arena.grid + 32); 
+  EXPECT_EQ (agridsquare, arena.grid + 32);
 }
 
 TEST (ArenaTest, getGridSquare_three)
@@ -90,7 +90,7 @@ TEST (ArenaTest, getGridSquare_three)
 
 TEST( ArenaTest, calcOffset2_one )
 {
-  //Checks to make sure calcOffset function returns 1 if the if-statements 
+  //Checks to make sure calcOffset function returns 1 if the if-statements
   //evaluate to false
   //failure case for first if-statement in calcOffset function
     Arena arena(10,7);
@@ -123,7 +123,7 @@ TEST(ArenaTest, calcOffset2_four)
   //failure case for second if-statement in calcOffset function
   Arena arena(10,7);
   GridSquare *agridSquare = arena.getGridSquare(15,10);
-  size_t sz;  
+  size_t sz;
   EXPECT_EQ (arena.calcOffset(agridSquare, sz), 1);
 }
 
@@ -135,7 +135,7 @@ TEST(ArenaTest, getGridSquareCoordinates_one)
   Point coordinate;
   std::cout << std::endl;
   std::cout << "The following error message is expected from this test." << std::endl;
-  EXPECT_EQ (arena.getGridSquareCoordinates(agridSquare, coordinate),1); 
+  EXPECT_EQ (arena.getGridSquareCoordinates(agridSquare, coordinate),1);
   std::cout << std::endl;
 }
 
@@ -151,11 +151,11 @@ TEST(ArenaTest, getGridSquareCoordinates_two)
 
 TEST(ArenaTest, getGridSquareCoordinates_three)
 {
-  //Tests the arithmetic within the getGridSquareCooordinates function 
+  //Tests the arithmetic within the getGridSquareCooordinates function
   //once the first if-statement evaluates to true
   Arena arena(10,7);
   GridSquare *agridSquare = arena.getGridSquare(9,6);
-  Point coordinate; 
+  Point coordinate;
   arena.getGridSquareCoordinates(agridSquare, coordinate);
   EXPECT_EQ (coordinate.x, 9);
   EXPECT_EQ (coordinate.y, 6);
@@ -163,8 +163,8 @@ TEST(ArenaTest, getGridSquareCoordinates_three)
 
 TEST(ArenaTest, movementCostEstimate_one)
 {
-  //Failure case for the if-statement 
-  //Ensures that the movementCostEstimate function fails appropiately 
+  //Failure case for the if-statement
+  //Ensures that the movementCostEstimate function fails appropiately
   Arena arena(10,7);
   GridSquare *agridSquare = arena.getGridSquare(11,3);
   GridSquare *anothergridSquare = arena.getGridSquare(12,4);
@@ -199,8 +199,8 @@ TEST(ArenaTest, movementCostEstimate_three)
 
 TEST(ArenaTest, distanceBetween_one)
 {
-  //Failure case for the if-statement 
-  //Ensures that the distanceBetween function fails appropiately 
+  //Failure case for the if-statement
+  //Ensures that the distanceBetween function fails appropiately
   Arena arena(10,7);
   GridSquare *agridSquare = arena.getGridSquare(11,3);
   GridSquare *anothergridSquare = arena.getGridSquare(12,4);
@@ -236,7 +236,7 @@ TEST(ArenaTest, distanceBetween_three)
 
 TEST(ArenaTest, blockunblock_one)
 {
-  //Tests to ensure that the block and unblock functions change the isBlocked member 
+  //Tests to ensure that the block and unblock functions change the isBlocked member
   //respective to their names
   Arena arena(10,7);
   GridSquare *agridSquare = arena.getGridSquare(1,2);
@@ -257,16 +257,16 @@ TEST(ArenaTest, mark_one)
 
 TEST(ArenaTest, getNeighbors_one)
 {
-  //Tests that error message displays when trying to 
+  //Tests that error message displays when trying to
   std::cout << std::endl;
   std::cout << "The following error messages are expected from this test." << std::endl;
   Arena arena(10,7);
-  std::vector<GridSquare*> neighbors;  
+  std::vector<GridSquare*> neighbors;
   GridSquare *agridSquare = arena.getGridSquare(11,22);
   neighbors = arena.getNeighbors(agridSquare);
-  int length = neighbors.size();  
+  int length = neighbors.size();
   std::cout << std::endl; std::cout << std::endl;
-  EXPECT_EQ (length, 0);  
+  EXPECT_EQ (length, 0);
 }
 
 TEST(ArenaTest, getNeighbors_two)
@@ -274,24 +274,24 @@ TEST(ArenaTest, getNeighbors_two)
   //Tests that getNeighbors returns the correct amount of neighbors within the vector
   Arena arena(3,3);
   GridSquare *agridSquare = arena.getGridSquare(1,1);
-  std::vector<GridSquare*> neighbors; 
+  std::vector<GridSquare*> neighbors;
   neighbors = arena.getNeighbors(agridSquare);
-  int length = neighbors.size();  
+  int length = neighbors.size();
   EXPECT_EQ (length, 8);
 }
 
 TEST(ArenaTest, getNeighbors_three)
 {
-  //Tests that getNeighbors returns the correct amount of neighbors when 
+  //Tests that getNeighbors returns the correct amount of neighbors when
   //certain neighbors are blocked
   Arena arena(3,3);
   GridSquare *agridSquare = arena.getGridSquare(1,1);
-  std::vector<GridSquare*> neighbors; 
+  std::vector<GridSquare*> neighbors;
   arena.block(0,0);
   arena.block(2,0);
   arena.block(2,2);
-  neighbors = arena.getNeighbors(agridSquare);  
-  int length = neighbors.size();  
+  neighbors = arena.getNeighbors(agridSquare);
+  int length = neighbors.size();
   EXPECT_EQ (length, 5);
 }
 
@@ -300,8 +300,8 @@ TEST(ArenaTest, getNeighbors_four)
   //Tests that getNeighbors returns the correct GridSquare pointers in the neighbors vector
   Arena arena(3,3);
   GridSquare *agridSquare = arena.getGridSquare(1,1);
-  std::vector<GridSquare*> neighbors; 
-  
+  std::vector<GridSquare*> neighbors;
+
   arena.block(0,0);
   GridSquare* n0_1 = arena.getGridSquare(0,1);//0,1
   GridSquare* n0_2 = arena.getGridSquare(0,2);//0,2
@@ -310,66 +310,66 @@ TEST(ArenaTest, getNeighbors_four)
   arena.block(2,0);
   GridSquare* n2_1 = arena.getGridSquare(2,1);//2,1
   arena.block(2,2);
-  
-  neighbors = arena.getNeighbors(agridSquare); 
+
+  neighbors = arena.getNeighbors(agridSquare);
   std::vector<GridSquare*>::iterator neighborsIterator;
-  
+
   //Test for (0,1) gridSquare
   bool n0_1_found_flag = false;
   neighborsIterator = find (neighbors.begin(),neighbors.end(), n0_1); //search for neighbor (0,1) in neighbors
   if (neighborsIterator != neighbors.end()) //if the value is found
     n0_1_found_flag = true; //change the found flag to true
-    
-    
+
+
   Point point;
   arena.getGridSquareCoordinates(*neighborsIterator,point);
   std::cout << point.x << " "<< point.y << std::endl;
-  
+
   EXPECT_EQ(n0_1_found_flag, true);
-  
+
   //Test for (0,2) gridSquare
   bool n0_2_found_flag = false;
   neighborsIterator = find (neighbors.begin(),neighbors.end(), n0_2); //search for neighbor (0,2) in neighbors
   if (neighborsIterator != neighbors.end()) //if the value is found
     n0_2_found_flag = true; //change the found flag to true
-    
+
   arena.getGridSquareCoordinates(*neighborsIterator,point);
   std::cout << point.x << " "<< point.y << std::endl;
-  
+
   EXPECT_EQ(n0_2_found_flag, true);
-  
+
    //Test for (1,0) gridSquare
   bool n1_0_found_flag = false;
   neighborsIterator = find (neighbors.begin(),neighbors.end(), n1_0); //search for neighbor (0,2) in neighbors
   if (neighborsIterator != neighbors.end()) //if the value is found
     n1_0_found_flag = true; //change the found flag to true
-    
+
   arena.getGridSquareCoordinates(*neighborsIterator,point);
   std::cout << point.x << " "<< point.y << std::endl;
-  
+
   EXPECT_EQ(n1_0_found_flag, true);
-  
+
    //Test for (1,2) gridSquare
   bool n1_2_found_flag = false;
   neighborsIterator = find (neighbors.begin(),neighbors.end(), n1_2); //search for neighbor (1,2) in neighbors
   if (neighborsIterator != neighbors.end()) //if the value is found
     n1_2_found_flag = true; //change the found flag to true
-    
+
   arena.getGridSquareCoordinates(*neighborsIterator,point);
   std::cout << point.x << " "<< point.y << std::endl;
-  
+
   EXPECT_EQ(n1_2_found_flag, true);
-  
+
    //Test for (2,1) gridSquare
   bool n2_1_found_flag = false;
   neighborsIterator = find (neighbors.begin(),neighbors.end(), n2_1); //search for neighbor (2,1) in neighbors
   if (neighborsIterator != neighbors.end()) //if the value is found
     n2_1_found_flag = true; //change the found flag to true
-    
+
   arena.getGridSquareCoordinates(*neighborsIterator,point);
   std::cout << point.x << " "<< point.y << std::endl;
-  
-  EXPECT_EQ(n2_1_found_flag, true); 
-  
-  
-}
\ No newline at end of file
+
+  EXPECT_EQ(n2_1_found_flag, true);
+
+
+}
diff --git a/trick_sims/SIM_wheelbot/models/Guidance/test/FindPathTest.cpp b/trick_sims/SIM_wheelbot/models/Guidance/test/FindPathTest.cpp
index 46b0febc..4de8a5ee 100644
--- a/trick_sims/SIM_wheelbot/models/Guidance/test/FindPathTest.cpp
+++ b/trick_sims/SIM_wheelbot/models/Guidance/test/FindPathTest.cpp
@@ -2,19 +2,19 @@
 #include "findpath.hh"
 #include "arena.hh"
 #include <algorithm>
-#include <vector> 
+#include <vector>
 
 TEST(FindPathTest, FindPath_one)
 {
  //Tests the failure case of the FindPath function
- //This is when the goal is completely blocked 
+ //This is when the goal is completely blocked
  Arena arena(10,7);
  Arena* testarena;
  testarena = &arena;
- 
+
  GridSquare *origin = arena.getGridSquare(2,1);
- GridSquare *goal = arena.getGridSquare(7,5); 
- 
+ GridSquare *goal = arena.getGridSquare(7,5);
+
  arena.block(7,4);
  arena.block(6,4);
  arena.block(8,4);
@@ -22,29 +22,29 @@ TEST(FindPathTest, FindPath_one)
  arena.block(8,5);
  arena.block(6,6);
  arena.block(8,6);
- 
+
  std::cout << std::endl;
-  
+
  std::vector<Point> returnvalue = FindPath(origin,goal,testarena);
- 
+
  std::cout << std::endl;
  std::cout << std::endl;
- 
+
  EXPECT_EQ(returnvalue.size(),0);
-  
+
 }
 
 TEST(FindPathTest, FindPath_two)
 {
- //Tests if FindPath finds a path 
+ //Tests if FindPath finds a path
  Arena arena(10,7);
  Arena* testarena;
  testarena = &arena;
- 
+
  GridSquare *origin = arena.getGridSquare(2,1);
- GridSquare *goal = arena.getGridSquare(7,5); 
- 
- 
+ GridSquare *goal = arena.getGridSquare(7,5);
+
+
  arena.block(2,0);
  arena.block(7,1);
  arena.block(0,2);
@@ -61,11 +61,11 @@ TEST(FindPathTest, FindPath_two)
  arena.block(2,5);
  arena.block(6,6);
  arena.block(7,6);
- 
+
  std::vector<Point> returnvalue = FindPath(origin,goal,testarena);
- 
+
  EXPECT_GT(returnvalue.size(),0);
-  
+
 }
 
 TEST(FindPathTest, FindPath_three)
@@ -74,11 +74,11 @@ TEST(FindPathTest, FindPath_three)
  Arena arena(10,7);
  Arena* testarena;
  testarena = &arena;
- 
+
  GridSquare *origin = arena.getGridSquare(2,1);
- GridSquare *goal = arena.getGridSquare(2,1); 
- 
- 
+ GridSquare *goal = arena.getGridSquare(2,1);
+
+
  arena.block(2,0);
  arena.block(7,1);
  arena.block(0,2);
@@ -95,11 +95,11 @@ TEST(FindPathTest, FindPath_three)
  arena.block(2,5);
  arena.block(6,6);
  arena.block(7,6);
- 
+
  std::vector<Point> returnvalue = FindPath(origin,goal,testarena);
- 
+
  EXPECT_EQ(returnvalue.size(),1);
-  
+
 }
 
 TEST(FindPathTest, FindPath_four)
@@ -108,12 +108,12 @@ TEST(FindPathTest, FindPath_four)
  Arena arena(10,7);
  Arena* testarena;
  testarena = &arena;
- 
+
  GridSquare *origin = arena.getGridSquare(11,13);
- GridSquare *goal = arena.getGridSquare(2,1); 
- 
- 
- 
+ GridSquare *goal = arena.getGridSquare(2,1);
+
+
+
  arena.block(2,0);
  arena.block(7,1);
  arena.block(0,2);
@@ -130,14 +130,14 @@ TEST(FindPathTest, FindPath_four)
  arena.block(2,5);
  arena.block(6,6);
  arena.block(7,6);
- 
+
  std::cout << std::endl;
  std::vector<Point> returnvalue = FindPath(origin,goal,testarena);
  std::cout << std::endl;
  std::cout << std::endl;
- 
+
  EXPECT_EQ(returnvalue.size(),0);
-  
+
 }
 
 TEST(FindPathTest, FindPath_five)
@@ -146,11 +146,11 @@ TEST(FindPathTest, FindPath_five)
  Arena arena(10,7);
  Arena* testarena;
  testarena = &arena;
- 
+
  GridSquare *origin = arena.getGridSquare(2,1);
- GridSquare *goal = arena.getGridSquare(11,12); 
- 
- 
+ GridSquare *goal = arena.getGridSquare(11,12);
+
+
  arena.block(2,0);
  arena.block(7,1);
  arena.block(0,2);
@@ -167,16 +167,16 @@ TEST(FindPathTest, FindPath_five)
  arena.block(2,5);
  arena.block(6,6);
  arena.block(7,6);
- 
+
  std::cout << std::endl;
- 
+
  std::vector<Point> returnvalue = FindPath(origin,goal,testarena);
- 
+
  std::cout << std::endl;
  std::cout << std::endl;
- 
+
  EXPECT_EQ(returnvalue.size(),0);
-  
+
 }
 
 /*TEST(FindPathTest, FindPath_three)
@@ -185,11 +185,11 @@ TEST(FindPathTest, FindPath_five)
   Arena arena(10,7);
  Arena* testarena;
  testarena = &arena;
- 
+
  GridSquare *origin = arena.getGridSquare(2,1);
- GridSquare *goal = arena.getGridSquare(7,5); 
- 
- 
+ GridSquare *goal = arena.getGridSquare(7,5);
+
+
  arena.block(2,0);
  arena.block(7,1);
  arena.block(0,2);
@@ -206,9 +206,9 @@ TEST(FindPathTest, FindPath_five)
  arena.block(2,5);
  arena.block(6,6);
  arena.block(7,6);
- 
+
  std::vector<Point> desiredvalues (7);
- 
+
  desiredvalues[0].x = 2;
  desiredvalues[0].y = 1;
  desiredvalues[1].x = 3;
@@ -223,9 +223,9 @@ TEST(FindPathTest, FindPath_five)
  desiredvalues[5].y = 5;
  desiredvalues[6].x = 7;
  desiredvalues[6].y = 5;
- 
+
  std::vector<Point> returnvalue = FindPath(origin,goal,testarena);
- 
+
  EXPECT_EQ(desiredvalues[0].x, returnvalue[0].x);
  EXPECT_EQ(desiredvalues[0].y, returnvalue[0].y);
  EXPECT_EQ(desiredvalues[1].x, returnvalue[1].x);
@@ -240,4 +240,4 @@ TEST(FindPathTest, FindPath_five)
  EXPECT_EQ(desiredvalues[5].y, returnvalue[5].y);
  EXPECT_EQ(desiredvalues[6].x, returnvalue[6].x);
  EXPECT_EQ(desiredvalues[6].y, returnvalue[6].y);
-}*/
\ No newline at end of file
+}*/
diff --git a/trick_sims/SIM_wheelbot/models/Guidance/test/NavigatorTest.cpp b/trick_sims/SIM_wheelbot/models/Guidance/test/NavigatorTest.cpp
index 4c0ad8db..53839335 100644
--- a/trick_sims/SIM_wheelbot/models/Guidance/test/NavigatorTest.cpp
+++ b/trick_sims/SIM_wheelbot/models/Guidance/test/NavigatorTest.cpp
@@ -38,13 +38,13 @@ TEST(NavigatorTest, distanceTo_three) {
 
 TEST(NavigatorTest, convertMapToPlatform_one)
 {
-  //Tests if the mapPoint gets converted to platform correctly 
+  //Tests if the mapPoint gets converted to platform correctly
   Point location(5,4);
-  Navigator navigator(PI/6, location);  
-  Point mapPoint(6,9);  
+  Navigator navigator(PI/6, location);
+  Point mapPoint(6,9);
   Point platformPoint;
   platformPoint = navigator.convertMapToPlatform(mapPoint);
-  
+
   EXPECT_EQ(platformPoint.x, 1);
   EXPECT_EQ(platformPoint.y, 5);
 }
@@ -111,23 +111,23 @@ TEST(NavigatorTest, convertPlatformToMap_one)
 {
   //Tests if Platform points get converted to mapPoints correctly
   Point location(-8,-9);
-  Navigator navigator(PI/6, location);    
-  Point platformPoint(11,4);  
+  Navigator navigator(PI/6, location);
+  Point platformPoint(11,4);
   Point mapPoint;
   mapPoint = navigator.convertPlatformToMap(platformPoint);
-  
+
   EXPECT_EQ (mapPoint.x, 3);
-  EXPECT_EQ (mapPoint.y, -5);  
+  EXPECT_EQ (mapPoint.y, -5);
 }
 
 TEST(NavigatorTest, bearingTo_one)
 {
   Point location(0,0);
-  Navigator navigator(PI/6, location);      
-  Point mapPoint(3,0);   
+  Navigator navigator(PI/6, location);
+  Point mapPoint(3,0);
   double bearing;
   bearing = navigator.bearingTo(mapPoint);
-  
+
   EXPECT_NEAR (bearing, (-PI/6), FP_TOLERANCE);
 }
 
@@ -138,6 +138,6 @@ TEST(NavigatorTest, bearingTo_two)
   Point mapPoint(20,20);
   double bearing;
   bearing = navigator.bearingTo(mapPoint);
-  std::cout << "bearing = " << bearing << std::endl; 
+  std::cout << "bearing = " << bearing << std::endl;
   EXPECT_NEAR (bearing, (-PI/6), FP_TOLERANCE);
 }
diff --git a/trick_sims/SIM_wheelbot/models/Motor/include/Motor.hh b/trick_sims/SIM_wheelbot/models/Motor/include/Motor.hh
index a87cbc6a..a8ec822e 100644
--- a/trick_sims/SIM_wheelbot/models/Motor/include/Motor.hh
+++ b/trick_sims/SIM_wheelbot/models/Motor/include/Motor.hh
@@ -11,10 +11,10 @@ class Motor
   public:
 
     Motor ();
-    
+
     virtual void update (const PWM& PulseWidth) = 0;
     virtual ~Motor();
-    
+
     virtual double getActualSpeed ();
 };
 #endif
diff --git a/trick_sims/SIM_wheelbot/models/Motor/include/ServoSpeedController.hh b/trick_sims/SIM_wheelbot/models/Motor/include/ServoSpeedController.hh
index 58398541..8f861a2d 100644
--- a/trick_sims/SIM_wheelbot/models/Motor/include/ServoSpeedController.hh
+++ b/trick_sims/SIM_wheelbot/models/Motor/include/ServoSpeedController.hh
@@ -4,7 +4,7 @@
 #include "motorSpeedController.hh"
 #include "ServoMotor.hh"
 
-class ServoSpeedController : public MotorSpeedController 
+class ServoSpeedController : public MotorSpeedController
 {
   public:
     ServoSpeedController (ServoMotor& Servo_Motor, char side);
@@ -17,4 +17,4 @@ class ServoSpeedController : public MotorSpeedController
     double _PulseWidth;
 }
 
-#endif
\ No newline at end of file
+#endif
diff --git a/trick_sims/SIM_wheelbot/models/Motor/src/ServoMotor.cpp b/trick_sims/SIM_wheelbot/models/Motor/src/ServoMotor.cpp
index 27c08e2e..8a70ceef 100644
--- a/trick_sims/SIM_wheelbot/models/Motor/src/ServoMotor.cpp
+++ b/trick_sims/SIM_wheelbot/models/Motor/src/ServoMotor.cpp
@@ -8,7 +8,7 @@ ServoMotor::ServoMotor (char side)
 double ServoMotor::getActualSpeed(int PulseWidth)
 {
   _PulseWidth = PulseWidth;
-  
+
   if (_side == 'L')
   {
      actualspeed = -1.8147280722744906e+001 * pow(_PulseWidth,0)
@@ -32,4 +32,4 @@ double ServoMotor::getActualSpeed(int PulseWidth)
 		    +  1.9140644089539568e-012 * pow(_PulseWidth,7);
   }
   return actualspeed;
-}
\ No newline at end of file
+}
diff --git a/trick_sims/SIM_wheelbot/models/Motor/src/ServoSpeedController.cpp b/trick_sims/SIM_wheelbot/models/Motor/src/ServoSpeedController.cpp
index 50b36b1d..b50da825 100644
--- a/trick_sims/SIM_wheelbot/models/Motor/src/ServoSpeedController.cpp
+++ b/trick_sims/SIM_wheelbot/models/Motor/src/ServoSpeedController.cpp
@@ -8,11 +8,11 @@ ServoSpeedController::ServoSpeedController(ServoMotor& Servo_Motor, char side):
 void ServoSpeedController::setCommandedSpeed (double commandedSpeed)
 {
   double PulseWidth;
-  
+
   if (_side == 'L')
-  {    
+  {
     std::cout <<"The left wheel desired speed is: " << desiredspeed << std::endl;
-    
+
     PulseWidth = 9.1296697267545980e+001 * pow(desiredspeed,0)
 		+  1.3551549019843796e+000 * pow(desiredspeed,1)
 		+ -2.5748263162935388e-002 * pow(desiredspeed,2)
@@ -20,15 +20,15 @@ void ServoSpeedController::setCommandedSpeed (double commandedSpeed)
 		+  3.8490572015823302e-004 * pow(desiredspeed,4)
 		+  4.5526955758039407e-005 * pow(desiredspeed,5)
 		+ -6.7622608926425730e-007 * pow(desiredspeed,6);
-    std::cout << "The pulse width for the side above is " << PulseWidth << std::endl; 
-  
-    _PulseWidth = (int)PulseWidth;  
-  } 
+    std::cout << "The pulse width for the side above is " << PulseWidth << std::endl;
+
+    _PulseWidth = (int)PulseWidth;
+  }
   else if(_side == 'R')
   {
-   
+
     std::cout <<"The right wheel desired speed is: " << desiredspeed << std::endl;
-    
+
     PulseWidth = 9.1296697267545980e+001 * pow(desiredspeed,0)
 		  + -1.3551549019843796e+000 * pow(desiredspeed,1)
 		  + -2.5748263162935388e-002 * pow(desiredspeed,2)
@@ -36,11 +36,11 @@ void ServoSpeedController::setCommandedSpeed (double commandedSpeed)
 		  +  3.8490572015823302e-004 * pow(desiredspeed,4)
 		  + -4.5526955758039407e-005 * pow(desiredspeed,5)
 		  + -6.7622608926425730e-007 * pow(desiredspeed,6);
-    std::cout << "The pulse width for the side above is " << PulseWidth << std::endl; 
-  
-    _PulseWidth = (int)PulseWidth;  
+    std::cout << "The pulse width for the side above is " << PulseWidth << std::endl;
+
+    _PulseWidth = (int)PulseWidth;
   }
-  
+
   if (_PulseWidth > 180)
   {
     _PulseWidth = 180;
@@ -49,11 +49,11 @@ void ServoSpeedController::setCommandedSpeed (double commandedSpeed)
   {
     _PulseWidth = 0;
   }
-  
+
   if (_side == 'L')
     std::cout<<"Left Servo angle is: " << _PulseWidth <<std::endl;
   else if (_side == 'R')
     std::cout<<"Right Servo angle is: "<< _PulseWidth <<std::endl;
-    
+
   //return _PulseWidth;
-}
\ No newline at end of file
+}
diff --git a/trick_sims/SIM_wheelbot/models/Motor/test/DCMotorTest.cpp b/trick_sims/SIM_wheelbot/models/Motor/test/DCMotorTest.cpp
index ff6b21cf..89f626c3 100644
--- a/trick_sims/SIM_wheelbot/models/Motor/test/DCMotorTest.cpp
+++ b/trick_sims/SIM_wheelbot/models/Motor/test/DCMotorTest.cpp
@@ -3,10 +3,10 @@
 #include "DCMotor.hh"
 
 TEST( MotorModelTest , one ) {
-    // Attempt to create a Motor 
+    // Attempt to create a Motor
    DCMotor * motor;
    motor = new DCMotor(8.0, 7.0);
-   EXPECT_NE( (void*)0, motor); 
+   EXPECT_NE( (void*)0, motor);
    //delete motor;
 }
 
@@ -51,7 +51,7 @@ TEST( MotorModelTest , seven ) {
     double motorVoltage = (16.0);
     motor.update (motorVoltage );
     EXPECT_DOUBLE_EQ( 14.0, motor.motorTorque );
-    
+
 }
 
 TEST( MotorModelTest , eight ) {
@@ -60,7 +60,7 @@ TEST( MotorModelTest , eight ) {
     double motorVoltage = (16.0);
     motor.update (motorVoltage );
     EXPECT_DOUBLE_EQ( 2.0, motor.motorCurrent );
-    
+
 }
 
 TEST( MotorModelTest , nine ) {
@@ -69,7 +69,7 @@ TEST( MotorModelTest , nine ) {
     double motorVoltage = (24.0);
     motor.update (motorVoltage );
     EXPECT_DOUBLE_EQ( 3.0, motor.currentLoad );
-    
+
 }
 
 
@@ -79,5 +79,5 @@ TEST( MotorModelTest , ten ) {
     double motorVoltage = (-24.0);
     motor.update (motorVoltage );
     EXPECT_DOUBLE_EQ( 3.0, motor.currentLoad );
-    
+
 }
diff --git a/trick_source/codegen/Interface_Code_Gen/FieldVisitor.cpp b/trick_source/codegen/Interface_Code_Gen/FieldVisitor.cpp
index b113878b..0ff0dcf9 100644
--- a/trick_source/codegen/Interface_Code_Gen/FieldVisitor.cpp
+++ b/trick_source/codegen/Interface_Code_Gen/FieldVisitor.cpp
@@ -414,7 +414,7 @@ bool FieldVisitor::VisitRecordType(clang::RecordType *rt) {
        The attributes type is set to TRICK_STRING instead of TRICK_STRUCTURE.
        The type is set to std::string.  We can return false here to stop processing of this type. */
     std::string type_name = rt->getDecl()->getQualifiedNameAsString() ;
-    if ( ! type_name.compare("std::basic_string") || !type_name.compare("std::__1::basic_string") || 
+    if ( ! type_name.compare("std::basic_string") || !type_name.compare("std::__1::basic_string") ||
          ! type_name.compare("std::__cxx11::basic_string") ) {
         fdes->setEnumString("TRICK_STRING") ;
         fdes->setTypeName("std::string") ;
diff --git a/trick_source/data_products/Apps/ExternalPrograms/dp_lvlh.c b/trick_source/data_products/Apps/ExternalPrograms/dp_lvlh.c
index ae018396..cffe3317 100644
--- a/trick_source/data_products/Apps/ExternalPrograms/dp_lvlh.c
+++ b/trick_source/data_products/Apps/ExternalPrograms/dp_lvlh.c
@@ -1,6 +1,6 @@
 /*
 PURPOSE:
-       (Compute LVLH relative position and velocity given 
+       (Compute LVLH relative position and velocity given
         two inertial state vectors)
 
 REFERENCE:
diff --git a/trick_source/data_products/Apps/ExternalPrograms/dp_quat_inrtl_attitude.c b/trick_source/data_products/Apps/ExternalPrograms/dp_quat_inrtl_attitude.c
index c4c47ccd..3efc9af9 100644
--- a/trick_source/data_products/Apps/ExternalPrograms/dp_quat_inrtl_attitude.c
+++ b/trick_source/data_products/Apps/ExternalPrograms/dp_quat_inrtl_attitude.c
@@ -1,6 +1,6 @@
 /*
 PURPOSE:
-     (Extract Inertial referenced Euler angles from a body to inertial 
+     (Extract Inertial referenced Euler angles from a body to inertial
        quaternian)
 
 REFERENCE:
@@ -10,8 +10,8 @@ ASSUMPTIONS AND LIMITATIONS:
      ((Euler sequence is input interactively by user.))
 
 PROGRAMMERS:
-     (((Robert W. Bailey) (LinCom Corp) (4/9/91) 
-       (Trick-CR-00004) (Gravity / Inertial Frame Models)) 
+     (((Robert W. Bailey) (LinCom Corp) (4/9/91)
+       (Trick-CR-00004) (Gravity / Inertial Frame Models))
        ((David Strack) (LinCom Corp) (3/19/96) (Implemented for ICDS models))
        (Dorci L. Smith) (TSC-AEU) (May 2002) (Reduce ext program size))
 */
diff --git a/trick_source/data_products/Apps/Trk2csv/trk2ascii.cpp b/trick_source/data_products/Apps/Trk2csv/trk2ascii.cpp
index 9776d566..57f09842 100644
--- a/trick_source/data_products/Apps/Trk2csv/trk2ascii.cpp
+++ b/trick_source/data_products/Apps/Trk2csv/trk2ascii.cpp
@@ -30,14 +30,14 @@ static const char *usage_doc[] = {
 
 void print_doc(char *doc[], int nlines) {
     int i;
-    for (i=0; i < nlines; i++) { 
+    for (i=0; i < nlines; i++) {
         cerr << doc[i] << '\n';
     }
     cerr.flush();
 }
 
 void usage() {
-    print_doc((char **)usage_doc,N_USAGE_LINES); 
+    print_doc((char **)usage_doc,N_USAGE_LINES);
 }
 
 int main(int argc, char* argv[])
@@ -107,7 +107,7 @@ int main(int argc, char* argv[])
                 exit(EXIT_FAILURE);
             }
         }
-    } 
+    }
 
     if (trk_file_name == NULL) {
         cerr << prog_name << ": No Trick binary data file name was supplied.\n";
@@ -132,7 +132,7 @@ int main(int argc, char* argv[])
         cerr << "No parameters found in the Trk data log file.\n";
         cerr.flush();
         exit(EXIT_FAILURE);
-    } 
+    }
 
     if (( param_names = TrickBinaryGetVariableNames(trk_file_name)) == NULL ) {
         cerr << "Unable get parameter names from the Trk data log file.\n";
diff --git a/trick_source/data_products/DPX/APPS/FXPLOT/fxplot.cpp b/trick_source/data_products/DPX/APPS/FXPLOT/fxplot.cpp
index 9c3e217d..33951f6f 100644
--- a/trick_source/data_products/DPX/APPS/FXPLOT/fxplot.cpp
+++ b/trick_source/data_products/DPX/APPS/FXPLOT/fxplot.cpp
@@ -506,7 +506,7 @@ class FplotArgs {
                 device = strdup(cp);
 
             } else {
-                session_file = argv[ii]; 
+                session_file = argv[ii];
                 if ( access( session_file, R_OK|F_OK ) ) {
                     if (session_file == NULL) {
                         throw std::invalid_argument("Can't find/read session file.");
@@ -521,7 +521,7 @@ class FplotArgs {
     }
 
     private:
-       FplotArgs() {}; 
+       FplotArgs() {};
 };
 
 void usage()
@@ -554,7 +554,7 @@ int main(int argc, char* argv[] ) {
     } catch (std::invalid_argument) {
         usage();
         exit(1);
-    } 
+    }
 
     XtSetLanguageProc (NULL, NULL, NULL);
 
diff --git a/trick_source/data_products/DPX/APPS/FXPLOT/page_view_node.cpp b/trick_source/data_products/DPX/APPS/FXPLOT/page_view_node.cpp
index 774dd5d3..5aab5308 100644
--- a/trick_source/data_products/DPX/APPS/FXPLOT/page_view_node.cpp
+++ b/trick_source/data_products/DPX/APPS/FXPLOT/page_view_node.cpp
@@ -507,7 +507,7 @@ void PageViewNode::print() {
 
 void PageViewNode::generate_PS(const char* ps_file_name) {
 
-    // Generate Postscript    
+    // Generate Postscript
     int i, n_plots ;
     int n_horizontal_cells, n_vertical_cells;
     Widget *xy_widget_list;
diff --git a/trick_source/data_products/DPX/APPS/FXPLOT/plot_view_node.cpp b/trick_source/data_products/DPX/APPS/FXPLOT/plot_view_node.cpp
index cf6ae491..9eec3490 100644
--- a/trick_source/data_products/DPX/APPS/FXPLOT/plot_view_node.cpp
+++ b/trick_source/data_products/DPX/APPS/FXPLOT/plot_view_node.cpp
@@ -21,7 +21,7 @@
 #endif
 
 // our line colors for multiple curves on same plot
-#define NUM_COLORS 16 
+#define NUM_COLORS 16
 static const char* colors[NUM_COLORS] = {
     "#000000",       // black
     "#ff0000",       // red
diff --git a/trick_source/data_products/DPX/APPS/GXPLOT/gp_utilities.cpp b/trick_source/data_products/DPX/APPS/GXPLOT/gp_utilities.cpp
index 0c11d754..b6a7a065 100644
--- a/trick_source/data_products/DPX/APPS/GXPLOT/gp_utilities.cpp
+++ b/trick_source/data_products/DPX/APPS/GXPLOT/gp_utilities.cpp
@@ -52,7 +52,7 @@ int filterPostScriptColor( const char *psName, GPViewPageNode* gp_view_page_node
     string directive;
     string page_fg_color = "";
     string page_bg_color = "";
-    int i; 
+    int i;
     int total_num_curves = 0 ;
     string next_lt ;
     string new_buf_ptr ;
diff --git a/trick_source/data_products/DPX/APPS/GXPLOT/gp_view_curve_node.cpp b/trick_source/data_products/DPX/APPS/GXPLOT/gp_view_curve_node.cpp
index 17bec880..91521f85 100644
--- a/trick_source/data_products/DPX/APPS/GXPLOT/gp_view_curve_node.cpp
+++ b/trick_source/data_products/DPX/APPS/GXPLOT/gp_view_curve_node.cpp
@@ -67,7 +67,7 @@ GPViewCurveNode::GPViewCurveNode( Widget          Toplevel,
         curve_y_label = Curve->getYAttribute("label");
     } else {
         std::string curve_y_units    = (dpc_curve->getYAttribute("units")) ?  dpc_curve->getYAttribute("units") : "1";
-        curve_y_label    = curve_y_var_name + "(" + curve_y_units + ")"; 
+        curve_y_label    = curve_y_var_name + "(" + curve_y_units + ")";
     }
 
     std::string curve_title = curve_y_label + " VS. " + curve_x_label + " ["+data_src_label+"]";
diff --git a/trick_source/data_products/DPX/APPS/GXPLOT/gxplot.cpp b/trick_source/data_products/DPX/APPS/GXPLOT/gxplot.cpp
index c9aa2f94..c65c4857 100644
--- a/trick_source/data_products/DPX/APPS/GXPLOT/gxplot.cpp
+++ b/trick_source/data_products/DPX/APPS/GXPLOT/gxplot.cpp
@@ -71,7 +71,7 @@ int main(int argc, char * argv[] ) {
     //Make a DPM_session parse tree
     try {
         session_parse_tree = new DPM_parse_tree(session_file_name);
-    } 
+    }
     catch (std::invalid_argument) {
         cerr << "ERROR: <session> specification is invalid and un-usable. Quitting." << endl;
         exit(1);
@@ -82,7 +82,7 @@ int main(int argc, char * argv[] ) {
     //Make a DPM_session object
     try {
         session = new DPM_session( NULL, root_node);
-    } 
+    }
     catch (std::invalid_argument) {
         cerr << "ERROR: <session> specification is invalid and un-usable. Quitting." << endl;
         exit(1);
@@ -97,7 +97,7 @@ int main(int argc, char * argv[] ) {
     for (product_ix = 0; product_ix < n_product_files; product_ix++ ) {
 
         DPC_product *product;
-        
+
         char product_file_fullname[1024];
 
         const char *product_file_name = session->product_file_list[product_ix];
@@ -106,7 +106,7 @@ int main(int argc, char * argv[] ) {
         if (file_exists( product_file_name)) {
 
              strcpy(product_file_fullname, product_file_name );
-        } 
+        }
         else {
 
              copy_prefix(product_file_fullname, session_file_name);
@@ -117,7 +117,7 @@ int main(int argc, char * argv[] ) {
         try {
 
             product = new DPC_product( session, product_file_fullname);
-        } 
+        }
         catch  (std::invalid_argument) {
 
             cerr << "ERROR: Unable to create the product specified by file: \"" << product_file_name << "\"" << endl;
diff --git a/trick_source/data_products/DPX/DPC/DPC_TimeCstrDataStream.cpp b/trick_source/data_products/DPX/DPC/DPC_TimeCstrDataStream.cpp
index 4d5aae22..a04a2432 100644
--- a/trick_source/data_products/DPX/DPC/DPC_TimeCstrDataStream.cpp
+++ b/trick_source/data_products/DPX/DPC/DPC_TimeCstrDataStream.cpp
@@ -5,7 +5,7 @@
 // whether or not the current/next pair exist.
 // 0 - exists
 // 1 - does not exist
-// 
+//
 // !bix: index of the current time/value pair
 // bix: index of the next time/value pair
 //
diff --git a/trick_source/data_products/DPX/DPC/DPC_UnitConvDataStream.cpp b/trick_source/data_products/DPX/DPC/DPC_UnitConvDataStream.cpp
index 44526f20..8bd1a540 100644
--- a/trick_source/data_products/DPX/DPC/DPC_UnitConvDataStream.cpp
+++ b/trick_source/data_products/DPX/DPC/DPC_UnitConvDataStream.cpp
@@ -23,7 +23,7 @@ DPC_UnitConvDataStream::DPC_UnitConvDataStream(DataStream* ds, const char *ToUni
 
     // If the user has specified a units conversion and those units are valid ...
     if ( to != NULL ) {
-        // If the recorded data file doesn't contain the units in which the data is recorded ... 
+        // If the recorded data file doesn't contain the units in which the data is recorded ...
         if ((recorded_units == NULL) || (strcmp(recorded_units,"") == 0)) {
             // If the user didn't give us a hint as to what the units are (using var@from_units) ...
             if ((FromUnitsHint == NULL) || (strcmp(FromUnitsHint,"") == 0)) {
@@ -71,7 +71,7 @@ DPC_UnitConvDataStream::DPC_UnitConvDataStream(DataStream* ds, const char *ToUni
             cf = cv_get_trivial() ;
         }
     } else { // The user has not specified a units conversion or the units were not valid.
-        // If the recorded data file doesn't contain the units in which the data is recorded ... 
+        // If the recorded data file doesn't contain the units in which the data is recorded ...
         if ((recorded_units == NULL) || (strcmp(recorded_units,"") == 0)) {
             // If the user didn't give us a hint as to what the units are (using var@from_units) ...
             if ((FromUnitsHint == NULL) || (strcmp(FromUnitsHint,"") == 0)) {
diff --git a/trick_source/data_products/DPX/DPC/DPC_column_info.hh b/trick_source/data_products/DPX/DPC/DPC_column_info.hh
index bcd0a09b..295a930b 100644
--- a/trick_source/data_products/DPX/DPC/DPC_column_info.hh
+++ b/trick_source/data_products/DPX/DPC/DPC_column_info.hh
@@ -14,7 +14,7 @@ public:
         var = Var;
         units = strdup(Units_s);
         ds_ix = DS_ix;
-		time_conversion = Conversion_fn; 
+		time_conversion = Conversion_fn;
     }
 
     DPM_var    *var;
diff --git a/trick_source/data_products/DPX/DPC/DPC_datastream_supplier.cpp b/trick_source/data_products/DPX/DPC/DPC_datastream_supplier.cpp
index 1bba94e3..970aa82d 100644
--- a/trick_source/data_products/DPX/DPC/DPC_datastream_supplier.cpp
+++ b/trick_source/data_products/DPX/DPC/DPC_datastream_supplier.cpp
@@ -5,7 +5,7 @@
 
 // CONSTRUCTOR
 DPC_datastream_supplier::DPC_datastream_supplier( DPM_product *Product ) {
-  
+
     product = Product;
     data_stream_factory = new DataStreamFactory();
 }
@@ -28,7 +28,7 @@ DataStream *DPC_datastream_supplier::getDataStream( const char *VarName,
 
     DataStream *ds = NULL;
     DataStream *tds = NULL;
-    DataStream *utds = NULL;  
+    DataStream *utds = NULL;
 
     const char *run_dir  = Run->getDir() ;
     const char *timename = Run->getTimeName() ;
@@ -49,20 +49,20 @@ DataStream *DPC_datastream_supplier::getDataStream( const char *VarName,
 
             n_inputs  = extfn->NumberOfInputs();
             n_outputs = extfn->NumberOfOutputs();
-      
+
             instreams = (DataStream**)calloc( sizeof( DataStream*), (size_t)n_inputs );
-      
+
             for (input_ix =0 ; input_ix < n_inputs ; input_ix++) {
                 instreams[input_ix] =
                     data_stream_factory->create( run_dir,
                                                  extfn->getInputVar( input_ix),
-                                                 timename ); 
-            } 
+                                                 timename );
+            }
 
             ds = data_stream_factory->create( extfn->getFName(), n_inputs, instreams, n_outputs, output_index);
         }
     }
-  
+
     if (ds == NULL) {
         ds = data_stream_factory->create( run_dir, VarName, timename);
     }
@@ -88,10 +88,10 @@ DataStream *DPC_datastream_supplier::getDataStream( const char *VarName,
 						    const char *Machine,
 						    const unsigned short Port,
 						    DPM_time_constraints* in_time_constraints ) {
-  
+
     DataStream *ds = NULL;
     DataStream *tds = NULL;
-    DataStream *utds = NULL;  
+    DataStream *utds = NULL;
 
     ds = data_stream_factory->create( Machine, Port , VarName);
 
diff --git a/trick_source/data_products/DPX/DPC/DPC_delta_curve.cpp b/trick_source/data_products/DPX/DPC/DPC_delta_curve.cpp
index 68eadaf7..de70ed9a 100644
--- a/trick_source/data_products/DPX/DPC/DPC_delta_curve.cpp
+++ b/trick_source/data_products/DPX/DPC/DPC_delta_curve.cpp
@@ -130,13 +130,13 @@ DPC_delta_curve::DPC_delta_curve( DPM_curve*               Curve_spec,
 
     // Make sure we know what units we're actually getting from DataStream #2.
     run2_ds_units = ds[1]->getUnit().c_str();
-    
-    // ds1 and ds2 had better be supplying the same units. 
+
+    // ds1 and ds2 had better be supplying the same units.
     if ( run1_ds_units != run2_ds_units ) {
         std::cerr << "ERROR: The two data streams of a delta plot have different units." << std::endl;
         std::cerr.flush();
         throw(std::logic_error("Failed to create DataStream"));
-    } 
+    }
 
     y_actual_units = strdup( run1_ds_units.c_str());
 
@@ -152,19 +152,19 @@ DPC_delta_curve::DPC_delta_curve( DPM_curve*               Curve_spec,
     // ------------------------
     work[0] ='\0';
     if ((temp_s = strrchr(run_dir1,'/')) != NULL) {
-        strcpy(work, temp_s+1); 
+        strcpy(work, temp_s+1);
     } else {
-        strcpy(work, run_dir1); 
-    } 
-    strcat(work, " - "); 
+        strcpy(work, run_dir1);
+    }
+    strcat(work, " - ");
     if ((temp_s = strrchr(run_dir2,'/')) != NULL) {
-        strcat(work, temp_s+1); 
+        strcat(work, temp_s+1);
     } else {
-        strcat(work, run_dir2); 
-    } 
+        strcat(work, run_dir2);
+    }
     data_src_label = strdup(work);
 }
-                                           
+
 // DESTRUCTOR
 DPC_delta_curve::~DPC_delta_curve() {
 
@@ -215,7 +215,7 @@ int DPC_delta_curve::getXY(double *X_value, double *Y_value) {
             eos = ! ds[1]->get( &t2, &v2);
         }
     }
-    if (!eos) { 
+    if (!eos) {
         *X_value = cv_convert_double(time_conversion,t1);
         *Y_value = v1 - v2;
         return(1);
diff --git a/trick_source/data_products/DPX/DPC/DPC_page.cpp b/trick_source/data_products/DPX/DPC/DPC_page.cpp
index 3af7dedc..5d5f10c5 100644
--- a/trick_source/data_products/DPX/DPC/DPC_page.cpp
+++ b/trick_source/data_products/DPX/DPC/DPC_page.cpp
@@ -74,7 +74,7 @@ DPC_page::DPC_page( DPC_datastream_supplier *DS_Supplier,
                 try {
                     // Make a plot.
                     plot = new DPC_delta_plot( DS_Supplier,
-                                               RunListp, 
+                                               RunListp,
                                                relation,
                                                &total_time_constraints );
                     // Put the new plot in the plot list.
diff --git a/trick_source/data_products/DPX/DPC/DPC_page.hh b/trick_source/data_products/DPX/DPC/DPC_page.hh
index 14bdd05b..e18052b6 100644
--- a/trick_source/data_products/DPX/DPC/DPC_page.hh
+++ b/trick_source/data_products/DPX/DPC/DPC_page.hh
@@ -46,9 +46,9 @@ public:
      */
     void notify( DPV_view *view, DPV_message msg);
 
-// ============================ 
+// ============================
 // DPV_VIEW INTERFACE FUNCTIONS
-// ============================ 
+// ============================
 
     /**
      * Return the value of the attribute (if any) associated with the key.
diff --git a/trick_source/data_products/DPX/DPC/DPC_plot.hh b/trick_source/data_products/DPX/DPC/DPC_plot.hh
index e4205a75..0486a798 100644
--- a/trick_source/data_products/DPX/DPC/DPC_plot.hh
+++ b/trick_source/data_products/DPX/DPC/DPC_plot.hh
@@ -58,9 +58,9 @@ public:
         return( relation->setTitle(in_title));
     }
 
-// ============================ 
+// ============================
 // DPV_VIEW INTERFACE FUNCTIONS
-// ============================ 
+// ============================
 
     /**
      * Return the value of the attribute (if any) associated with the key.
diff --git a/trick_source/data_products/DPX/DPC/DPC_product.cpp b/trick_source/data_products/DPX/DPC/DPC_product.cpp
index 4c1832dd..687e3039 100644
--- a/trick_source/data_products/DPX/DPC/DPC_product.cpp
+++ b/trick_source/data_products/DPX/DPC/DPC_product.cpp
@@ -63,7 +63,7 @@ DPC_product::DPC_product( DPM_session          *Session,
     const char* session_mode = Session->AttributeValue("mode");
 
     if ((session_mode == NULL) || (strcasecmp( session_mode, "plot") == 0)) {
- 
+
         // ###############################################################
         // Create subordinate pages.
         // ###############################################################
diff --git a/trick_source/data_products/DPX/DPC/DPC_product.hh b/trick_source/data_products/DPX/DPC/DPC_product.hh
index dc4a4fc8..16b39545 100644
--- a/trick_source/data_products/DPX/DPC/DPC_product.hh
+++ b/trick_source/data_products/DPX/DPC/DPC_product.hh
@@ -66,9 +66,9 @@ public:
      */
     DPC_table *getTable( unsigned int index);
 
-// ============================ 
+// ============================
 // VIEW INTERFACE FUNCTIONS
-// ============================ 
+// ============================
 
     /**
      * Get the title of the product;
diff --git a/trick_source/data_products/DPX/DPC/DPC_std_curve.cpp b/trick_source/data_products/DPX/DPC/DPC_std_curve.cpp
index b7ec0fc5..75be954b 100644
--- a/trick_source/data_products/DPX/DPC/DPC_std_curve.cpp
+++ b/trick_source/data_products/DPX/DPC/DPC_std_curve.cpp
@@ -8,7 +8,7 @@ extern ut_system * u_system ;
 
 // CONSTRUCTOR
 DPC_std_curve::DPC_std_curve(
-                             DPM_curve*               Curve_spec, 
+                             DPM_curve*               Curve_spec,
                              DPM_run*                 Run,
                              DPC_datastream_supplier *ds_supplier,
                              DPM_time_constraints    *Time_constraints ) throw (std::logic_error)
@@ -22,8 +22,8 @@ DPC_std_curve::DPC_std_curve(
     const char*  run_dir = Run->getDir();
     unsigned int number_of_cases = Curve_spec->NumberOfVarCases();
 
-    x_actual_units = NULL;  
-    y_actual_units = NULL;  
+    x_actual_units = NULL;
+    y_actual_units = NULL;
 
     data_src_label = NULL;
     time_conversion = NULL;
@@ -120,9 +120,9 @@ DPC_std_curve::DPC_std_curve(
                 // We've successfully initialized our curve from the variable-pair.
                 success = 1;
 
-            } else {        
+            } else {
                 std::cerr << "ERROR: Variable \"" << y_var_name << "\" was\'nt found in " << std::endl
-                          << "Run Directory \"" << run_dir << "\"" << std::endl; 
+                          << "Run Directory \"" << run_dir << "\"" << std::endl;
                 std::cerr.flush();
             }
 
@@ -155,12 +155,12 @@ DPC_std_curve::DPC_std_curve(
                 } else {
                     delete ds[0]; ds[0] = NULL;
                     std::cerr << "Variable \"" << y_var_name << "\" was\'nt found in " << std::endl
-                              << "Run Directory \"" << run_dir << "\"" << std::endl; 
+                              << "Run Directory \"" << run_dir << "\"" << std::endl;
                     std::cerr.flush();
                 }
             } else {
                 std::cerr << "Variable \"" << x_var_name << "\" was\'nt found in " << std::endl
-                          << "Run Directory \"" << run_dir << "\"" << std::endl; 
+                          << "Run Directory \"" << run_dir << "\"" << std::endl;
                 std::cerr.flush();
             }
         }
@@ -188,7 +188,7 @@ DPC_std_curve::DPC_std_curve(
 DPC_std_curve::~DPC_std_curve() {
 
     // We ONLY delete what we create.
-    if ( ds[0] ) { 
+    if ( ds[0] ) {
         delete ds[0];
         ds[0] = NULL;
     };
diff --git a/trick_source/data_products/DPX/DPC/DPC_table.cpp b/trick_source/data_products/DPX/DPC/DPC_table.cpp
index ee4a18c3..b219a0c7 100644
--- a/trick_source/data_products/DPX/DPC/DPC_table.cpp
+++ b/trick_source/data_products/DPX/DPC/DPC_table.cpp
@@ -156,7 +156,7 @@ DPC_table::~DPC_table() {
         if (ds) { delete ds; }
     }
 
-    if (dsData) { delete dsData; } 
+    if (dsData) { delete dsData; }
 }
 
 // MEMBER FUNCTION
diff --git a/trick_source/data_products/DPX/DPM/DPM_column.cpp b/trick_source/data_products/DPX/DPM/DPM_column.cpp
index 9e39eaec..ac16e83f 100644
--- a/trick_source/data_products/DPX/DPM/DPM_column.cpp
+++ b/trick_source/data_products/DPX/DPM/DPM_column.cpp
@@ -113,7 +113,7 @@ std::ostream& operator<< (std::ostream& s, const DPM_column *column) {
   }
 
   s << column->column_var;
-  
+
 
   s << "</column>";
   s << std::endl;
diff --git a/trick_source/data_products/DPX/DPM/DPM_curve.cpp b/trick_source/data_products/DPX/DPM/DPM_curve.cpp
index e2e15ee6..7f012627 100644
--- a/trick_source/data_products/DPX/DPM/DPM_curve.cpp
+++ b/trick_source/data_products/DPX/DPM/DPM_curve.cpp
@@ -57,7 +57,7 @@ int DPM_curve::Initialize(xmlNode *base_node) {
                            std::cerr << "       elements in a <curve>."                << std::endl;
                            return -1;
                        break;
-                       } 
+                       }
                    }
                    axis_index++;
                } else {
@@ -72,7 +72,7 @@ int DPM_curve::Initialize(xmlNode *base_node) {
               if (current_node->type == XML_ELEMENT_NODE) {
                   if ( strcmp( (const char *)current_node->name, "varcase") == 0) {
                       xmlNode *child_current_node = current_node->children;
-                      axis_index = 0; 
+                      axis_index = 0;
                       while (child_current_node != NULL) {
                           if (child_current_node->type == XML_ELEMENT_NODE) {
                               if ( strcmp( (const char *)child_current_node->name, "var") == 0) {
@@ -95,7 +95,7 @@ int DPM_curve::Initialize(xmlNode *base_node) {
                                               std::cerr << "       elements in a <varcase>."              << std::endl;
                                               return -1;
                                           break;
-                                      } 
+                                      }
                                   }
                                   axis_index++;
                               } else {
@@ -122,7 +122,7 @@ int DPM_curve::Initialize(xmlNode *base_node) {
 
     if ( !(number_of_axes == 2) && !(number_of_axes == 3)) {
         return -1;
-    } 
+    }
 
     return 0;
 }
@@ -138,7 +138,7 @@ DPM_curve::DPM_curve(DPM_component *Parent, xmlNode *Base_node)  throw (std::inv
 
 // MEMBER FUNCTION
 DPM_curve::~DPM_curve() {
-  
+
 // FIXME delete all of the elements of the varcase lists.
   if (x_varcase_list.size()) { x_varcase_list.clear(); }
   if (y_varcase_list.size()) { y_varcase_list.clear(); }
@@ -207,7 +207,7 @@ DPM_var *DPM_curve::getZVar(unsigned int index) {
 const char * DPM_curve::getXVarName(unsigned int case_index) {
   if (case_index < x_varcase_list.size())  {
     return ( x_varcase_list[case_index]->getName());
-  } else { 
+  } else {
     return NULL;
   }
 }
@@ -216,7 +216,7 @@ const char * DPM_curve::getXVarName(unsigned int case_index) {
 const char * DPM_curve::getYVarName(unsigned int case_index) {
   if (case_index < y_varcase_list.size())  {
     return ( y_varcase_list[case_index]->getName());
-  } else { 
+  } else {
     return NULL;
   }
 }
@@ -225,7 +225,7 @@ const char * DPM_curve::getYVarName(unsigned int case_index) {
 const char * DPM_curve::getZVarName(unsigned int case_index) {
   if (case_index < z_varcase_list.size())  {
     return ( z_varcase_list[case_index]->getName());
-  } else { 
+  } else {
     return NULL;
   }
 }
@@ -244,7 +244,7 @@ const char * DPM_curve::getXCommonName() {
      if (strcmp( candidate_label, short_name) != 0 ) {
         return (NULL);
      }
-  } 
+  }
   return ( candidate_label);
 }
 
@@ -262,7 +262,7 @@ const char * DPM_curve::getYCommonName() {
      if (strcmp( candidate_label, short_name) != 0 ) {
         return (NULL);
      }
-  } 
+  }
   return ( candidate_label);
 }
 
@@ -280,7 +280,7 @@ const char * DPM_curve::getZCommonName() {
      if (strcmp( candidate_label, short_name) != 0 ) {
         return (NULL);
      }
-  } 
+  }
   return ( candidate_label);
 }
 
diff --git a/trick_source/data_products/DPX/DPM/DPM_extfn.cpp b/trick_source/data_products/DPX/DPM/DPM_extfn.cpp
index 4ad553e3..e10a2650 100644
--- a/trick_source/data_products/DPX/DPM/DPM_extfn.cpp
+++ b/trick_source/data_products/DPX/DPM/DPM_extfn.cpp
@@ -13,7 +13,7 @@ int DPM_extfn::Initialize( xmlNode *base_node) {
     if ( strcmp( (char *)base_node->name, "extfn") != 0) {
         std::cerr << "ERROR: Expected <extfn> specification but didnt find it." << std::endl;
         return -1;
-    } 
+    }
 
     xmlNode *current_node = base_node->children;
 
@@ -52,8 +52,8 @@ int DPM_extfn::Initialize( xmlNode *base_node) {
 
     // Validation
     // 1. function name is required. Its needed to identify the external dynamically loaded function.
-    // 2. inputs are required. 
-    // 3. outputs are required. 
+    // 2. inputs are required.
+    // 3. outputs are required.
 
     if (fname == NULL) {
         std::cerr << "ERROR: <extfn> specification is missing an <fname> (function name) specification." << std::endl;
@@ -132,8 +132,8 @@ std::ostream& operator<< (std::ostream& s, const DPM_extfn *extfn) {
   }
   s << ">";
   s << std::endl;
-  s << extfn->inputs; 
-  s << extfn->outputs; 
+  s << extfn->inputs;
+  s << extfn->outputs;
   s << "</relation>";
   s << std::endl;
   return s;
diff --git a/trick_source/data_products/DPX/DPM/DPM_page.cpp b/trick_source/data_products/DPX/DPM/DPM_page.cpp
index 207aa454..25aa24a9 100644
--- a/trick_source/data_products/DPX/DPM/DPM_page.cpp
+++ b/trick_source/data_products/DPX/DPM/DPM_page.cpp
@@ -26,7 +26,7 @@ int DPM_page::Initialize( xmlNode *base_node) {
     while (current_node != NULL) {
         if (current_node->type == XML_ELEMENT_NODE) {
             if ( strcmp( (const char *)current_node->name, "title") == 0) {
-                xmlNode *text_node = current_node->children; 
+                xmlNode *text_node = current_node->children;
                 title = strdup( (const char *)text_node->content);
             } else if ( strcmp( (const char *)current_node->name, "tstart") == 0) {
                 xmlNode *text_node = current_node->children;
@@ -41,10 +41,10 @@ int DPM_page::Initialize( xmlNode *base_node) {
                 DPM_relation *relation;
                 try {
                     relation = new DPM_relation(this, current_node);
-                } catch (std::invalid_argument) { 
+                } catch (std::invalid_argument) {
                     relation = NULL;
                     std::cerr << "ERROR: <page> specification contains an invalid <plot> specification." << std::endl;
-                } 
+                }
                 if (relation != NULL) {
                     relation_list.push_back(relation);
                 }
diff --git a/trick_source/data_products/DPX/DPM/DPM_parse_tree.cpp b/trick_source/data_products/DPX/DPM/DPM_parse_tree.cpp
index 648e9ce1..8796d9aa 100644
--- a/trick_source/data_products/DPX/DPM/DPM_parse_tree.cpp
+++ b/trick_source/data_products/DPX/DPM/DPM_parse_tree.cpp
@@ -1,7 +1,7 @@
 
 #include <DPM/DPM_parse_tree.hh>
 
-int DPM_parse_tree::Initialize(const char *XMLFileName) { 
+int DPM_parse_tree::Initialize(const char *XMLFileName) {
 
    int rc;
    xmlParserCtxtPtr parser_context;
@@ -54,7 +54,7 @@ DPM_parse_tree::DPM_parse_tree(const char *XMLFileName) throw (std::invalid_argu
 
 // DESTRUCTOR
 DPM_parse_tree::~DPM_parse_tree() {
-    
+
    if (doc) {
        xmlFreeDoc(doc);
    }
diff --git a/trick_source/data_products/DPX/DPM/DPM_product.cpp b/trick_source/data_products/DPX/DPM/DPM_product.cpp
index 38c8403b..6b335378 100644
--- a/trick_source/data_products/DPX/DPM/DPM_product.cpp
+++ b/trick_source/data_products/DPX/DPM/DPM_product.cpp
@@ -3,7 +3,7 @@
 
 #include "DPM_product.hh"
 #include "float.h"
-#include <stdio.h> 
+#include <stdio.h>
 
 int DPM_product::Initialize( xmlNode *base_node) {
 
@@ -11,7 +11,7 @@ int DPM_product::Initialize( xmlNode *base_node) {
     double tstop     = DBL_MAX;
     double frequency = DBL_MAX;
     title   = (char *)NULL;
-  
+
     int n_pages, n_tables;
 
     if (base_node == NULL) {
@@ -20,7 +20,7 @@ int DPM_product::Initialize( xmlNode *base_node) {
     }
     if (strcmp((char*) base_node->name, "product") != 0) {
         std::cerr << "ERROR: Expected <product> specification but alas didnt find it." << std::endl;
-        return -1; 
+        return -1;
     }
     /* Process children */
     xmlNode *current_node = base_node->children;
@@ -29,7 +29,7 @@ int DPM_product::Initialize( xmlNode *base_node) {
         if (current_node->type == XML_ELEMENT_NODE) {
             DPM_page  *page;
             DPM_extfn *ext_prog;
-            DPM_table *table; 
+            DPM_table *table;
             if ( strcmp( (char *)current_node->name, "page") == 0) {
                 try {
                     page = new DPM_page( this, current_node);
@@ -63,7 +63,7 @@ int DPM_product::Initialize( xmlNode *base_node) {
             } else if ( strcmp( (const char *)current_node->name, "title") == 0) {
                 xmlNode *text_node = current_node->children;
                 title = strdup( (const char *)text_node->content);
-	  
+
             } else if ( strcmp( (const char *)current_node->name, "tstart") == 0) {
                 xmlNode *text_node = current_node->children;
                 tstart = strtod((const char *)text_node->content,(char **)NULL);
@@ -75,7 +75,7 @@ int DPM_product::Initialize( xmlNode *base_node) {
             } else if ( strcmp( (const char *)current_node->name, "frequency") == 0) {
                 xmlNode *text_node = current_node->children;
                 frequency = strtod((const char *)text_node->content,(char**)NULL);
-	  
+
             } else {
                 std::cerr << "WARNING: <product> specification contains an unknown element \"<" << current_node->name << ">\". Skipping." << std::endl;
             }
@@ -92,7 +92,7 @@ int DPM_product::Initialize( xmlNode *base_node) {
        std::cerr << "ERROR: <product> specification requires at least one <page> or <table> specification." << std::endl;
        return -1;
     }
-  
+
     xmlCleanupParser();
     return 0;
 }
diff --git a/trick_source/data_products/DPX/DPM/DPM_relation.cpp b/trick_source/data_products/DPX/DPM/DPM_relation.cpp
index 2b23a925..b56980b9 100644
--- a/trick_source/data_products/DPX/DPM/DPM_relation.cpp
+++ b/trick_source/data_products/DPX/DPM/DPM_relation.cpp
@@ -157,7 +157,7 @@ const char * DPM_relation::getXAxisLabel() {
       candidate_label = xaxis->getLabel();
   } else {
       candidate_label = NULL;
-  } 
+  }
   // If an Y-Axis label wasn't supplied, see if there is a common
   // variable name that will serve as a label.
   if (candidate_label == NULL) {
@@ -172,7 +172,7 @@ const char * DPM_relation::getXAxisLabel() {
           if (strcmp( candidate_label, short_name) != 0 ) {
                return (NULL);
           }
-      } 
+      }
   }
   return (candidate_label);
 }
@@ -187,7 +187,7 @@ const char * DPM_relation::getYAxisLabel() {
       candidate_label = yaxis->getLabel();
   } else {
       candidate_label = NULL;
-  } 
+  }
   // If an Y-Axis label wasn't supplied, see if there is a common
   // variable name that will serve as a label.
   if (candidate_label == NULL) {
@@ -202,7 +202,7 @@ const char * DPM_relation::getYAxisLabel() {
           if (strcmp( candidate_label, short_name) != 0 ) {
                return (NULL);
           }
-      } 
+      }
   }
   return (candidate_label);
 }
@@ -217,7 +217,7 @@ const char * DPM_relation::getZAxisLabel() {
       candidate_label = zaxis->getLabel();
   } else {
       candidate_label = NULL;
-  } 
+  }
   // If an Z-Axis label wasn't supplied, see if there is a common
   // variable name that will serve as a label.
   if (candidate_label == NULL) {
@@ -232,7 +232,7 @@ const char * DPM_relation::getZAxisLabel() {
           if (strcmp( candidate_label, short_name) != 0 ) {
                return (NULL);
           }
-      } 
+      }
   }
   return (candidate_label);
 }
diff --git a/trick_source/data_products/DPX/DPM/DPM_table.cpp b/trick_source/data_products/DPX/DPM/DPM_table.cpp
index 4307553e..4282b7a1 100644
--- a/trick_source/data_products/DPX/DPM/DPM_table.cpp
+++ b/trick_source/data_products/DPX/DPM/DPM_table.cpp
@@ -20,7 +20,7 @@ int DPM_table::Initialize( xmlNode *base_node) {
     if ( strcmp( (char *)base_node->name, "table") != 0) {
         std::cerr << "ERROR: Expected <table> but didnt find it." << std::endl;
         return -1;
-    } 
+    }
     /* Process children */
     xmlNode *current_node = base_node->children;
 
@@ -66,7 +66,7 @@ int DPM_table::Initialize( xmlNode *base_node) {
     time_constraints = new DPM_time_constraints(tstart, tstop, frequency);
 
     // Validation criteria:
-    // 1. Table requires at least one column (DPM_column) in the column_list.     
+    // 1. Table requires at least one column (DPM_column) in the column_list.
 
     n_columns = (int)column_list.size();
     if (n_columns < 1) {
diff --git a/trick_source/data_products/DPX/DPM/DPM_time_constraints.cpp b/trick_source/data_products/DPX/DPM/DPM_time_constraints.cpp
index 686006d1..44676e19 100644
--- a/trick_source/data_products/DPX/DPM/DPM_time_constraints.cpp
+++ b/trick_source/data_products/DPX/DPM/DPM_time_constraints.cpp
@@ -53,7 +53,7 @@ double DPM_time_constraints::getFrequency() {
 
 // MEMBER FUNCTION
 DPM_time_constraints operator+ ( DPM_time_constraints &tc1,
-				  DPM_time_constraints &tc2) {   
+				  DPM_time_constraints &tc2) {
 
   DPM_time_constraints tc_out;
 
diff --git a/trick_source/data_products/DPX/DPM/DPM_var.cpp b/trick_source/data_products/DPX/DPM/DPM_var.cpp
index 4fa9143e..46487186 100644
--- a/trick_source/data_products/DPX/DPM/DPM_var.cpp
+++ b/trick_source/data_products/DPX/DPM/DPM_var.cpp
@@ -5,7 +5,7 @@
 
 DPM_var::DPM_var(const char* Name)
         :DPM_component() {
-   name = strdup( Name);        
+   name = strdup( Name);
 }
 
 int DPM_var::Initialize( xmlNode *base_node) {
diff --git a/trick_source/data_products/DPX/TESTING/DPC_TEST/test_view.cpp b/trick_source/data_products/DPX/TESTING/DPC_TEST/test_view.cpp
index b3a5a51d..0147fef2 100644
--- a/trick_source/data_products/DPX/TESTING/DPC_TEST/test_view.cpp
+++ b/trick_source/data_products/DPX/TESTING/DPC_TEST/test_view.cpp
@@ -12,7 +12,7 @@ DPV_pointer test_view::create_product_view( DPC_product* product){
 
   return ( (DPV_pointer)0x01111111 );
 }
-  
+
 DPV_pointer test_view::create_page_view( DPV_pointer parent_data,
 					  DPC_page* page) {
   long pdata = (long)parent_data;
@@ -81,7 +81,7 @@ DPV_pointer test_view::create_table_view( DPV_pointer parent_data,
   int i,j;
   double * values;
   double time;
- 
+
   cout << "=====================" << endl;
   cout << "TABLE VIEW." << endl;
   cout << "=====================" << endl;
@@ -113,26 +113,26 @@ DPV_pointer test_view::create_table_view( DPV_pointer parent_data,
   }
 
   values = new double[n_columns];
-  
+
   for (i=0; i<5 ; i++) {
        if ( table->getRow(&time, values)) {
             cout << "time: " << time ;
             for (j=0; j<n_columns ; j++) {
-                 cout << " " << values[j]; 
+                 cout << " " << values[j];
             }
             cout << endl;
        }
   }
-   
+
 // To test begin() Re-initialize the values, begin() and doing it again.
   cout << "The following 5 lines should be the same as the previous 5 lines." << endl;
   for (i=0; i<5 ; i++) { values[i] = 0.0; }
-  table->begin(); 
+  table->begin();
   for (i=0; i<5 ; i++) {
        if ( table->getRow(&time, values)) {
             cout << "time: " << time ;
             for (j=0; j<n_columns ; j++) {
-                 cout << " " << values[j]; 
+                 cout << " " << values[j];
             }
             cout << endl;
        }
diff --git a/trick_source/data_products/DPX/TESTING/DPC_TEST/test_view.hh b/trick_source/data_products/DPX/TESTING/DPC_TEST/test_view.hh
index e0488b3a..15d46c91 100644
--- a/trick_source/data_products/DPX/TESTING/DPC_TEST/test_view.hh
+++ b/trick_source/data_products/DPX/TESTING/DPC_TEST/test_view.hh
@@ -3,7 +3,7 @@
 
 class test_view: public DPV_view {
 
-public: 
+public:
 
   /**
    * Constructor.
@@ -12,16 +12,16 @@ public:
   test_view() { cout << "TEST_PEER CONSTRUCTOR" << endl; };
 
   DPV_pointer create_product_view( DPC_product* product);
-  
+
   DPV_pointer create_page_view( DPV_pointer parent_data,
     				 DPC_page* page);
-  
+
   DPV_pointer create_plot_view( DPV_pointer parent_data,
 				 DPC_plot* plot);
 
   DPV_pointer create_table_view( DPV_pointer parent_data,
 				 DPC_table* table);
-  
+
   DPV_pointer create_curve_view( DPV_pointer parent_data,
 				  DPC_curve* curve);
 
diff --git a/trick_source/data_products/DPX/TESTING/DS_exercisor/DS_exercisor.cpp b/trick_source/data_products/DPX/TESTING/DS_exercisor/DS_exercisor.cpp
index fbabfded..056ebb01 100644
--- a/trick_source/data_products/DPX/TESTING/DS_exercisor/DS_exercisor.cpp
+++ b/trick_source/data_products/DPX/TESTING/DS_exercisor/DS_exercisor.cpp
@@ -30,7 +30,7 @@ int DS_exercisor::run() {
       cout << "t -> getTimeUnit" << endl;
       cout << "b -> begin"       << endl;
       cout << "e -> end"         << endl;
-      cout << "s -> step"        << endl;    
+      cout << "s -> step"        << endl;
       cout << "================" << endl;
     } break;
     case '!' : {
@@ -46,7 +46,7 @@ int DS_exercisor::run() {
     } break;
     case 'p' : {
       ret = testds->peek(&time, &value);
-      cout << "peek:" << "time = " << time  << "     " << "value= " << value << endl;    
+      cout << "peek:" << "time = " << time  << "     " << "value= " << value << endl;
       cout << "     " << "ret= " << ret << endl;
     } break;
     case 'f' : {
@@ -55,11 +55,11 @@ int DS_exercisor::run() {
     } break;
     case 'u' : {
       unitspec = testds->getUnit();
-      cout << "getUnit:" << "unitspec= " << "\"" << unitspec << "\"" << endl;    
+      cout << "getUnit:" << "unitspec= " << "\"" << unitspec << "\"" << endl;
     } break;
     case 't' : {
       timeunitspec = testds->getTimeUnit();
-      cout << "getTimeUnit:" << "timeunitspec= " << "\"" << timeunitspec << "\"" << endl;        
+      cout << "getTimeUnit:" << "timeunitspec= " << "\"" << timeunitspec << "\"" << endl;
     } break;
     case 'b' : {
       testds->begin();
diff --git a/trick_source/data_products/DPX/test/unit_test/DPC_test.cpp b/trick_source/data_products/DPX/test/unit_test/DPC_test.cpp
index c18f0c25..c9a6be7e 100644
--- a/trick_source/data_products/DPX/test/unit_test/DPC_test.cpp
+++ b/trick_source/data_products/DPX/test/unit_test/DPC_test.cpp
@@ -13,15 +13,15 @@
 //#include "trick_utils/reqs/include/RequirementScribe.hh"
 
 namespace Trick {
- 
+
 class DPCTest : public ::testing::Test {
     protected:
         //Trick::RequirementScribe req;
-        std::string testxml[15]; 
-    
+        std::string testxml[15];
+
         DPCTest() {}
         ~DPCTest() {}
-        virtual void SetUp(); 
+        virtual void SetUp();
         virtual void TearDown();
 
 		std::string parseDPCData(const char* name);
@@ -78,7 +78,7 @@ std::string DPCTest::parseDPCData(const char* name) {
 
     int n_product_files;
     int product_ix;
-	std::stringstream output; 
+	std::stringstream output;
 
 	session_file_name = name;
 
@@ -91,7 +91,7 @@ std::string DPCTest::parseDPCData(const char* name) {
     } catch (std::invalid_argument) {
         std::cerr << "ERROR: <session> specification is invalid and un-usable. Quitting." << std::endl;
         exit(1);
-    }   
+    }
 
     root_node = session_parse_tree->getRootNode();
 
@@ -100,13 +100,13 @@ std::string DPCTest::parseDPCData(const char* name) {
     } catch (std::invalid_argument) {
         std::cerr << "ERROR: <session> specification is invalid and un-usable. Quitting." << std::endl;
         exit(1);
-    }   
+    }
 
     delete session_parse_tree;
 
     n_product_files = session->product_file_list.size();
 
-    for ( product_ix = 0; product_ix < n_product_files; product_ix++ ) { 
+    for ( product_ix = 0; product_ix < n_product_files; product_ix++ ) {
         DPC_product *product;
         char tmp [50];
         sprintf(tmp, "../TEST_DATA/%s", session->product_file_list[product_ix]);
@@ -195,7 +195,7 @@ TEST_F(DPCTest, VarvsTime_Binary) {
 
 // Session 1_2
 TEST_F(DPCTest, VarvsTime_CSV) {
-	//req.add_requirement("2416241399 32631267");	
+	//req.add_requirement("2416241399 32631267");
 
     std::string tmp = parseDPCData(testxml[1].c_str());
 	//std::cout << tmp;
@@ -413,7 +413,7 @@ TEST_F(DPCTest, MultiplePlots) {
 		"Attribute grid: 			 yes"
 		"Attribute background_color: #fff0ff"
 		"Attribute font: 			 -*-new century schoolbook-bold-r-*--12-*-*-*-*-*-*-*"
-		"CURVE VIEW:" 
+		"CURVE VIEW:"
 		"X Var Name: sys.exec.out.time 					X Units: s"
 		"Y Var Name: sun_predictor.sun.solar_elevation 	Y Units: degree"
 		"RUN Directory: RUN_BINARY"
@@ -429,7 +429,7 @@ TEST_F(DPCTest, MultiplePlots) {
 		"Attribute grid:			 yes"
 		"Attribute background_color: #f0fff0"
 		"Attribute font: 			 -*-new century schoolbook-bold-r-*--12-*-*-*-*-*-*-*"
-		"CURVE VIEW:" 
+		"CURVE VIEW:"
 		"X Var Name: sys.exec.out.time 					X Units: s"
 		"Y Var Name: sun_predictor.sun.solar_azimuth 	Y Units: degree"
 		"RUN Directory: RUN_BINARY"
@@ -445,7 +445,7 @@ TEST_F(DPCTest, MultiplePlots) {
 		"Attribute grid: 			 yes"
 		"Attribute background_color: #fffff0"
 		"Attribute font: 			 -*-new century schoolbook-bold-r-*--12-*-*-*-*-*-*-*"
-		"CURVE VIEW:" 
+		"CURVE VIEW:"
 		"X Var Name: sun_predictor.sun.solar_azimuth 	X Units: degree"
 		"Y Var Name: sun_predictor.sun.solar_elevation 	Y Units: degree"
 		"RUN Directory: RUN_BINARY"
@@ -477,7 +477,7 @@ TEST_F(DPCTest, MultPlots_MultTables) {
 		"Attribute grid: 			 yes"
 		"Attribute background_color: 	#885588"
 		"Attribute font: 			 -*-new century schoolbook-bold-r-*--12-*-*-*-*-*-*-*"
-		"CURVE VIEW:" 
+		"CURVE VIEW:"
 		"X Var Name: sys.exec.out.time		 			X Units: s"
 		"Y Var Name: sun_predictor.sun.solar_elevation 	Y Units: degree"
 		"RUN Directory: RUN_BINARY"
@@ -489,19 +489,19 @@ TEST_F(DPCTest, MultPlots_MultTables) {
 
 		"PAGE VIEW: 	Attribute background_color: #885588"
 		"Attribute presentation: 		SIMPLE"
-		
+
 		"PLOT VIEW: 	Plot title: Sun Elevation vs. Azimuth"
 		"Number of Curves: 1"
 		"X-axis label: Azimuth 		Y-axis label: Elevation"
 		"Attribute grid: 				yes"
 		"Attribute background_color: 	#fffff0"
 		"Attribute font: 				-*-new century schoolbook-bold-r-*--12-*-*-*-*-*-*-*"
-		"CURVE VIEW:" 
+		"CURVE VIEW:"
 		"X Var Name: sun_predictor.sun.solar_azimuth 	X Units: degree"
 		"Y Var Name: sun_predictor.sun.solar_elevation 	Y Units: degree"
 		"RUN Directory: RUN_BINARY"
 		"Attribute y line_color: 		#323200"
-		"First 5 points:" 
+		"First 5 points:"
 		"<356.052,-36.9048>[0] <356.057,-36.9051>[1] <356.062,-36.9053>[2]"
 		"<356.067,-36.9056>[3] <356.071,-36.9058>[4]"
 		"FINALIZE PLOT VIEW. FINALIZE PAGE VIEW."
@@ -624,11 +624,11 @@ TEST_F(DPCTest, ComparisonCurves) {
     	"PRODUCT VIEW: 	Attribute version: 1.0"
 		"PAGE VIEW: Page title: Page of Squiggles"
 		"Attribute presentation: comparison"
-	
+
 		"PLOT VIEW: 	Plot title: Squiggle 1"
 		"Number of Curves: 2"
 		"X-axis label: time		Y-axis label: JD"
-		"CURVE VIEW:" 
+		"CURVE VIEW:"
 		"X Var Name: sys.exec.out.time 		X Units: s"
 		"Y Var Name: sun_predictor.sun.JD 	Y Units: day"
 		"RUN Directory: RUN5"
@@ -652,7 +652,7 @@ TEST_F(DPCTest, ComparisonCurves) {
 		"Y Var Name: sun_predictor.sun.declination 	Y Units: degree"
 		"RUN Directory: RUN5"
 		"First 5 points:"
-		"<0,-18.1012>[0] <1,-18.1012>[1] <2,-18.1012>[2]" 
+		"<0,-18.1012>[0] <1,-18.1012>[1] <2,-18.1012>[2]"
 		"<3,-18.1012>[3] <4,-18.1012>[4]"
 		"CURVE VIEW:"
 		"X Var Name: sys.exec.out.time 				X Units: s"
@@ -683,7 +683,7 @@ TEST_F(DPCTest, ComparisonCurves) {
 		"FINALIZE PLOT VIEW. FINALIZE PAGE VIEW. FINALIZE PRODUCT VIEW.",
 		tmp.c_str());
     EXPECT_EQ(result, 0);
-} 
+}
 
 // Session 9_2
 TEST_F(DPCTest, DeltaCurves) {
@@ -695,7 +695,7 @@ TEST_F(DPCTest, DeltaCurves) {
 		"PRODUCT VIEW: 	Attribute version: 1.0"
 		"PAGE VIEW: 	Page title: Page of Squiggles"
 		"Attribute presentation: DELTA"
-		
+
 		"PLOT VIEW: 	Plot title: Squiggle 1"
 		"Number of Curves: 1"
 		"X-axis label: time		Y-axis label: JD"
@@ -704,14 +704,14 @@ TEST_F(DPCTest, DeltaCurves) {
 		"Y Var Name: DELTA(sun_predictor.sun.JD) 	Y Units: day"
 		"RUN Directory: RUN1 - RUN2"
 		"First 5 points:"
-		"<0,-0.0416667>[0] <1,-0.0416667>[1] <2,-0.0416667>[2]" 
+		"<0,-0.0416667>[0] <1,-0.0416667>[1] <2,-0.0416667>[2]"
 		"<3,-0.0416667>[3] <4,-0.0416667>[4]"
 		"FINALIZE PLOT VIEW."
 
-		"PLOT VIEW: 	Plot title: Squiggle 2" 
+		"PLOT VIEW: 	Plot title: Squiggle 2"
 		"Number of Curves: 1"
 		"X-axis label: time		Y-axis label: declination"
-		"CURVE VIEW:" 
+		"CURVE VIEW:"
 		"X Var Name: sys.exec.out.time 						X Units: s"
 		"Y Var Name: DELTA(sun_predictor.sun.declination) 	Y Units: degree"
 		"RUN Directory: RUN1 - RUN2"
@@ -723,7 +723,7 @@ TEST_F(DPCTest, DeltaCurves) {
 		"PLOT VIEW: 	Plot title: Squiggle 3"
 		"Number of Curves: 1"
 		"X-axis label: time		Y-axis label: hour_angle"
-		"CURVE VIEW:" 
+		"CURVE VIEW:"
 		"X Var Name: sys.exec.out.time 						X Units: s"
 		"Y Var Name: DELTA(sun_predictor.sun.hour_angle) 	Y Units: degree"
 		"RUN Directory: RUN1 - RUN2"
diff --git a/trick_source/data_products/DPX/test/unit_test/DPM_test.cpp b/trick_source/data_products/DPX/test/unit_test/DPM_test.cpp
index 2ffc5d3c..87392fca 100644
--- a/trick_source/data_products/DPX/test/unit_test/DPM_test.cpp
+++ b/trick_source/data_products/DPX/test/unit_test/DPM_test.cpp
@@ -12,15 +12,15 @@
 #include "DPM/DPM_product.hh"
 
 namespace Trick {
- 
+
 class DPMTest : public ::testing::Test {
     protected:
         //Trick::RequirementScribe req;
-		std::string testxml[10];	
-	
+		std::string testxml[10];
+
 		DPMTest() {}
 		~DPMTest() {}
-		virtual void SetUp(); 
+		virtual void SetUp();
         virtual void TearDown();
 
 		std::string parseTestData(const char* name);
@@ -47,7 +47,7 @@ int strcmp_IgnoringWhiteSpace(const char* s1, const char* s2) {
 
 
 void DPMTest::SetUp() {
-	
+
 	testxml[0] = "../TEST_DATA/product_1.xml";
     testxml[1] = "../TEST_DATA/product_2.xml";
     testxml[2] = "../TEST_DATA/product_3.xml";
@@ -72,13 +72,13 @@ std::string DPMTest::parseTestData(const char* name) {
 
 	std::stringstream s;
 	std::string tmp;
-   
+
 	LIBXML_TEST_VERSION
     if ((parser_context = xmlNewParserCtxt()) == NULL) {
         fprintf(stderr,"Out of Memory\n");
         exit(1);
     }
- 
+
 	doc = xmlCtxtReadFile(parser_context, name, NULL, XML_PARSE_DTDVALID+XML_PARSE_NOERROR);
 
 	if (parser_context->valid) {
@@ -113,11 +113,11 @@ TEST_F(DPMTest, ValidateDTD) {
     if ((parser_context = xmlNewParserCtxt()) == NULL) {
         fprintf(stderr,"Out of Memory\n");
         exit(1);
-    }   
+    }
 
 	for (i=0 ; i<(sizeof(testxml)/sizeof(testxml[0])) ; i++) {
     	doc = xmlCtxtReadFile(parser_context, testxml[i].c_str(), NULL, XML_PARSE_DTDVALID+XML_PARSE_NOERROR);
-		
+
 		if (i < 9) {
 			ASSERT_TRUE(parser_context->valid);
 		} else {
@@ -131,7 +131,7 @@ TEST_F(DPMTest, ValidateDTD) {
 // Product 1
 TEST_F(DPMTest, VarvsTime_NoAttributes) {
 	//req.add_requirement("2416241399");
-	
+
 	std::string tmp = parseTestData(testxml[0].c_str());
 	int result = strcmp_IgnoringWhiteSpace(
 		"<product version=\"1.0\">"
@@ -225,8 +225,8 @@ TEST_F(DPMTest, VarvsTime_Attributes) {
 		"<tstart>0</tstart>"
 		"<tstop>1.79769e+308</tstop>"
 		"<frequency>1.79769e+308</frequency>"
-		"<plot grid=\"yes\" grid_color=\"blue\"" 
-		"font=\"-*-new century schoolbook-bold-r-*--12-*-*-*-*-*-*-*\"" 
+		"<plot grid=\"yes\" grid_color=\"blue\""
+		"font=\"-*-new century schoolbook-bold-r-*--12-*-*-*-*-*-*-*\""
 		"background_color=\"#eef0ff\">"
 		"<title>Sun Elevation vs. Time</title>"
 		"<tstart>0</tstart>"
@@ -351,7 +351,7 @@ TEST_F(DPMTest, MultiplePlots) {
 		"<tstart>0</tstart>"
 		"<tstop>1.79769e+308</tstop>"
 		"<frequency>1.79769e+308</frequency>"
-		"<plot grid=\"yes\" font=\"-*-new century schoolbook-bold-r-*--12-*-*-*-*-*-*-*\"" 
+		"<plot grid=\"yes\" font=\"-*-new century schoolbook-bold-r-*--12-*-*-*-*-*-*-*\""
 		"background_color=\"#fff0ff\">"
 		"<title>Sun Elevation vs. Time</title>"
 		"<tstart>0</tstart>"
diff --git a/trick_source/data_products/DPX/test/unit_test/DS_test.cpp b/trick_source/data_products/DPX/test/unit_test/DS_test.cpp
index 72a2da09..885b9f68 100644
--- a/trick_source/data_products/DPX/test/unit_test/DS_test.cpp
+++ b/trick_source/data_products/DPX/test/unit_test/DS_test.cpp
@@ -70,7 +70,7 @@ std::string DSTest::run(char ch) {
 	// b -> begin
 	// e -> end
 	// s -> step
-	
+
     switch (ch) {
 		case 'g' : {
 			ret = testds->get(&time, &value);
@@ -113,8 +113,8 @@ std::string DSTest::run(char ch) {
     	} break;
     	default : {
 			s << "Invalid command";
-		} break;   
-	}   
+		} break;
+	}
   	return s.str();
 }
 
@@ -123,10 +123,10 @@ std::string DSTest::run(char ch) {
 // ASCII (CSV) DATASTREAM
 TEST_F(DSTest, DataStream_Ascii) {
   	//req.add_requirement("32631267");
-	
+
 	RUN_dir = "../TEST_DATA/RUN_ASCII";
     VarName = "sun_predictor.sun.solar_azimuth";
-	
+
 	data_stream_factory = new DataStreamFactory();
     testds = data_stream_factory->create(RUN_dir, VarName, NULL);
 
@@ -150,7 +150,7 @@ TEST_F(DSTest, DataStream_Ascii) {
     output = run('g');
     result = strcmp_IgnoreWhiteSpace(
 		"get : time = 0     value = 351.283     return = 1", output.c_str());
-	EXPECT_EQ(result, 0);	
+	EXPECT_EQ(result, 0);
 
 	output = run('g');
 	result = strcmp_IgnoreWhiteSpace(
@@ -205,47 +205,47 @@ TEST_F(DSTest, DataStream_Binary) {
     output = run('f');
     result = strcmp_IgnoreWhiteSpace(
     	"getFileName : filename = \"../TEST_DATA/RUN_BINARY/log_helios.trk\"", output.c_str());
-    EXPECT_EQ(result, 0); 
-    
+    EXPECT_EQ(result, 0);
+
 	// GET UNIT
     output = run('u');
     result = strcmp_IgnoreWhiteSpace("getUnit : unitspec = \"degree\"", output.c_str());
-    EXPECT_EQ(result, 0); 
-    
+    EXPECT_EQ(result, 0);
+
 	// GET TIME UNIT
     output = run('t');
     result = strcmp_IgnoreWhiteSpace("getTimeUnit : timeunitspec = \"s\"", output.c_str());
-    EXPECT_EQ(result, 0); 
-    
+    EXPECT_EQ(result, 0);
+
 	// GET
     output = run('g');
     result = strcmp_IgnoreWhiteSpace(
 		"get : time = 0     value = -36.7426     return = 1", output.c_str());
-    EXPECT_EQ(result, 0);   
-    
+    EXPECT_EQ(result, 0);
+
 	output = run('g');
     result = strcmp_IgnoreWhiteSpace(
 		"get : time = 1     value = -36.743     return = 1", output.c_str());
-    EXPECT_EQ(result, 0); 
-    
+    EXPECT_EQ(result, 0);
+
 	// PEEK
     output = run('p');
     result = strcmp_IgnoreWhiteSpace(
 		"peek : time = 2     value= -36.7434     return = 1", output.c_str());
-    EXPECT_EQ(result, 0); 
-    
+    EXPECT_EQ(result, 0);
+
 	output = run('p');
     result = strcmp_IgnoreWhiteSpace(
 		"peek : time = 2     value= -36.7434     return = 1", output.c_str());
-    EXPECT_EQ(result, 0); 
-    
+    EXPECT_EQ(result, 0);
+
 	// BEGIN
     output = run('b');
     output = run('g');
     result = strcmp_IgnoreWhiteSpace(
 		"get : time = 0     value = -36.7426      return = 1", output.c_str());
-    EXPECT_EQ(result, 0); 
-    
+    EXPECT_EQ(result, 0);
+
 	// STEP
     output = run('s');
     output = run('s');
@@ -258,8 +258,8 @@ TEST_F(DSTest, DataStream_Binary) {
 	output = run('e');
 	result = strcmp_IgnoreWhiteSpace("end : return = 0", output.c_str());
 	EXPECT_EQ(result, 0);
-	
-	delete data_stream_factory;    
+
+	delete data_stream_factory;
 }
 
 // MATLAB DATASTREAM
@@ -271,52 +271,52 @@ TEST_F(DSTest, DataStream_MatLab) {
 
     data_stream_factory = new DataStreamFactory();
     testds = data_stream_factory->create(RUN_dir, VarName, "s_simtime");
-	
+
 	// GET FILE NAME
 	output = run('f');
 	result = strcmp_IgnoreWhiteSpace(
 		"getFileName : filename= \"../TEST_DATA/RUN_MATLAB/nasa_p1.mat\"", output.c_str());
 	EXPECT_EQ(result, 0);
-	
+
 	// GET UNIT
 	output = run('u');
 	result = strcmp_IgnoreWhiteSpace("getUnit : unitspec= \"1\"", output.c_str());
 	EXPECT_EQ(result, 0);
-	
+
 	// GET TIME UNIT
 	output = run('t');
 	result = strcmp_IgnoreWhiteSpace("getTimeUnit : timeunitspec = \"s\"", output.c_str());
 	EXPECT_EQ(result, 0);
-	
+
 	// GET
 	output = run('g');
 	result = strcmp_IgnoreWhiteSpace(
 		"get : time = 0     value = -210.146     return = 1", output.c_str());
 	EXPECT_EQ(result, 0);
-	 
+
 	output = run('g');
 	result = strcmp_IgnoreWhiteSpace(
 		"get : time = 0.05     value = -210.146     return = 1", output.c_str());
 	EXPECT_EQ(result, 0);
-	
+
 	// PEEK
 	output = run('p');
 	result = strcmp_IgnoreWhiteSpace(
 		"peek : time = 0.1     value= -210.146     return = 1", output.c_str());
 	EXPECT_EQ(result, 0);
-	
+
 	output = run('p');
 	result = strcmp_IgnoreWhiteSpace(
 		"peek : time = 0.1     value= -210.146     return = 1", output.c_str());
 	EXPECT_EQ(result, 0);
-	
+
 	// BEGIN
 	output = run('b');
 	output = run('g');
 	result = strcmp_IgnoreWhiteSpace(
 		"get : time = 0     value = -210.146     return = 1", output.c_str());
 	EXPECT_EQ(result, 0);
-	 
+
 	// STEP
 	output = run('s');
 	output = run('s');
@@ -324,12 +324,12 @@ TEST_F(DSTest, DataStream_MatLab) {
 	result = strcmp_IgnoreWhiteSpace(
 		"get : time = 0.15     value= -210.146     return = 1", output.c_str());
 	EXPECT_EQ(result, 0);
-	 
+
 	// END
 	output = run('e');
 	result = strcmp_IgnoreWhiteSpace("end : return = 0", output.c_str());
 	EXPECT_EQ(result, 0);
-	
+
 	delete data_stream_factory;
 }
 
@@ -343,7 +343,7 @@ TEST_F(DSTest, DataStream_Delta) {
 	char DeltaName[1000];
 
 	char* a = "sun_predictor.sun.solar_azimuth:../TEST_DATA/BUNCHORUNS/RUN1";
-	char* b = "sun_predictor.sun.solar_azimuth:../TEST_DATA/BUNCHORUNS/RUN2";	
+	char* b = "sun_predictor.sun.solar_azimuth:../TEST_DATA/BUNCHORUNS/RUN2";
 
 	sprintf(DeltaName, "delta(%s, %s)", a, b);
 
@@ -385,7 +385,7 @@ TEST_F(DSTest, DataStream_DPCUnitConv) {
 TEST_F(DSTest, DataStream_DPCTimeCstr) {
 	//req.add_requirement("3610816325");
 
-	int i;	
+	int i;
 	DPM_time_constraints *time_constraints;
 
 	RUN_dir = "../TEST_DATA/RUN_BINARY";
@@ -420,8 +420,8 @@ TEST_F(DSTest, DataStream_DPCTimeCstr) {
 	output = run('e');
     result = strcmp_IgnoreWhiteSpace("end : return = 1", output.c_str());
     EXPECT_EQ(result, 0);
-	
-	delete data_stream_factory; 
+
+	delete data_stream_factory;
 	delete testds;
 }
 
diff --git a/trick_source/data_products/DPX/test/unit_test/test_view.cpp b/trick_source/data_products/DPX/test/unit_test/test_view.cpp
index 79740b8c..ae3d099c 100644
--- a/trick_source/data_products/DPX/test/unit_test/test_view.cpp
+++ b/trick_source/data_products/DPX/test/unit_test/test_view.cpp
@@ -9,7 +9,7 @@ std::string Test_view::getOutput() {
 }
 
 DPV_pointer Test_view::render_product( DPC_product* product){
-	const char *temp_cstr;  
+	const char *temp_cstr;
 
 	s << "PRODUCT VIEW:" << std::endl;
     s << "Attribute version: " <<  product->getAttribute("version") << std::endl;
@@ -25,7 +25,7 @@ DPV_pointer Test_view::render_product( DPC_product* product){
 
 	return ( (DPV_pointer)0x01111111 );
 }
-  
+
 DPV_pointer Test_view::render_page( DPV_pointer parent_data, DPC_page* page) {
   	const char *temp_cstr;
 
@@ -35,35 +35,35 @@ DPV_pointer Test_view::render_page( DPV_pointer parent_data, DPC_page* page) {
   	}
 	if ((temp_cstr = page->getAttribute("foreground_color")) != NULL) {
         s << "Attribute foreground_color: " << temp_cstr << std::endl;
-    } 
+    }
 	if ((temp_cstr = page->getAttribute("background_color")) != NULL) {
         s << "Attribute background_color: " << temp_cstr << std::endl;
-    } 
+    }
 	if ((temp_cstr = page->getAttribute("hcells")) != NULL) {
         s << "Attribute hcells: " << temp_cstr << std::endl;
-    } 
+    }
 	if ((temp_cstr = page->getAttribute("foreground_color")) != NULL) {
         s << "Attribute vcells: " << temp_cstr << std::endl;
-    } 
+    }
 	if ((temp_cstr = page->getAttribute("presentation")) != NULL) {
         s << "Attribute presentation: " << temp_cstr << std::endl;
-    } 
+    }
 	if ((temp_cstr = page->getAttribute("gnuplot_template")) != NULL) {
         s << "Attribute gnuplot_template: " << temp_cstr << std::endl;
-    } 	
+    }
 	if ((temp_cstr = page->getAttribute("gnuplot_object")) != NULL) {
         s << "Attribute gnuplot_object: " << temp_cstr << std::endl;
-    } 
+    }
 	if ((temp_cstr = page->getAttribute("gnuplot_geom")) != NULL) {
         s << "Attribute gnuplot_geom: " << temp_cstr << std::endl;
-    } 
+    }
 	if ((temp_cstr = page->getAttribute("gnuplot_plot_ratio")) != NULL) {
         s << "Attribute gnuplot_plot_ratio: " << temp_cstr << std::endl;
-    } 
+    }
 	if ((temp_cstr = page->getAttribute("gnuplot_page_orientation")) != NULL) {
         s << "Attribute gnuplot_page_orientation: " << temp_cstr << std::endl;
-    } 
-	
+    }
+
 
   	return ( (DPV_pointer)0x02222222 );
 }
@@ -152,13 +152,13 @@ DPV_pointer Test_view::render_table( DPV_pointer parent_data, DPC_table  *table)
   	}
 
   	values = new double[n_columns];
-  
+
 	for (i=0; i<5 ; i++) {
     	if ( table->getRow(&time, values)) {
         	begin1 << "time: " << time << " values: ";
 			s << "time: " << time << " values: ";
             for (j=0; j<n_columns ; j++) {
-                 begin1 << " " << values[j]; 
+                 begin1 << " " << values[j];
 				 s << " " << values[j];
             }
 			begin1 << std::endl;
@@ -169,12 +169,12 @@ DPV_pointer Test_view::render_table( DPV_pointer parent_data, DPC_table  *table)
   	// To test begin() Re-initialize the values, begin() and doing it again.
   	// The following lines should be the same as the previous lines.
   	for (i=0; i<n_columns ; i++) { values[i] = 0.0; }
-  	table->begin(); 
+  	table->begin();
   	for (i=0; i<5 ; i++) {
        	if ( table->getRow(&time, values)) {
 			begin2 << "time: " << time << " values: ";
             for (j=0; j<n_columns ; j++) {
-                 begin2 << " " << values[j]; 
+                 begin2 << " " << values[j];
             }
             begin2 << std::endl;
        	}
diff --git a/trick_source/data_products/DPX/test/unit_test/test_view.hh b/trick_source/data_products/DPX/test/unit_test/test_view.hh
index 2a4c5faf..df435598 100644
--- a/trick_source/data_products/DPX/test/unit_test/test_view.hh
+++ b/trick_source/data_products/DPX/test/unit_test/test_view.hh
@@ -8,7 +8,7 @@
 #include "DPC/DPC_product.hh"
 
 class Test_view: public DPV_view {
-	public: 
+	public:
 		Test_view() {};
 		~Test_view() {};
 
@@ -31,7 +31,7 @@ class Test_view: public DPV_view {
 		void notify_table( DPV_pointer table_view, DPV_message msg) {};
 		void notify_plot( DPV_pointer plot_view, DPV_message msg) {};
 		void notify_curve( DPV_pointer curve_view, DPV_message msg) {};
-		
+
 		std::string getOutput();
 
 	private:
diff --git a/trick_source/data_products/EQParse/eqparse_evaluate.c b/trick_source/data_products/EQParse/eqparse_evaluate.c
index 6f9d79d9..46eafb16 100644
--- a/trick_source/data_products/EQParse/eqparse_evaluate.c
+++ b/trick_source/data_products/EQParse/eqparse_evaluate.c
@@ -62,8 +62,8 @@ double eval(stack * stk, stack1 * no)
                                 z = mod(x, y);
                                 break;
 
-                                /* The inline comments give the equivalent 
-                                 * gnuplot function 
+                                /* The inline comments give the equivalent
+                                 * gnuplot function
                                  */
                         case (char)0xA2:      /* abs(x) */
                                 z = fabs(y);
diff --git a/trick_source/data_products/EQParse/eqparse_math.c b/trick_source/data_products/EQParse/eqparse_math.c
index b2a70b2a..a72205d6 100644
--- a/trick_source/data_products/EQParse/eqparse_math.c
+++ b/trick_source/data_products/EQParse/eqparse_math.c
@@ -45,33 +45,33 @@ double mod(double x,double y)
 double inverf(double p)
 {
 
-        double a[6]  = {  .1400216916161353e+03, -.7204275515686407e+03, 
+        double a[6]  = {  .1400216916161353e+03, -.7204275515686407e+03,
                           .1296708621660511e+04, -.9697932901514031e+03,
-                          .2762427049269425e+03, -.2012940180552054e+02 } ; 
+                          .2762427049269425e+03, -.2012940180552054e+02 } ;
 
-        double b[6] = { .1291046303114685e+03, -.7312308064260973e+03,  
-                        .1494970492915789e+04, -.1337793793683419e+04, 
+        double b[6] = { .1291046303114685e+03, -.7312308064260973e+03,
+                        .1494970492915789e+04, -.1337793793683419e+04,
                         .5033747142783567e+03, -.6220205554529216e+02 } ;
-        
-        double a1[7]  = { -.1690478046781745e+00, .3524374318100228e+0,  
-                          -.2698143370550352e+02, .9340783041018743e+02,  
-                          -.1455364428646732e+03, .8805852004723659e+02,  
+
+        double a1[7]  = { -.1690478046781745e+00, .3524374318100228e+0,
+                          -.2698143370550352e+02, .9340783041018743e+02,
+                          -.1455364428646732e+03, .8805852004723659e+02,
                           -.1349018591231947e+02 };
 
         double b1[7] =  { -.1203221171313429e+00, .2684812231556632e+00,
-                          -.2242485268704865e+02, .8723495028643494e+02, 
-                          -.1604352408444319e+03, .1259117982101525e+03, 
+                          -.2242485268704865e+02, .8723495028643494e+02,
+                          -.1604352408444319e+03, .1259117982101525e+03,
                           -.3184861786248824e+02 } ;
 
         double a2[9] = { .3100808562552958e-04, .4097487603011940e-02,
-                         .1214902662897276e+00, .1109167694639028e+01, 
-                         .3228379855663924e+01, .2881691815651599e+01, 
+                         .1214902662897276e+00, .1109167694639028e+01,
+                         .3228379855663924e+01, .2881691815651599e+01,
                          .2047972087262996e+01, .8545922081972148e+00,
                          .3551095884622383e-02 };
 
         double b2[8] = { .3100809298564522e-04, .4097528678663915e-02,
                          .1215907800748757e+00, .1118627167631696e+01,
-                         .3432363984305290e+01, .4140284677116202e+01,  
+                         .3432363984305290e+01, .4140284677116202e+01,
                          .4119797271272204e+01, .2162961962641435e+01 };
 
         double a3[9] = { .3205405422062050e-08, .1899479322632128e-05,
@@ -104,51 +104,51 @@ double inverf(double p)
                 if (fabs(t) > 3.0*eps) {
                         return( -2.0 ) ;
                 }
-        
-        
+
+
                 if (p <= 0.75) {
                         v = p * p - c ;
-                        t = p * (((((a[5]*v + a[4])*v + a[3])*v + 
+                        t = p * (((((a[5]*v + a[4])*v + a[3])*v +
                                      a[2])*v + a[1])*v + a[0]) ;
-                        s = (((((v + b[5])*v + b[4])*v + b[3])*v + 
+                        s = (((((v + b[5])*v + b[4])*v + b[3])*v +
                                  b[2])*v + b[1]) * v + b[0] ;
                 } else {
-                        
+
                         if (p <= 0.9375) {
                                 v = p * p - c1 ;
-                                t = p * ((((((a1[6]*v + a1[5])*v + a1[4])*v + 
+                                t = p * ((((((a1[6]*v + a1[5])*v + a1[4])*v +
                                     a1[3])*v + a1[2])*v + a1[1])*v + a1[0]) ;
-                                s = ((((((v + b1[6])*v + b1[5])*v + b1[4])*v + 
+                                s = ((((((v + b1[6])*v + b1[5])*v + b1[4])*v +
                                     b1[3])*v + b1[2])*v + b1[1]) * v + b1[0] ;
                         } else {
-        
+
                                 v1 = log(q) ;
                                 v = 1.0 / sqrt(-v1) ;
                                 if (v1 >= c2) {
-                                        t = (((((((a2[8]*v + a2[7])*v + 
-                                             a2[6])*v + 
-                                             a2[5])*v + a2[4])*v + a2[3])*v + 
+                                        t = (((((((a2[8]*v + a2[7])*v +
+                                             a2[6])*v +
+                                             a2[5])*v + a2[4])*v + a2[3])*v +
                                              a2[2])*v + a2[1]) * v + a2[0] ;
-        
-                                        s = v * ((((((((v + b2[7])*v + 
-                                            b2[6])*v + 
-                                            b2[5])*v + b2[4])*v + b2[3])*v + 
+
+                                        s = v * ((((((((v + b2[7])*v +
+                                            b2[6])*v +
+                                            b2[5])*v + b2[4])*v + b2[3])*v +
                                             b2[2])*v + b2[1])*v + b2[0]) ;
                                 } else {
-                                        t = (((((((a3[8]*v + a3[7])*v + 
-                                            a3[6])*v + 
-                                            a3[5])*v + a3[4])*v + a3[3])*v + 
+                                        t = (((((((a3[8]*v + a3[7])*v +
+                                            a3[6])*v +
+                                            a3[5])*v + a3[4])*v + a3[3])*v +
                                             a3[2])*v + a3[1]) * v + a3[0] ;
-        
-                                        s = v * ((((((v + b3[5])*v + 
+
+                                        s = v * ((((((v + b3[5])*v +
                                                  b3[4])*v +
-                                                 b3[3])*v + b3[2])*v + 
-                                                 b3[1])*v + 
+                                                 b3[3])*v + b3[2])*v +
+                                                 b3[1])*v +
                                                  b3[0]) ;
                                 }
                         }
                 }
-        
+
                 return( t/s ) ;
         }
 
diff --git a/trick_source/data_products/EQParse/eqparse_stack.c b/trick_source/data_products/EQParse/eqparse_stack.c
index ec203ab4..23fbfa88 100644
--- a/trick_source/data_products/EQParse/eqparse_stack.c
+++ b/trick_source/data_products/EQParse/eqparse_stack.c
@@ -2,7 +2,7 @@
  * Author  : Peter Mosbach (adapted from internet src)
  * Date    : August 2003
  * Desc    : Stack funtions for equation parser.  There are two
- *           stacks.  A stack for longs and a stack for chars. 
+ *           stacks.  A stack for longs and a stack for chars.
  */
 
 #include <stdio.h>
diff --git a/trick_source/data_products/EQParse/eqparse_test.c b/trick_source/data_products/EQParse/eqparse_test.c
index ade73830..6bea04e1 100644
--- a/trick_source/data_products/EQParse/eqparse_test.c
+++ b/trick_source/data_products/EQParse/eqparse_test.c
@@ -404,7 +404,7 @@ int main()
         }
 
        /*-------------------------------------------------------
-        *   Test operators 
+        *   Test operators
         */
         fprintf(stderr, "\nTesting operators and precedence.\n");
 
@@ -487,7 +487,7 @@ int main()
         }
 
        /*-------------------------------------------------------
-        *   Test expressions 
+        *   Test expressions
         */
         fprintf(stderr, "\nTesting parenthetical expressions.\n");
 
@@ -535,7 +535,7 @@ int main()
                 printf("[PASS] %s\n", equation2);
         }
 
-        // log(exp((cos(x)*cos(x) + sin(x)*sin(x))^100)) 
+        // log(exp((cos(x)*cos(x) + sin(x)*sin(x))^100))
         strcpy(equation1, "log(exp((cos(x)*cos(x) + sin(x)*sin(x))^100))");
         strcpy(equation2, equation1);
         ret = equationparse(equation1, 3.21, &y);
@@ -546,7 +546,7 @@ int main()
                 printf("[PASS] %s\n", equation2);
         }
 
-        // log(exp((cos(x)^2 + sin(x)^2)^100)) 
+        // log(exp((cos(x)^2 + sin(x)^2)^100))
         strcpy(equation1, "log(exp((cos(x)^2 + sin(x)^2)^100))");
         strcpy(equation2, equation1);
         ret = equationparse(equation1, 3.21, &y);
@@ -569,7 +569,7 @@ int main()
                 printf("[PASS] %s\n", equation2);
         }
 
-        // (-1)*(-2)*(-cos(0)) 
+        // (-1)*(-2)*(-cos(0))
         strcpy(equation1, "(-1)*(-2)*(-cos(0))");
         strcpy(equation2, equation1);
         ret = equationparse(equation1, 3.0, &y);
@@ -635,7 +635,7 @@ int main()
         }
 
 #ifndef __sun
-        // acos(2) x: out of domain 
+        // acos(2) x: out of domain
         strcpy(equation1, "acos(2)");
         strcpy(equation2, equation1);
         ret = equationparse(equation1, 0.0, &y);
@@ -646,7 +646,7 @@ int main()
                 printf("[PASS] %s\n", equation2);
         }
 
-        // asin(2) x: out of domain 
+        // asin(2) x: out of domain
         strcpy(equation1, "asin(2)");
         strcpy(equation2, equation1);
         ret = equationparse(equation1, 0.0, &y);
@@ -658,7 +658,7 @@ int main()
         }
 #endif
 
-        // atanh(2) x: out of domain 
+        // atanh(2) x: out of domain
         strcpy(equation1, "atanh(2)");
         strcpy(equation2, equation1);
         ret = equationparse(equation1, 0.0, &y);
@@ -669,7 +669,7 @@ int main()
                 printf("[PASS] %s\n", equation2);
         }
 
-        // besy0(-2) x: out of domain 
+        // besy0(-2) x: out of domain
         strcpy(equation1, "besy0(-2)");
         strcpy(equation2, equation1);
         ret = equationparse(equation1, 0.0, &y);
@@ -680,7 +680,7 @@ int main()
                 printf("[PASS] %s\n", equation2);
         }
 
-        // besy1(-2) x: out of domain 
+        // besy1(-2) x: out of domain
         strcpy(equation1, "besy1(-2)");
         strcpy(equation2, equation1);
         ret = equationparse(equation1, 0.0, &y);
@@ -691,7 +691,7 @@ int main()
                 printf("[PASS] %s\n", equation2);
         }
 
-        // inverf(2) x: out of domain 
+        // inverf(2) x: out of domain
         strcpy(equation1, "inverf(2)");
         strcpy(equation2, equation1);
         ret = equationparse(equation1, 0.0, &y);
@@ -702,7 +702,7 @@ int main()
                 printf("[PASS] %s\n", equation2);
         }
 
-        // invnorm(2) x: out of domain 
+        // invnorm(2) x: out of domain
         strcpy(equation1, "invnorm(2)");
         strcpy(equation2, equation1);
         ret = equationparse(equation1, 0.0, &y);
@@ -713,7 +713,7 @@ int main()
                 printf("[PASS] %s\n", equation2);
         }
 
-        // log(0) x: out of domain 
+        // log(0) x: out of domain
         strcpy(equation1, "log(0)");
         strcpy(equation2, equation1);
         ret = equationparse(equation1, 0.0, &y);
@@ -724,7 +724,7 @@ int main()
                 printf("[PASS] %s\n", equation2);
         }
 
-        // log(-1) x: out of domain 
+        // log(-1) x: out of domain
         strcpy(equation1, "log(-1)");
         strcpy(equation2, equation1);
         ret = equationparse(equation1, 0.0, &y);
@@ -735,7 +735,7 @@ int main()
                 printf("[PASS] %s\n", equation2);
         }
 
-        // log10(0) x: out of domain 
+        // log10(0) x: out of domain
         strcpy(equation1, "log10(0)");
         strcpy(equation2, equation1);
         ret = equationparse(equation1, 0.0, &y);
@@ -746,7 +746,7 @@ int main()
                 printf("[PASS] %s\n", equation2);
         }
 
-        // log10(-1) x: out of domain 
+        // log10(-1) x: out of domain
         strcpy(equation1, "log10(-1)");
         strcpy(equation2, equation1);
         ret = equationparse(equation1, 0.0, &y);
@@ -757,7 +757,7 @@ int main()
                 printf("[PASS] %s\n", equation2);
         }
 
-        // sqrt(-1) x: out of domain 
+        // sqrt(-1) x: out of domain
         strcpy(equation1, "sqrt(-1)");
         strcpy(equation2, equation1);
         ret = equationparse(equation1, 0.0, &y);
@@ -815,7 +815,7 @@ int main()
                 printf("[PASS] %s\n", equation2);
         }
 
-        // Passing '_' by itself 
+        // Passing '_' by itself
         strcpy(equation1, "_");
         strcpy(equation2, equation1);
         ret = equationparse(equation1, 0.0, &y);
@@ -826,7 +826,7 @@ int main()
                 printf("[PASS] %s\n", equation2);
         }
 
-        // '_' at end 
+        // '_' at end
         strcpy(equation1, "1 + x_");
         strcpy(equation2, equation1);
         ret = equationparse(equation1, 0.0, &y);
@@ -837,7 +837,7 @@ int main()
                 printf("[PASS] %s\n", equation2);
         }
 
-        // '_' at beginning 
+        // '_' at beginning
         strcpy(equation1, "_x + x");
         strcpy(equation2, equation1);
         ret = equationparse(equation1, 0.0, &y);
@@ -848,7 +848,7 @@ int main()
                 printf("[PASS] %s\n", equation2);
         }
 
-        // '_' not preceded by M 
+        // '_' not preceded by M
         strcpy(equation1, "N_PI");
         strcpy(equation2, equation1);
         ret = equationparse(equation1, 0.0, &y);
@@ -859,7 +859,7 @@ int main()
                 printf("[PASS] %s\n", equation2);
         }
 
-        // '_' not followed by P or E 
+        // '_' not followed by P or E
         strcpy(equation1, "M_pI");
         strcpy(equation2, equation1);
         ret = equationparse(equation1, 0.0, &y);
@@ -870,7 +870,7 @@ int main()
                 printf("[PASS] %s\n", equation2);
         }
 
-        // "M_P" not followed by I 
+        // "M_P" not followed by I
         strcpy(equation1, "M_PE");
         strcpy(equation2, equation1);
         ret = equationparse(equation1, 0.0, &y);
@@ -914,7 +914,7 @@ int main()
                 printf("[PASS] %s\n", equation2);
         }
 
-        // Num args don't match 
+        // Num args don't match
         strcpy(equation1, "sin(x,32)");
         strcpy(equation2, equation1);
         ret = equationparse(equation1, 0.0, &y);
@@ -925,7 +925,7 @@ int main()
                 printf("[PASS] %s\n", equation2);
         }
 
-        // Mispelled div() 
+        // Mispelled div()
         strcpy(equation1, "dev(x,32)");
         strcpy(equation2, equation1);
         ret = equationparse(equation1, 0.0, &y);
@@ -936,7 +936,7 @@ int main()
                 printf("[PASS] %s\n", equation2);
         }
 
-        // Mispelled atan2() 
+        // Mispelled atan2()
         strcpy(equation1, "atuna2(x,32)");
         strcpy(equation2, equation1);
         ret = equationparse(equation1, 0.0, &y);
@@ -947,7 +947,7 @@ int main()
                 printf("[PASS] %s\n", equation2);
         }
 
-        // Args don't match 
+        // Args don't match
         strcpy(equation1, "atan2(x)");
         strcpy(equation2, equation1);
         ret = equationparse(equation1, 0.0, &y);
@@ -958,7 +958,7 @@ int main()
                 printf("[PASS] %s\n", equation2);
         }
 
-        // Illegal character anywhere 
+        // Illegal character anywhere
         strcpy(equation1, "sin(x) = 1");
         strcpy(equation2, equation1);
         ret = equationparse(equation1, 0.0, &y);
@@ -969,7 +969,7 @@ int main()
                 printf("[PASS] %s\n", equation2);
         }
 
-        // Illegal character anywhere 
+        // Illegal character anywhere
         strcpy(equation1, "7!");
         strcpy(equation2, equation1);
         ret = equationparse(equation1, 0.0, &y);
@@ -981,7 +981,7 @@ int main()
         }
 
 
-        // Illegal character anywhere 
+        // Illegal character anywhere
         strcpy(equation1, "sin(x) + x|7 + x^2");
         strcpy(equation2, equation1);
         ret = equationparse(equation1, 0.0, &y);
@@ -992,7 +992,7 @@ int main()
                 printf("[PASS] %s\n", equation2);
         }
 
-        // Illegal character anywhere 
+        // Illegal character anywhere
         strcpy(equation1, "x|7");
         strcpy(equation2, equation1);
         ret = equationparse(equation1, 0.0, &y);
@@ -1025,7 +1025,7 @@ int main()
                 printf("[PASS] %s\n", equation2);
         }
 
-        // Operands without operator 
+        // Operands without operator
         strcpy(equation1, "sin(x1)");
         strcpy(equation2, equation1);
         ret = equationparse(equation1, 0.0, &y);
@@ -1058,7 +1058,7 @@ int main()
                 printf("[PASS] %s\n", equation2);
         }
 
-        // Two letter variable 
+        // Two letter variable
         strcpy(equation1, "xy + 1");
         strcpy(equation2, equation1);
         ret = equationparse(equation1, 0.0, &y);
@@ -1069,7 +1069,7 @@ int main()
                 printf("[PASS] %s\n", equation2);
         }
 
-        // Missing paren  
+        // Missing paren
         strcpy(equation1, "(x + 2");
         strcpy(equation2, equation1);
         ret = equationparse(equation1, 0.0, &y);
@@ -1162,7 +1162,7 @@ int main()
 
 
        /*-------------------------------------------------------
-        * Other Tests  
+        * Other Tests
         */
         fprintf(stderr, "\nMore tests.\n");
 
@@ -1180,7 +1180,7 @@ int main()
         }
 #endif
 
-        // Curly braces 
+        // Curly braces
         strcpy(equation1, "sin( {x + 1}^2 )");
         strcpy(equation2, equation1);
         ret = equationparse(equation1, 1.0, &y);
@@ -1191,7 +1191,7 @@ int main()
                 printf("[PASS] %s\n", equation2);
         }
 
-        // Square brackets 
+        // Square brackets
         strcpy(equation1, "[sin( {x + 1}^2 )]*[ ( x + 1) ]");
         strcpy(equation2, equation1);
         ret = equationparse(equation1, 1.0, &y);
diff --git a/trick_source/data_products/Log/Csv.cpp b/trick_source/data_products/Log/Csv.cpp
index 900847cf..c0271f15 100644
--- a/trick_source/data_products/Log/Csv.cpp
+++ b/trick_source/data_products/Log/Csv.cpp
@@ -24,7 +24,7 @@ Csv::Csv(char * file_name , char * param_name ) {
         header = new char[20480] ;
         fgets( header , 20480 , fp_ );
 
-        // remove trailing newline 
+        // remove trailing newline
         header[strlen(header)-1] = '\0' ;
 
         field_num_ = 0 ;
@@ -157,7 +157,7 @@ int CsvLocateParam( char * file_name , char * param_name ) {
                 header = new char[20480] ;
                 fgets( header , 20480 , fp );
 
-                // remove trailing newline 
+                // remove trailing newline
                 header[strlen(header)-1] = '\0' ;
                 next_field = strtok( header , "," ) ;
                 do {
diff --git a/trick_source/data_products/Log/DataStream.cpp b/trick_source/data_products/Log/DataStream.cpp
index b17089a3..2564a2e1 100644
--- a/trick_source/data_products/Log/DataStream.cpp
+++ b/trick_source/data_products/Log/DataStream.cpp
@@ -7,7 +7,7 @@ DataStream::DataStream() {
         unitTimeStr_ = "s" ;
 }
 
-DataStream::~DataStream() 
+DataStream::~DataStream()
 {
         // Nada
 }
@@ -18,11 +18,11 @@ int DataStream::getValueAtTime(double time , double * value ) {
         int ret = 0 ;
 
         begin() ;
-        while ( (ret = get( &value_time , value )) && 
+        while ( (ret = get( &value_time , value )) &&
                 (fabs( value_time - time ) > 1e-9 )) ;
 
         return(ret) ;
-        
+
 }
 
 string DataStream::getFileName() {
diff --git a/trick_source/data_products/Log/DataStreamFactory.cpp b/trick_source/data_products/Log/DataStreamFactory.cpp
index 3a02e669..9cfc0029 100644
--- a/trick_source/data_products/Log/DataStreamFactory.cpp
+++ b/trick_source/data_products/Log/DataStreamFactory.cpp
@@ -129,7 +129,7 @@ DataStream* DataStreamFactory::create( const char* iRunDir,
                                 	(char *)paramName.c_str(),
                                 	(char *)timeName) ) {
         		closedir(dirp) ;
-            	stream = new MatLab4(full_path , 
+            	stream = new MatLab4(full_path ,
 									 (char *)paramName.c_str(),
             						 (char *)timeName ) ;
             	free( full_path ) ;
diff --git a/trick_source/data_products/Log/DataStreamFactory.hh b/trick_source/data_products/Log/DataStreamFactory.hh
index bb9a719b..6b1172d4 100644
--- a/trick_source/data_products/Log/DataStreamFactory.hh
+++ b/trick_source/data_products/Log/DataStreamFactory.hh
@@ -31,12 +31,12 @@ class DataStreamFactory {
 
    public:
         DataStreamFactory() {}
-        ~DataStreamFactory() ; 
-        DataStream* create(const char* path, const char* paramName , 
+        ~DataStreamFactory() ;
+        DataStream* create(const char* path, const char* paramName ,
                            const char* timeName );
         DataStream* create( const char* sharedLibName,
                             int nInputStreams, DataStream** istreams,
-                            int nOutputStreams, int outputIdx) ; 
+                            int nOutputStreams, int outputIdx) ;
         DataStream* create(const char* machine, const unsigned short port ,
                            const char* paramName );
 
diff --git a/trick_source/data_products/Log/DataStreamGroup.cpp b/trick_source/data_products/Log/DataStreamGroup.cpp
index 0e7742b5..911a75b3 100644
--- a/trick_source/data_products/Log/DataStreamGroup.cpp
+++ b/trick_source/data_products/Log/DataStreamGroup.cpp
@@ -40,17 +40,17 @@ void DataStreamGroup::add( DataStream* ds ) {
         currTime_.push_back(0.0);
 }
 
-void DataStreamGroup::clear() 
+void DataStreamGroup::clear()
 {
         dataStreams_.clear() ;
 }
 
 void DataStreamGroup::setPreserveTimeOn() {
-        preserveTime_ = 1 ; 
+        preserveTime_ = 1 ;
 }
 
 void DataStreamGroup::setPreserveTimeOff() {
-        preserveTime_ = 0 ; 
+        preserveTime_ = 0 ;
 }
 
 void DataStreamGroup::begin()
@@ -59,11 +59,11 @@ void DataStreamGroup::begin()
         double timeStamp ;
 
         isEOF_ = 0 ;
-                                                                                
+
         for ( ii = 0; ii < dataStreams_.size(); ii++ ) {
                 dataStreams_[ii]->begin();
         }
-                                                                                
+
         // Reset frequency
         if ( frequency_ == 0.0 ) {
                 nextFrequencyCheck_ = DBL_MAX;
@@ -74,9 +74,9 @@ void DataStreamGroup::begin()
                         nextFrequencyCheck_ = startTime_ ;
                 }
         }
-	
-	// Changed from 1.0 to 0.0 since this variable is increased by 1 first 
-	// for getting next frequency check in stepInTime_ method. 
+
+	// Changed from 1.0 to 0.0 since this variable is increased by 1 first
+	// for getting next frequency check in stepInTime_ method.
         frequencyMultiple_ = 0.0 ;
 
         // If time < start time requested by user,
@@ -86,17 +86,17 @@ void DataStreamGroup::begin()
                 step() ;
                 timeStamp = getTime();
         }
- 
+
         // Grab data from each stream without stepping
         for ( ii = 0; ii < dataStreams_.size(); ii++ ) {
                 dataStreams_[ii]->peek(&lastRead_[dataStreams_[ii]].time,
                                        &lastRead_[dataStreams_[ii]].value);
-                                       
+
         }
 }
 
 
-bool DataStreamGroup::end() 
+bool DataStreamGroup::end()
 {
         return isEOF_ ;
 }
@@ -115,8 +115,8 @@ void DataStreamGroup::step() {
         if ( preserveTime_ ) {
                 pVal = currTime_[0] ;
                 stepAgain = 0 ;
-                for ( ii = 1 ; ii < currTime_.size() ; ii++ ) { 
-                        if ( pVal != currTime_[ii] ) { 
+                for ( ii = 1 ; ii < currTime_.size() ; ii++ ) {
+                        if ( pVal != currTime_[ii] ) {
                                 stepAgain = 1 ;
                         }
                 }
@@ -139,20 +139,20 @@ void DataStreamGroup::step() {
 // In the case of error plotting, you do not want any extra
 // data points if the time stamps do not match
 double DataStreamGroup::getTime( ) {
-                                                                                
+
         double minTime = DBL_MAX;
         double time, val ;
         unsigned int ii ;
-                                                                                
+
         for ( ii = 0 ; ii < dataStreams_.size() ; ii++ ) {
-                                                                                
+
                 if ( ! dataStreams_[ii]->end() ) {
                         dataStreams_[ii]->peek(&time, &val) ;
                         currTime_[ii] = time ;
                 } else {
                         currTime_[ii] = DBL_MAX ;
                 }
-                                                                                
+
                 if (currTime_[ii] < minTime) {
                         minTime = currTime_[ii];
                 }
@@ -162,12 +162,12 @@ double DataStreamGroup::getTime( ) {
 }
 
 
-// Advance through records in each data stream synchronously 
+// Advance through records in each data stream synchronously
 //
-// Example: If data stream "A" is recorded at 1.0 second, 
+// Example: If data stream "A" is recorded at 1.0 second,
 // and "B" at 10 seconds.  Both will advance at time zero.
 // Then at time=1.0, log "A" will have a record read.  "B" will not be read.
-// At time=2.0 through time=9.0 the same will occur. A advances, B stays put. 
+// At time=2.0 through time=9.0 the same will occur. A advances, B stays put.
 // At time=10.0, both A and B will be read from.  Both will advance.
 // This keeps the data on the same time stamp on like intervals.
 //
@@ -198,15 +198,15 @@ int DataStreamGroup::stepInTime_() {
         int isEOF ;
 
         double t, x ;
-        
+
         // Get all values in all data log groups
         // Also get mininum time stamp from all log data files
-        minTime = getTime(); 
+        minTime = getTime();
 
         // Take a step through time (sounds like a song)
         for ( ii = 0 ; ii < dataStreams_.size() ; ii++ ) {
                 if ( currTime_[ii] == minTime && !dataStreams_[ii]->end() ) {
-                        dataStreams_[ii]->get(&t, &x); 
+                        dataStreams_[ii]->get(&t, &x);
                 }
         }
 
@@ -223,10 +223,10 @@ int DataStreamGroup::stepInTime_() {
                 return(1) ;
         }
 
-        // Now that a time step has occured 
+        // Now that a time step has occured
         // Get the new mininum time stamp and associated
         // values from all log data files
-        minTime = getTime(); 
+        minTime = getTime();
 
 
         // Step depending on frequency
@@ -235,16 +235,16 @@ int DataStreamGroup::stepInTime_() {
                 // Handle Frequency (if specified)
                 if ( nextFrequencyCheck_ != DBL_MAX ) {
 
-                        if ( NEXTFREQ_EQUALS_MINTIME ) { 
+                        if ( NEXTFREQ_EQUALS_MINTIME ) {
 
                                 // Frequency synced with a data point
-                                // Stops recursion 
+                                // Stops recursion
                                 NEXTFREQ_INCR ;
 
                         } else if ( minTime - nextFrequencyCheck_ > 0.0 ) {
 
                                 // Mintime exceeded nextFreqCheck
-                                // Frequency must be higher than 
+                                // Frequency must be higher than
                                 // data frequency
 
                                 // Bump nextFrequencyCheck past minTime
@@ -261,14 +261,14 @@ int DataStreamGroup::stepInTime_() {
                                 } else {
 
                                         // No sync, keep iterating through data
-                                        return(0); 
+                                        return(0);
                                 }
                         } else {
-        
+
                                 // Mintime is less than nextFreq check
                                 // Need to iterate again
                                 return(0) ;
-                        } 
+                        }
                 }
         }
 
@@ -283,7 +283,7 @@ int DataStreamGroup::stepInTime_() {
 
 
 
-// Advance through records in each data stream synchronously 
+// Advance through records in each data stream synchronously
 // Reading will stop when one of the streams is out of data
 int DataStreamGroup::matchTimeStamps() {
 
@@ -292,7 +292,7 @@ int DataStreamGroup::matchTimeStamps() {
         int frequency_match ;
         double maxTime ;
 
-        frequency_match = 0 ; 
+        frequency_match = 0 ;
         while ( !frequency_match ) {
 
                 matched_time_stamps = 0 ;
@@ -301,7 +301,7 @@ int DataStreamGroup::matchTimeStamps() {
 
                         // get the next record out of the file and find the maximum time stamp
                         for ( ii = 0 ; ii < dataStreams_.size() ; ii++ ) {
-                                if ( ! dataStreams_[ii]->get(&lastRead_[dataStreams_[ii]].time, 
+                                if ( ! dataStreams_[ii]->get(&lastRead_[dataStreams_[ii]].time,
                                         &lastRead_[dataStreams_[ii]].value) ) {
                                         isEOF_ = 1 ;
                                         return(0) ;
@@ -321,7 +321,7 @@ int DataStreamGroup::matchTimeStamps() {
                         for ( ii = 0 ; ii < dataStreams_.size() ; ii++ ) {
                                 while ( maxTime -
                                         lastRead_[dataStreams_[ii]].time > timeMatchTolerance_ ) {
-                                        if ( ! dataStreams_[ii]->get(&lastRead_[dataStreams_[ii]].time, 
+                                        if ( ! dataStreams_[ii]->get(&lastRead_[dataStreams_[ii]].time,
                                                 &lastRead_[dataStreams_[ii]].value)) {
                                                 isEOF_ = 1 ;
                                                 return(0) ;
diff --git a/trick_source/data_products/Log/Delta.cpp b/trick_source/data_products/Log/Delta.cpp
index 461bfd39..88fcccc8 100644
--- a/trick_source/data_products/Log/Delta.cpp
+++ b/trick_source/data_products/Log/Delta.cpp
@@ -20,7 +20,7 @@ Delta::Delta(const char * deltaStatement, const char* timeName)
         // The delta statement is formatted like:
         // delta(<var1:run1>, <var2:run2>)
 
-        // Extract <var1:run1> <var2:run2> 
+        // Extract <var1:run1> <var2:run2>
         ret = sscanf(deltaStatement, "delta(%[^,],%[^)]", vr1, vr2);
         if ( ret != 2 ) {
                 fprintf(stderr, "ERROR: Delta::Delta() received bad spec "
@@ -35,14 +35,14 @@ Delta::Delta(const char * deltaStatement, const char* timeName)
         dsg_.add(dataStream2_);
 }
 
-Delta::~Delta() 
+Delta::~Delta()
 {
         delete dataStream1_ ;
         delete dataStream2_ ;
 }
 
 
-int Delta::get( double * time , double * value ) 
+int Delta::get( double * time , double * value )
 {
         int ret ;
         double val1, val2 ;
@@ -61,7 +61,7 @@ int Delta::get( double * time , double * value )
         return(ret) ;
 }
 
-int Delta::peek( double * time , double * value ) 
+int Delta::peek( double * time , double * value )
 {
         int ret ;
         double val1, val2 ;
@@ -74,18 +74,18 @@ int Delta::peek( double * time , double * value )
         return(ret) ;
 }
 
-void Delta::begin() 
+void Delta::begin()
 {
         dsg_.begin();
         return ;
 }
 
-int Delta::end() 
+int Delta::end()
 {
         return (dsg_.end()) ;
 }
 
-int Delta::step() 
+int Delta::step()
 {
         dsg_.step();
         return(0) ;
diff --git a/trick_source/data_products/Log/ExternalProgram.cpp b/trick_source/data_products/Log/ExternalProgram.cpp
index 5e61bd66..faf79f8b 100644
--- a/trick_source/data_products/Log/ExternalProgram.cpp
+++ b/trick_source/data_products/Log/ExternalProgram.cpp
@@ -6,7 +6,7 @@
 
 ExternalProgram::ExternalProgram( const char* sharedLibName,
                                    int nInputStreams, DataStream** istreams,
-                                   int nOutputs, int outputIdx ) 
+                                   int nOutputs, int outputIdx )
 {
         char msg[80];
         int ii ;
@@ -46,7 +46,7 @@ ExternalProgram::ExternalProgram( const char* sharedLibName,
         output_ = new double[nOutputs];
 
         // Since this is a "stream", only one output value
-        // will be returned (see get()).  The output index passed 
+        // will be returned (see get()).  The output index passed
         // in indicates which output to pass back.
         if ( nOutputs_ <= outputIdx ) {
                 cerr << "ERROR: External program output index exceeds total "
@@ -56,9 +56,9 @@ ExternalProgram::ExternalProgram( const char* sharedLibName,
         outputIdx_ = outputIdx ;
 }
 
-ExternalProgram::~ExternalProgram() 
+ExternalProgram::~ExternalProgram()
 {
-        unsigned int ii ; 
+        unsigned int ii ;
 
         delete[] input_ ;
         delete[] output_ ;
@@ -68,7 +68,7 @@ ExternalProgram::~ExternalProgram()
         }
 }
 
-int ExternalProgram::step() 
+int ExternalProgram::step()
 {
         dsg_.step();
         return(0) ;
@@ -86,7 +86,7 @@ int ExternalProgram::peek(double* timeStamp, double* paramValue)
 
 /**
  * Advance (step) through stream
- * And get parameter and time stamp values, 
+ * And get parameter and time stamp values,
  */
 int ExternalProgram::get(double* timeStamp, double* outputValue)
 {
@@ -125,7 +125,7 @@ int ExternalProgram::getOutputValue( double* timeStamp, double* outputValue )
 }
 
 /**
- * Advance through data 
+ * Advance through data
  * Get parameter and time stamp values
  */
 void ExternalProgram::begin()
diff --git a/trick_source/data_products/Log/ExternalProgram.hh b/trick_source/data_products/Log/ExternalProgram.hh
index e4e7d39e..81260aed 100644
--- a/trick_source/data_products/Log/ExternalProgram.hh
+++ b/trick_source/data_products/Log/ExternalProgram.hh
@@ -16,7 +16,7 @@ class ExternalProgram : public DataStream {
         int end();
         int step();
 
-   // This section is unique to the external program 
+   // This section is unique to the external program
    public:
         ExternalProgram( const char* sharedLibName,
                          int numInputs, DataStream** istreams,
@@ -34,9 +34,9 @@ class ExternalProgram : public DataStream {
 
         // Input streams which are created from program inputs
         vector < DataStream* >istreams_;
-                                                                                
+
         char *error;
-                                                                                
+
         char *sharedLibName_;
         void *progHandle_;
         double *progInput_;     // Input into external program
@@ -46,11 +46,11 @@ class ExternalProgram : public DataStream {
         double *input_;         // Sized to nInputs
         double *output_;        // Sized to nOutputs
 
-        // Since this is a "stream", only one external program output 
+        // Since this is a "stream", only one external program output
         // will be accessed.  The outputIdx_ is the index of the parameter
         // to access.
         int outputIdx_ ;
-                                                                                
+
         // This is the program that will be dynamically linked.
         // The program is normally created by a developer.
         // The program takes a set of inputs and generates
@@ -58,7 +58,7 @@ class ExternalProgram : public DataStream {
         int (*external_program) (double *in, int numIn,
                                  double *out, int numOut);
 
-        // Run the external shared library program and load the 
+        // Run the external shared library program and load the
         // output value and time stamp associated with outputIdx
         int getOutputValue( double* timeStamp, double* outputValue ) ;
 } ;
diff --git a/trick_source/data_products/Log/MatLab.cpp b/trick_source/data_products/Log/MatLab.cpp
index 15d93a80..b1253b31 100644
--- a/trick_source/data_products/Log/MatLab.cpp
+++ b/trick_source/data_products/Log/MatLab.cpp
@@ -155,7 +155,7 @@ MatLab::MatLab(char * file_name, char * param_name, char * time_name) {
                     dim_type = trick_byteswap_int(dim_type) ;
                 }
 
-                // dim bytes = ( num_dim * 4 ) 
+                // dim bytes = ( num_dim * 4 )
                 fread(&dim_bytes, 4, 1, fp_) ;
                 if (swap_) {
                     dim_bytes = trick_byteswap_int(dim_bytes) ;
@@ -196,7 +196,7 @@ MatLab::MatLab(char * file_name, char * param_name, char * time_name) {
                 if (offset % 8) {
                     fseek(fp_, 8 - (offset % 8), SEEK_CUR) ;
                 }
-                
+
                 // for mxSTRUCT_CLASS
                 if (array_class == mxSTRUCT_CLASS) {
                     int field_name_len, each_field_name_len;
@@ -205,43 +205,43 @@ MatLab::MatLab(char * file_name, char * param_name, char * time_name) {
                     if (swap_) {
                         each_field_name_len = trick_byteswap_short(each_field_name_len);
                     }
-                   
+
                     fseek(fp_, 4, SEEK_CUR);
                     fread(&field_name_len, 4, 1, fp_);
                     if (swap_) {
                         field_name_len = trick_byteswap_short(field_name_len);
                     }
-                                       
+
                     field_found = false;
                     field_num = field_name_len / each_field_name_len;
                     for (field_index = 0; field_index < field_num; field_index++) {
                         field_name = new char[each_field_name_len];
                         fread(field_name, each_field_name_len, 1, fp_);
-                        
-                        variable_name = new char[name_bytes+each_field_name_len+1]; 
+
+                        variable_name = new char[name_bytes+each_field_name_len+1];
                         strcpy(variable_name, name);
-                        
+
                         strcat(variable_name, ".");
                         strcat(variable_name, field_name);
 
-                        if (!strcmp( variable_name , param_name )) {  
+                        if (!strcmp( variable_name , param_name )) {
                             name = new char[strlen(variable_name)];
                             strcpy(name, variable_name);
                             field_found = true;
                             delete field_name;
                             delete variable_name;
                             break;
-                        } 
+                        }
                         delete field_name;
                         delete variable_name;
                     }
-                                       
+
                     if (field_found) {
                         fseek(fp_, (field_num-field_index-1)*each_field_name_len, SEEK_CUR);
                     }
-                    
+
                     ii = 0;
-                    while (ii < field_num) {                       
+                    while (ii < field_num) {
                         // Numeric array for each field
                         // this is either 0 or num_bytes if non_zero
                         fread(&temp, 4, 1, fp_) ;
@@ -251,7 +251,7 @@ MatLab::MatLab(char * file_name, char * param_name, char * time_name) {
                         if ( (temp >> 16 ) == 0) {
                             // data_type
                             field_data_type = temp;
-    
+
                             // bytes
                             fread(&field_bytes, 4, 1, fp_) ;
                             if (swap_) {
@@ -261,7 +261,7 @@ MatLab::MatLab(char * file_name, char * param_name, char * time_name) {
                             field_bytes = temp >> 16;
                             field_data_type = temp & 0x0000FFFF;
                         }
-                        
+
                         if (ii == field_index) {
                             break;
                         } else {
@@ -269,34 +269,34 @@ MatLab::MatLab(char * file_name, char * param_name, char * time_name) {
                             ii++;
                         }
                     }
-                    
+
                     if (field_found ){
                         if (field_data_type == MI_MATRIX) {
                             // array type is always miUINT32
                             fread(&array_type, 4, 1, fp_) ;
-                            
+
                             // array bytes is always 8
                             fread(&array_bytes, 4, 1, fp_) ;
-                            
+
                             // array flags
                             fread(array_flags, 8, 1, fp_) ;
                             if (swap_) {
                                 array_flags[0] = trick_byteswap_int(array_flags[0]) ;
                             }
-    
+
                             // dim type is always miINT32
                             fread(&dim_type, 4, 1, fp_) ;
                             if (swap_) {
                                 dim_type = trick_byteswap_int(dim_type) ;
                             }
-                           
+
                             fread(&dim_bytes, 4, 1, fp_) ;
                             if (swap_) {
                                 dim_bytes = trick_byteswap_int(dim_bytes) ;
                             }
-                            
+
                             num_dims = dim_bytes / 4;
-                            
+
                             dims = new int[num_dims];
                             for (ii = 0; ii < num_dims; ii++) {
                                 fread(&dims[ii], 4, 1, fp_) ;
@@ -304,24 +304,24 @@ MatLab::MatLab(char * file_name, char * param_name, char * time_name) {
                                     dims[ii] = trick_byteswap_int(dims[ii]) ;
                                 }
                             }
-                           
+
                             // each array name
                             fread(&temp, 4, 1, fp_) ;
                             fread(&temp, 4, 1, fp_);
-                            
+
                             // field data, could be a small data element format if we
                             // have a data element takes up only 1 to 4 bytes.
                             // if first 2 bytes of the tag are not 0, the tag uses the small
-                            // data element format. 
+                            // data element format.
                             fread(&temp, 4, 1, fp_) ;
                             if (swap_) {
                                 temp = trick_byteswap_short(temp) ;
                             }
-                            
+
                             if ( (temp >> 16 ) == 0) {
                                 // data_type
                                 real_type = temp;
-    
+
                                 // bytes
                                 fread(&real_bytes, 4, 1, fp_) ;
                                 if (swap_) {
@@ -330,9 +330,9 @@ MatLab::MatLab(char * file_name, char * param_name, char * time_name) {
                             } else {
                                 real_bytes = temp >> 16;
                                 real_type = temp & 0x0000FFFF;
-    
+
                             }
-                        
+
                             // TODO: make sure else part
                         } else {
                             // Everythig else we skip
@@ -344,8 +344,8 @@ MatLab::MatLab(char * file_name, char * param_name, char * time_name) {
                         real_bytes = 0;
                         real_type = 0;
                     }
-                   
-                } else {                            
+
+                } else {
                     // real data type
                     fread(&real_type, 4, 1, fp_) ;
                     if (swap_) {
@@ -357,7 +357,7 @@ MatLab::MatLab(char * file_name, char * param_name, char * time_name) {
                         real_bytes = trick_byteswap_int(real_bytes) ;
                     }
                 }
-                
+
                 switch (real_type) {
                 case MI_INT8:
                     type = TRICK_CHARACTER;
@@ -411,7 +411,7 @@ MatLab::MatLab(char * file_name, char * param_name, char * time_name) {
 
                 // TODO: Array bounds checking
                 if (array_class == mxSTRUCT_CLASS) {
-                    
+
                     if (!strcmp(name, param_name)) {
                         y_value_.size_ = size;
                         y_value_.type_ = type;
@@ -419,7 +419,7 @@ MatLab::MatLab(char * file_name, char * param_name, char * time_name) {
                         y_value_.num_dims_ = num_dims;
                         y_value_.dims_ = dims;
                         y_value_.data_offset_ = ftell(fp_) ;
-                        found = param_found = true;                       
+                        found = param_found = true;
                     }
                     if (!strcmp(name, time_name)) {
                         time_value_.size_ = size;
@@ -440,7 +440,7 @@ MatLab::MatLab(char * file_name, char * param_name, char * time_name) {
                         y_value_.data_offset_ = ftell(fp_) ;
                         found = param_found = true;
                     }
-    
+
                     if ( !strcmp(name, time_name)) {
                         time_value_.size_ = size;
                         time_value_.type_ = type;
@@ -451,11 +451,11 @@ MatLab::MatLab(char * file_name, char * param_name, char * time_name) {
                         found = time_found = true;
                     }
                 }
-                          
+
                 // skip past this array
                 fseek(fp_, real_bytes, SEEK_CUR) ;
-                if (array_class != mxSTRUCT_CLASS) {    
-                    
+                if (array_class != mxSTRUCT_CLASS) {
+
                     // make sure that we are on a 64 bit boundary
                     offset = ftell(fp_) ;
                     if (offset % 8) {
@@ -471,15 +471,15 @@ MatLab::MatLab(char * file_name, char * param_name, char * time_name) {
                         if (swap_) {
                             img_bytes = trick_byteswap_int(img_bytes) ;
                         }
-    
+
                         fseek(fp_, img_bytes, SEEK_CUR) ;
-    
+
                         // make sure that we are on a 64 bit boundary
                         offset = ftell(fp_) ;
                         if (offset % 8) {
                             fseek(fp_, 8 - (offset % 8), SEEK_CUR) ;
                         }
-    
+
                     }
                 } else {
                     // for mxSTRUCT_CLASS, skip pass all the other fields
@@ -500,15 +500,15 @@ MatLab::MatLab(char * file_name, char * param_name, char * time_name) {
                             bytes = temp >> 16;
                         }
                         fseek(fp_, bytes, SEEK_CUR);
-                        field_index++;                     
+                        field_index++;
                     }
-                    
+
                     // make sure that we are on a 64 bit boundary
                     offset = ftell(fp_) ;
                     if (offset % 8) {
                         fseek(fp_, 8 - (offset % 8), SEEK_CUR) ;
                     }
-                   
+
                 }
 
                 if ( !found) {
@@ -579,7 +579,7 @@ int MatLab::get(double * time, double * value) {
 
     long offset;
 
-    
+
     if (curr_row_ < y_value_.dims_[0] && curr_row_ < time_value_.dims_[0]) {
         offset = time_value_.data_offset_ + time_value_.dims_[0]
                 * time_value_.field_num_ * time_value_.size_ + curr_row_
@@ -593,7 +593,7 @@ int MatLab::get(double * time, double * value) {
         fseek(fp_, offset, SEEK_SET) ;
         *value = getvalue(&y_value_) ;
         curr_row_++;
-       
+
         return ( 1 );
     }
 
@@ -654,7 +654,7 @@ int MatLabLocateParam(char * file_name, char * param_name, char * time_name) {
     int y_field_num, time_field_num;
     FILE *fp;
     int field_index, field_num;
-    
+
     if ((fp = fopen(file_name, "r")) == 0) {
         printf("ERROR:  Couldn't open \"%s\"\n", file_name) ;
         return (0);
@@ -697,7 +697,7 @@ int MatLabLocateParam(char * file_name, char * param_name, char * time_name) {
 
         param_found = time_found = false;
         while ( (!param_found || !time_found) && !feof(fp)) {
-           
+
             // this is either 0 or num_bytes if non_zero
             fread(&temp, 4, 1, fp) ;
             if (swap) {
@@ -738,7 +738,7 @@ int MatLabLocateParam(char * file_name, char * param_name, char * time_name) {
                     dim_type = trick_byteswap_int(dim_type) ;
                 }
 
-                // dim bytes = ( num_dim * 4 ) 
+                // dim bytes = ( num_dim * 4 )
                 fread(&dim_bytes, 4, 1, fp) ;
                 if (swap) {
                     dim_bytes = trick_byteswap_int(dim_bytes) ;
@@ -779,7 +779,7 @@ int MatLabLocateParam(char * file_name, char * param_name, char * time_name) {
                 if (offset % 8) {
                     fseek(fp, 8 - (offset % 8), SEEK_CUR) ;
                 }
-                
+
                 // for mxSTRUCT_CLASS
                 if (array_class == mxSTRUCT_CLASS) {
                     int field_name_len, each_field_name_len;
@@ -788,25 +788,25 @@ int MatLabLocateParam(char * file_name, char * param_name, char * time_name) {
                     if (swap) {
                         each_field_name_len = trick_byteswap_short(each_field_name_len);
                     }
-                    
+
                     fseek(fp, 4, SEEK_CUR);
                     fread(&field_name_len, 4, 1, fp);
                     if (swap) {
                         field_name_len = trick_byteswap_short(field_name_len);
                     }
-                    
+
                     field_num = field_name_len / each_field_name_len;
-                    
+
                     field_found = false;
                     for (field_index = 0; field_index < field_num; field_index++) {
                         field_name = new char[each_field_name_len];
-                        fread(field_name, each_field_name_len, 1, fp);                       
-                        variable_name = new char[name_bytes+each_field_name_len+1]; 
-                        strcpy(variable_name, name);                        
+                        fread(field_name, each_field_name_len, 1, fp);
+                        variable_name = new char[name_bytes+each_field_name_len+1];
+                        strcpy(variable_name, name);
                         strcat(variable_name, ".");
                         strcat(variable_name, field_name);
 
-                        if (!strcmp( variable_name , param_name ) ) {  
+                        if (!strcmp( variable_name , param_name ) ) {
                             name = new char[strlen(variable_name)];
                             strcpy(name, variable_name);
                             field_found = true;
@@ -817,8 +817,8 @@ int MatLabLocateParam(char * file_name, char * param_name, char * time_name) {
                         delete field_name;
                         delete variable_name;
                     }
-                    
-                    if (field_found) {                  
+
+                    if (field_found) {
                         fseek(fp, (field_num-field_index-1)*each_field_name_len, SEEK_CUR);
                     }
                     ii = 0;
@@ -830,7 +830,7 @@ int MatLabLocateParam(char * file_name, char * param_name, char * time_name) {
                             temp = trick_byteswap_int(temp) ;
                         }
                         if ( (temp >> 16 ) == 0) {
-                            
+
                             // bytes
                             fread(&bytes, 4, 1, fp) ;
                             if (swap) {
@@ -840,9 +840,9 @@ int MatLabLocateParam(char * file_name, char * param_name, char * time_name) {
                             bytes = temp >> 16;
                         }
                         fseek(fp, bytes, SEEK_CUR);
-                        ii++;                     
-                    }                    
-                } else {                            
+                        ii++;
+                    }
+                } else {
                     // real data type
                     fread(&real_type, 4, 1, fp) ;
                     if (swap) {
@@ -854,31 +854,31 @@ int MatLabLocateParam(char * file_name, char * param_name, char * time_name) {
                         real_bytes = trick_byteswap_int(real_bytes) ;
                     }
                 }
-               
+
                 // TODO: Array bounds checking
                 if (array_class == mxSTRUCT_CLASS) {
-                   
+
                     if (!strcmp(name, param_name)) {
                         param_found = true;
                     }
-    
+
                     if (!strcmp(name, time_name)) {
-                        
+
                        time_found = true;
                     }
                 } else {
-                    
+
                     if (!strncmp(name, param_name, name_bytes)) {
-                        param_found = true;                       
+                        param_found = true;
                     }
                     if (!strncmp(name, time_name, name_bytes)) {
                         time_found = true;
                     }
-                    
+
                 }
                 delete name;
                 delete dims;
-                
+
                 if (param_found && time_found) {
                     fclose(fp);
                     return(1);
@@ -886,13 +886,13 @@ int MatLabLocateParam(char * file_name, char * param_name, char * time_name) {
                 if (array_class != mxSTRUCT_CLASS) {
                     // skip past this array
                     fseek(fp, real_bytes, SEEK_CUR) ;
-    
+
                     // make sure that we are on a 64 bit boundary
                     offset = ftell(fp) ;
                     if (offset % 8) {
                         fseek(fp, 8 - (offset % 8), SEEK_CUR) ;
                     }
-    
+
                     // skip over the imaginary part if any right now
                     if (array_complex) {
                         // real data type
@@ -902,15 +902,15 @@ int MatLabLocateParam(char * file_name, char * param_name, char * time_name) {
                         if (swap) {
                             img_bytes = trick_byteswap_int(img_bytes) ;
                         }
-    
+
                         fseek(fp, img_bytes, SEEK_CUR) ;
-    
+
                         // make sure that we are on a 64 bit boundary
                         offset = ftell(fp) ;
                         if (offset % 8) {
                             fseek(fp, 8 - (offset % 8), SEEK_CUR) ;
                         }
-    
+
                     }
                 }
             } else {
diff --git a/trick_source/data_products/Log/MatLab4.cpp b/trick_source/data_products/Log/MatLab4.cpp
index 73700510..fe83be67 100644
--- a/trick_source/data_products/Log/MatLab4.cpp
+++ b/trick_source/data_products/Log/MatLab4.cpp
@@ -33,7 +33,7 @@ MatLab4::MatLab4(char * file_name , char * param_name , char * time_name ) {
            printf("ERROR:  Couldn't open \"%s\"\n" , file_name ) ;
            exit(-1) ;
         }
-        
+
         // we use fseek calls to move around so I need to know the max offset of the file
         fseek( fp_ , 0 , SEEK_END ) ;
         max_offset = ftell(fp_) ;
@@ -62,7 +62,7 @@ MatLab4::MatLab4(char * file_name , char * param_name , char * time_name ) {
 
                 // read the type in
                 fread( &temp , 4 , 1 , fp_ ) ;
-                if ( ! strncmp( (char *)&temp , "MATL" , 4 )) { 
+                if ( ! strncmp( (char *)&temp , "MATL" , 4 )) {
                         fclose(fp_) ;
                         return ;
                 }
@@ -124,7 +124,7 @@ MatLab4::MatLab4(char * file_name , char * param_name , char * time_name ) {
                         fclose(fp_) ;
                         return ;
                 }
-                
+
                 fread( &row , 4 , 1 , fp_ ) ;
                 if ( swap_ ) { row = trick_byteswap_int(row) ; }
 
@@ -137,7 +137,7 @@ MatLab4::MatLab4(char * file_name , char * param_name , char * time_name ) {
                 fread( &len , 4 , 1 , fp_ ) ;
                 if ( swap_ ) { len = trick_byteswap_int(len) ; }
 
-                temp_ptr = new char[len +1] ; 
+                temp_ptr = new char[len +1] ;
                 fread( temp_ptr , len , 1 , fp_ ) ;
 
                 if ( ! strncmp( temp_ptr , param_name , len ) && y_value_.field_num_ < column ) {
@@ -204,7 +204,7 @@ double MatLab4::getvalue(struct MatLab4Var * mv ) {
         }
         return(0.0) ;
 }
-                      
+
 int MatLab4::get( double * time , double * value ) {
 
         long offset ;
@@ -283,7 +283,7 @@ int MatLab4LocateParam( char *file_name , char *param_name , char *time_name ) {
            printf("ERROR:  Couldn't open \"%s\"\n" , file_name ) ;
            exit(-1) ;
         }
-        
+
         // we use fseek calls to move around so I need to know the max offset of the file
         fseek( fp , 0 , SEEK_END ) ;
         max_offset = ftell(fp) ;
@@ -312,7 +312,7 @@ int MatLab4LocateParam( char *file_name , char *param_name , char *time_name ) {
 
                 // read the type in
                 fread( &temp , 4 , 1 , fp ) ;
-                if ( !strncmp( (char *)&temp , "MATL" , 4 )) { 
+                if ( !strncmp( (char *)&temp , "MATL" , 4 )) {
                         return(0) ;
                 }
 
@@ -375,7 +375,7 @@ int MatLab4LocateParam( char *file_name , char *param_name , char *time_name ) {
                 fread( &len , 4 , 1 , fp ) ;
                 if ( swap ) { len = trick_byteswap_int(len) ; }
 
-                temp_ptr = new char[len +1] ; 
+                temp_ptr = new char[len +1] ;
                 fread( temp_ptr , len , 1 , fp ) ;
 
                 if ( ! strncmp( temp_ptr , param_name , len ) && y_field_num < column ) {
@@ -389,7 +389,7 @@ int MatLab4LocateParam( char *file_name , char *param_name , char *time_name ) {
                 if ( mat_type != 0 ) {
                         fprintf(stderr,"Unknown matrix type for %s\n", temp_ptr) ;
                 }
-                
+
                 if ( param_found && time_found ) {
                         fclose(fp) ;
                         delete temp_ptr ;
@@ -401,7 +401,7 @@ int MatLab4LocateParam( char *file_name , char *param_name , char *time_name ) {
                 // skip to next parameter
                 fseek( fp ,  row * column * size * ( 1 + imaginary ) , SEEK_CUR ) ;
                 offset = ftell(fp) ;
-                       
+
         }
 
         fclose(fp) ;
diff --git a/trick_source/data_products/Log/TrickBinary.cpp b/trick_source/data_products/Log/TrickBinary.cpp
index 96b954ad..db93597e 100644
--- a/trick_source/data_products/Log/TrickBinary.cpp
+++ b/trick_source/data_products/Log/TrickBinary.cpp
@@ -18,7 +18,7 @@ TrickBinary::TrickBinary(char * file_name , char * param_name ) {
         char *name_ptr ;
         char *units_ptr ;
         int len ;
-        int ii ; 
+        int ii ;
         int type ;
         int size ;
         std::map<int, TRICK_TYPE> seven_to_ten_params  ;
@@ -97,7 +97,7 @@ TrickBinary::TrickBinary(char * file_name , char * param_name ) {
                                 // If this is an 05 log file, we need to convert the units to 07 units
                                 // ( where explicit asterisk for multiplication is required. )
                                 if ( !strncmp( file_type , "Trick-05" , 8 ) )  {
-                                        char new_units_spec[100]; 
+                                        char new_units_spec[100];
                                         new_units_spec[0] = 0;
                                         if ( convert_units_spec (units_ptr, new_units_spec) != 0 ) {
                                                 printf (" ERROR: Attempt to convert Trick-05 units spec \"%s\" failed.\n\n",units_ptr);
@@ -397,7 +397,7 @@ int TrickBinaryReadByteOrder( FILE* fp ) {
         return swap ;
 }
 
-int TrickBinaryGetNumVariables(const char* file_name) { 
+int TrickBinaryGetNumVariables(const char* file_name) {
 
         int num_params ;
         FILE *fp ;
@@ -416,13 +416,13 @@ int TrickBinaryGetNumVariables(const char* file_name) {
         return num_params ;
 }
 
-char** TrickBinaryGetVariableNames(const char* file_name) { 
+char** TrickBinaryGetVariableNames(const char* file_name) {
 
         int swap ;
         char *name_ptr ;
         char *units_ptr ;
         int len ;
-        int ii ; 
+        int ii ;
         int type ;
         int size ;
         int num_params ;
@@ -483,13 +483,13 @@ char** TrickBinaryGetVariableNames(const char* file_name) {
         return( variable_names ) ;
 }
 
-char** TrickBinaryGetVariableUnits(const char* file_name) { 
+char** TrickBinaryGetVariableUnits(const char* file_name) {
 
         int swap ;
         char *name_ptr ;
         char *units_ptr ;
         int len ;
-        int ii ; 
+        int ii ;
         int type ;
         int size ;
         int num_params ;
@@ -557,7 +557,7 @@ int TrickBinaryLocateParam( const char * file_name , const char * param_name ) {
         int ii ;
         char** var_names ;
 
-        num_vars = TrickBinaryGetNumVariables( file_name) ; 
+        num_vars = TrickBinaryGetNumVariables( file_name) ;
         if ( num_vars == 0 ) {
                 return 0 ;
         }
@@ -578,6 +578,6 @@ int TrickBinaryLocateParam( const char * file_name , const char * param_name ) {
         for ( ii = 0 ; ii < num_vars ; ii++ ) {
                 delete[] var_names[ii] ;
         }
-         
+
         return(found) ;
 }
diff --git a/trick_source/data_products/Log/log.cpp b/trick_source/data_products/Log/log.cpp
index be9076be..372edbe1 100644
--- a/trick_source/data_products/Log/log.cpp
+++ b/trick_source/data_products/Log/log.cpp
@@ -93,7 +93,7 @@ LogData::~LogData()
 /** Return the number of variable (not values) in binary log file header
  *
  *  If log header contains "a[0-1].b[0-1], x.y[4-5]" there are 2
- *  variables NOT 6. 
+ *  variables NOT 6.
  */
 int LogData::getNumVars()
 {
@@ -103,7 +103,7 @@ int LogData::getNumVars()
 /** Set the number of variables (not values) in binary log file header
  *
  *  If log header contains "a[0-1].b[0-1], x.y[4-5]" there are 2
- *  variables NOT 6. 
+ *  variables NOT 6.
  *
  *  This should be used with care!  Currently -only- a parse routine
  *  in LogGroup uses it.  I could have made LogGroup a friend... but
@@ -114,7 +114,7 @@ void LogData::setNumVars(int nVars)
         nVars_ = nVars;
 }
 
-/** Close a Trick data log 
+/** Close a Trick data log
  * @see rewind() close()
  */
 int LogData::close()
@@ -130,8 +130,8 @@ int LogData::close()
         return (1);
 }
 
-/** Puts next read at beginning of data log 
- *  @see open() close() 
+/** Puts next read at beginning of data log
+ *  @see open() close()
  */
 int LogData::rewind()
 {
@@ -154,7 +154,7 @@ int LogData::rewind()
         return (0);
 }
 
-/** Open a data log at location specified by path 
+/** Open a data log at location specified by path
  *  Path will normally point to a RUN_ directory
  *  @see rewind() close()
  */
@@ -184,7 +184,7 @@ int LogData::open(char *pathToBinaryData)
         binFilePath_ = new char[strlen(pathToBinaryData) + 1];
         strcpy(binFilePath_, pathToBinaryData);
 
-        // Open first binary file (log*.000) 
+        // Open first binary file (log*.000)
         ret = openCurrBinaryFile();
         if ( ret == -1 ) {
                 return(-1);
@@ -199,7 +199,7 @@ int LogData::open(char *pathToBinaryData)
         delete[]currRecord_;
         currRecord_ = new char[sizeRecord_];
 
-        // Initialize the value array's size and types 
+        // Initialize the value array's size and types
         // Values are elements in record, each one has a size and type
 
         // Allocate value attributes
@@ -253,7 +253,7 @@ void LogData::enableStats()
         int ii;
         double val, tval;
 
-        // Stats on, just return 
+        // Stats on, just return
         if (isEnabledStats_) {
                 return;
         } else {
@@ -266,8 +266,8 @@ void LogData::enableStats()
                                 "something other than sys.exec.out.time\n");
                 exit(-1);
         }
-        // Mins and maxs 
-        rewind();               // Start at top of records 
+        // Mins and maxs
+        rewind();               // Start at top of records
         while (getNextRecord() != NULL) {
 
                 // Get time stamp and BE SURE to reset pointers
@@ -340,7 +340,7 @@ int LogData::countNumBinaryFiles(char *pathToBinaryData)
                 if (len_dname == len_binFileName + len_extension &&
                     !strncmp(dp->d_name, binFileName_, len_binFileName)) {
 
-                        // We have found bin file name, 
+                        // We have found bin file name,
                         // make sure it has a binary extension
                         binary = 1;
                         for (ii = len_dname - 1; ii >= len_dname - 3; ii--) {
@@ -350,7 +350,7 @@ int LogData::countNumBinaryFiles(char *pathToBinaryData)
                                 }
                         }
 
-                        // If this is a binary file, 
+                        // If this is a binary file,
                         // 000-999 extension, increment count
                         if (binary) {
                                 count++;
@@ -396,7 +396,7 @@ int LogData::openCurrBinaryFile()
                        file);
                 return(-1);
         }
-        // Close previous binary file if not first file to open 
+        // Close previous binary file if not first file to open
         if (currBinExtension_ > 0) {
                 fclose(fp_);
         }
@@ -412,7 +412,7 @@ int LogData::openCurrBinaryFile()
         return (1);
 }
 
-/** Request to convert all data from log file into doubles 
+/** Request to convert all data from log file into doubles
  *  @see convertToDoubleNo()
 */
 int LogData::convertToDoubleYes()
@@ -431,9 +431,9 @@ int LogData::convertToDoubleNo()
 }
 
 /** Get number of records within a Trick binary log e.g.
- *  
+ *
  *  If time, x and y are logged, where time, x & y are doubles
- *  And the Trick binary files contains 29616 bytes, we'd have 
+ *  And the Trick binary files contains 29616 bytes, we'd have
  *  29616/24 = 1,234 records.
  */
 int LogData::getNumRecords()
@@ -461,7 +461,7 @@ int LogData::getNumRecords()
                         sprintf(extension, "%d", ii);
                 }
 
-                // Allocate & construct file name 
+                // Allocate & construct file name
                 // (+3 for '/' ,  '.' & null terminator)
                 len = strlen(binFilePath_) + strlen(binFileName_) +
                     strlen(extension) + 3;
@@ -493,7 +493,7 @@ int LogData::isEOF()
         return (isEOF_);
 }
 
-/** Return size of record in bytes e.g. 
+/** Return size of record in bytes e.g.
  *
  *  If a record contains time, x, y, i, j where
  *  time, x, & y are doubles and i,j are ints
@@ -535,7 +535,7 @@ int LogData::calcNumValRecord()
         return (nVals);
 }
 
-/** Retrieve number of values in a record 
+/** Retrieve number of values in a record
  *  (calculated by calcNumValRecord())
  *  nVals_ set once in the open routine
  */
@@ -544,8 +544,8 @@ int LogData::getNumValRecord()
         return (nVals_);
 }
 
-/** Read the next binary record in current binary file 
- * For external data logs we just return a 1 
+/** Read the next binary record in current binary file
+ * For external data logs we just return a 1
  **/
 char *LogData::getNextRecord()
 {
@@ -556,7 +556,7 @@ char *LogData::getNextRecord()
         // Reset variable index to first variable
         currVarIndex_ = 0;
 
-        // Reset variable pointer to top of record 
+        // Reset variable pointer to top of record
         currValPtr_ = (unsigned char *) currRecord_;
         currValIdx_ = 0;
         bytesRead_ = 0;
@@ -613,7 +613,7 @@ void *LogData::advanceCurrValPtr()
        }
 
 /**
- * Main function for byte-by-byte grabbing values out of a binary record 
+ * Main function for byte-by-byte grabbing values out of a binary record
  * TODO: Can I use a Template<> ???
  */
 void *LogData::getNextVal()
@@ -742,7 +742,7 @@ void *LogData::getNextVal()
                 }
                 currVal_.d = (double) d;
                 if (!convertToDouble_) {
-                        // If converting, scaling done later 
+                        // If converting, scaling done later
                         currVal_.d *= scaleVal_[currValIdx_];
                         currVal_.d *= unitVal_[currValIdx_];
                         currVal_.d += biasVal_[currValIdx_];
@@ -807,7 +807,7 @@ void *LogData::getNextVal()
 }
 
 /** Get value in record at given index e.g.
- * 
+ *
  *  So if the current record contains a[0-1], b[0-1]
  *  getVal(2) will return b[0]'s value
  */
@@ -830,7 +830,7 @@ void *LogData::getVal(int index)
                         binFileName_, getNumValRecord());
                 exit(-1);
         }
-        // Reset variable pointer to top of current record 
+        // Reset variable pointer to top of current record
         currValPtr_ = (unsigned char *) currRecord_;
         currValIdx_ = 0;
         bytesRead_ = 0;
@@ -862,7 +862,7 @@ int LogData::getSize(int idx)
  * If header has a[0-1].b[3], x[0-1].y[0-1]
  * getParamIdx( "x[1].y[0]" ) returns 4 since
  * x[1].y[0] is 4rth idx into
- * a[0].b[3], a[1].b[3], x[0].y[0], x[0].y[1], x[1].y[0], x[1].y[1]  
+ * a[0].b[3], a[1].b[3], x[0].y[0], x[0].y[1], x[1].y[0], x[1].y[1]
  *
  * If this log data is external data just pass back index
  * to external parameter.  No worries about multi-dimensions :)
@@ -980,7 +980,7 @@ int LogData::setMin(int paramIdx, double min)
         return (1);
 }
 
-/** Set unit for parameter 
+/** Set unit for parameter
  *  Internally this will set a scale factor from unit in log
  *  file to unit given as argument.  If the unit passed is
  *  NULL, the scale factor will be set to 1.0.
@@ -1169,8 +1169,8 @@ int LogGroup::convertToDoubleYes()
         return (0);
 }
 
-/** Get number of records in this log group 
- *  Return the max number of records among all the Trick logs 
+/** Get number of records in this log group
+ *  Return the max number of records among all the Trick logs
  */
 int LogGroup::getNumRecords()
 {
@@ -1189,9 +1189,9 @@ int LogGroup::getNumRecords()
         return (max);
 }
 
-/** Enable statistics (min/max...) 
- *  This will actually calculate stats on the first pass 
- *  Find absolute min/max value for a param 
+/** Enable statistics (min/max...)
+ *  This will actually calculate stats on the first pass
+ *  Find absolute min/max value for a param
  *  This will move the file offsets in the binary files
  *  Maybe we'll add the "ftell()" later!
  */
@@ -1255,7 +1255,7 @@ int LogGroup::setMin(int logIdx, int paramIdx, double min)
         return (1);
 }
 
-/** Set unit for parameter 
+/** Set unit for parameter
  *  @see LogData::setUnit()
  */
 int LogGroup::setUnit(int logIdx, int paramIdx, std::string u)
@@ -1266,7 +1266,7 @@ int LogGroup::setUnit(int logIdx, int paramIdx, std::string u)
         return (1);
 }
 
-/** Set unit for parameter 
+/** Set unit for parameter
  *  @see LogData::setUnit()
  */
 int LogGroup::setUnit(const char *paramName, std::string u)
@@ -1292,7 +1292,7 @@ int LogGroup::setUnit(const char *paramName, std::string u)
 /** Get the value of a paramter at a given time stamp
  *  Return value around an epsilon of time stamp
  */
-int LogGroup::getValueAtTime( const char *paramName, 
+int LogGroup::getValueAtTime( const char *paramName,
                               double time, double* value ) {
 
         int tIdx, tLogIdx;
@@ -1309,13 +1309,13 @@ int LogGroup::getValueAtTime( const char *paramName,
                                 "parameter name.\n");
                 exit(-1);
         }
-        
+
         // Get the value at time
         rr = log[yLogIdx]->getValueAtTime(tIdx, time,
                                           yIdx, &vv) ;
         *value = vv ;
 
-        return(rr); 
+        return(rr);
 
 }
 
@@ -1381,12 +1381,12 @@ char *LogGroup::getNextRecord()
  *
  * x&y Idx are parameter indices into the x&y LogData files
  *
- * xVarName & yVarName may be in different log data groups, 
+ * xVarName & yVarName may be in different log data groups,
  * so it get's a little complicated.  Also there may
  * more than one param with same xVarName (time) or same yVarName!
  *
  * The algorithm here will find first group with yVarName, and then
- * see if xVarName is in same group.  If all possibilities of 
+ * see if xVarName is in same group.  If all possibilities of
  * getting x & y out same log data group are exhausted, it will
  * then choose y to be last group it found it in, then find
  * first x with xVarName.  Thus x & y will be pulled out of
@@ -1409,7 +1409,7 @@ int LogGroup::getParamIdx(const char *xVarName, int *xIdx, int *xLogDataIdx,
                         *yLogDataIdx = i;
                         yFoundIdx = *yIdx;
                         if ((*xIdx = log[i]->getParamIdx(xVarName)) != -1) {
-                                // Yippee.  x & y in same group  
+                                // Yippee.  x & y in same group
                                 *xLogDataIdx = *yLogDataIdx;
                                 break;
                         }
@@ -1420,7 +1420,7 @@ int LogGroup::getParamIdx(const char *xVarName, int *xIdx, int *xLogDataIdx,
                 // So x & y not in same group
 
                 if (yFoundIdx != -1) {
-                        // Let's see if xVarName is in a different 
+                        // Let's see if xVarName is in a different
                         // log data group than y
                         // Choose first one you find
                         *yIdx = yFoundIdx;
@@ -1444,7 +1444,7 @@ int LogGroup::getParamIdx(const char *xVarName, int *xIdx, int *xLogDataIdx,
                         fprintf(stderr,
                                 "ERROR: Couldn't find y param \"%s\".\n"
                                 " Param is not in log header for "
-                                "run: \"%s\".\n", 
+                                "run: \"%s\".\n",
                                 yVarName, getDataDir());
                         return(-1);
                 }
@@ -1479,12 +1479,12 @@ int LogGroup::getHeaders()
         nHeaders_ = 0;
         while ((dp = readdir(dirp)) != NULL) {
                 if (strstr(dp->d_name, ".header") != NULL) {
-                        len  = strlen(dp->d_name) + 
-                               strlen(pathToBinaryData_) + 2 ;  
+                        len  = strlen(dp->d_name) +
+                               strlen(pathToBinaryData_) + 2 ;
                         full_header_name = (char*) malloc ( len ) ;
                         sprintf(full_header_name, "%s/%s",
                                 pathToBinaryData_, dp->d_name);
-                        if (!strncmp(dp->d_name, "log_", 4) && 
+                        if (!strncmp(dp->d_name, "log_", 4) &&
                              is04BinaryHeader_(full_header_name)) {
                                 if (strlen(dp->d_name) > maxLengthHeaderName) {
                                         maxLengthHeaderName =
@@ -1521,13 +1521,13 @@ bool LogGroup::is04BinaryHeader_( const char* file_name )
 {
         FILE* fp ;
         char* rc ;
-        char str[4][256] ; 
+        char str[4][256] ;
         char line[1024] ;
 
 
         fp = fopen( file_name, "r" ) ;
         if ( fp == NULL ) {
-                fprintf(stderr, "Died while attempting to open \"%s\".\n", 
+                fprintf(stderr, "Died while attempting to open \"%s\".\n",
                         file_name);
                 exit(-1) ;
         }
@@ -1540,7 +1540,7 @@ bool LogGroup::is04BinaryHeader_( const char* file_name )
                 return 0 ;
         }
 
-        if ( sscanf(line, "%s %s %s %s", 
+        if ( sscanf(line, "%s %s %s %s",
                           str[0], str[1], str[2], str[3]) == 4 ) {
 
                 if (!strcmp(str[1], "byte_order")) {
@@ -1603,7 +1603,7 @@ int LogGroup::isEOF()
 
 IterMultiRun::IterMultiRun( LogGroup* lg1, set<int>& logIndices1,
                             LogGroup* lg2, set<int>& logIndices2,
-                            double frequency, 
+                            double frequency,
                             double startTime, double stopTime ) {
 
         // Two iterators for iterating over both runs
@@ -1625,7 +1625,7 @@ IterMultiRun::~IterMultiRun()
         delete iter2_ ;
 }
 
-void IterMultiRun::begin() 
+void IterMultiRun::begin()
 {
         iter1_->begin();
         iter2_->begin();
@@ -1668,7 +1668,7 @@ void IterMultiRun::operator++(int) {
                 (*iter2_)++ ;
         }
 
-        // Now that a time step has occured 
+        // Now that a time step has occured
         // Get the new mininum time stamp
         t1 = iter1_->getTime();
         t2 = iter2_->getTime();
@@ -1683,7 +1683,7 @@ void IterMultiRun::operator++(int) {
                 (*this)++ ;
         }
 
-        // If time < start time requested by user, 
+        // If time < start time requested by user,
         // continue marching through time until start time reached
         if (minTime < startTime_) {
                 (*this)++ ;
@@ -1691,12 +1691,12 @@ void IterMultiRun::operator++(int) {
 }
 
 IterPreserveTime::IterPreserveTime( LogGroup* lg, set<int>& logIndices,
-                                    double frequency, 
-                                    double startTime, double stopTime ) 
+                                    double frequency,
+                                    double startTime, double stopTime )
 {
         unsigned int ii ;
 
-        lg_ = lg ; 
+        lg_ = lg ;
         startTime_ = startTime ;
         stopTime_ = stopTime ;
         logIndices_ = logIndices ;
@@ -1718,12 +1718,12 @@ IterPreserveTime::IterPreserveTime( LogGroup* lg, set<int>& logIndices,
         timeIdx_ = new int[logIndices.size()];
         for (ii = 0; ii < logIndices.size(); ii++ ) {
                 // TODO: get real time stamp
-                // It is safe for now to assume it's 
+                // It is safe for now to assume it's
                 // the first param logged
-                timeIdx_[ii] = 0 ; 
+                timeIdx_[ii] = 0 ;
         }
 
-        currTime_ = new double[logIndices.size()] ; 
+        currTime_ = new double[logIndices.size()] ;
 }
 
 IterPreserveTime::~IterPreserveTime()
@@ -1731,7 +1731,7 @@ IterPreserveTime::~IterPreserveTime()
 }
 
 
-void IterPreserveTime::begin() 
+void IterPreserveTime::begin()
 {
         double timeStamp;
 
@@ -1740,7 +1740,7 @@ void IterPreserveTime::begin()
         // Reset frequency
         if ( frequency_ == 0.0 ) {
                 nextFrequencyCheck_ = DBL_MAX;
-        } else { 
+        } else {
                 if ( startTime_ == 0.0 ) {
                         nextFrequencyCheck_ = startTime_ + frequency_ ;
                 } else {
@@ -1756,7 +1756,7 @@ void IterPreserveTime::begin()
                 lg_->log[*logIdx_]->getNextRecord() ;
         }
 
-        // If time < start time requested by user, 
+        // If time < start time requested by user,
         // continue marching through time until start time reached
         timeStamp = 0.0 ;
         while ( timeStamp < startTime_ ) {
@@ -1794,11 +1794,11 @@ void IterPreserveTime::operator++(int) {
 // data points if the time stamps do not match
 double IterPreserveTime::getTime( ) {
 
-        double minTime = DBL_MAX; 
-        int ii = 0 ; 
+        double minTime = DBL_MAX;
+        int ii = 0 ;
 
-        for (logIdx_ = logIndices_.begin() ; logIdx_ != logIndices_.end() ; 
-                logIdx_++) { 
+        for (logIdx_ = logIndices_.begin() ; logIdx_ != logIndices_.end() ;
+                logIdx_++) {
 
                 if ( ! lg_->log[*logIdx_]->isEOF() ) {
                         currTime_[ii] = *((double *) lg_->log[*logIdx_]->
@@ -1806,7 +1806,7 @@ double IterPreserveTime::getTime( ) {
                 } else {
                         currTime_[ii] = DBL_MAX ;
                 }
-        
+
                 if (currTime_[ii] < minTime) {
                         minTime = currTime_[ii];
                 }
@@ -1816,12 +1816,12 @@ double IterPreserveTime::getTime( ) {
         return( minTime ) ;
 }
 
-// Advance through records in each data log synchronously 
+// Advance through records in each data log synchronously
 //
-// Example: If data log "A" is recorded at 1.0 second, 
+// Example: If data log "A" is recorded at 1.0 second,
 // and "B" at 10 seconds.  Both will advance at time zero.
 // Then at time=1.0, log "A" will have a record read.  "B" will not be read.
-// At time=2.0 through time=9.0 the same will occur. A advances, B stays put. 
+// At time=2.0 through time=9.0 the same will occur. A advances, B stays put.
 // At time=10.0, both A and B will be read from.  Both will advance.
 // This keeps the data on the same time stamp on like intervals.
 //
@@ -1851,7 +1851,7 @@ int IterPreserveTime::stepInTime() {
 
         // Get all values in all data log groups
         // Also get mininum time stamp from all log data files
-        minTime = getTime(); 
+        minTime = getTime();
 
         // Take a step through time (sounds like a song)
         // Check for EOF along the way
@@ -1873,10 +1873,10 @@ int IterPreserveTime::stepInTime() {
                 return(1) ;
         }
 
-        // Now that a time step has occured 
+        // Now that a time step has occured
         // Get the new mininum time stamp and associated
         // values from all log data files
-        minTime = getTime(); 
+        minTime = getTime();
 
         // Step depending on frequency
         if (minTime <= stopTime_) {
@@ -1884,16 +1884,16 @@ int IterPreserveTime::stepInTime() {
                 // Handle Frequency (if specified)
                 if ( nextFrequencyCheck_ != DBL_MAX ) {
 
-                        if ( NEXTFREQ_EQUALS_MINTIME ) { 
+                        if ( NEXTFREQ_EQUALS_MINTIME ) {
 
                                 // Frequency synced with a data point
-                                // Stops recursion 
+                                // Stops recursion
                                 NEXTFREQ_INCR ;
 
                         } else if ( minTime - nextFrequencyCheck_ > 0 ) {
 
                                 // Mintime exceeded nextFreqCheck
-                                // Frequency must be higher than 
+                                // Frequency must be higher than
                                 // data frequency
 
                                 // Bump nextFrequencyCheck past minTime
@@ -1910,14 +1910,14 @@ int IterPreserveTime::stepInTime() {
                                 } else {
 
                                         // No sync, keep iterating through data
-                                        return(0); 
+                                        return(0);
                                 }
                         } else {
-        
+
                                 // Mintime is less than nextFreq check
                                 // Need to iterate again
                                 return(0) ;
-                        } 
+                        }
                 }
         }
 
diff --git a/trick_source/data_products/Log/multiLog.cpp b/trick_source/data_products/Log/multiLog.cpp
index 86457597..dc2338e4 100644
--- a/trick_source/data_products/Log/multiLog.cpp
+++ b/trick_source/data_products/Log/multiLog.cpp
@@ -17,7 +17,7 @@ LogMultiGroup::LogMultiGroup( vector<string>& runDirs ) {
         vector < string >::const_iterator run;
         for (run = runDirs.begin(); run != runDirs.end() ; run++) {
                 strcpy(path, (*run).c_str());
-                LogGroup* lg = new LogGroup(path) ; 
+                LogGroup* lg = new LogGroup(path) ;
                 logGroups_.push_back(lg);
         }
 
@@ -27,14 +27,14 @@ LogMultiGroup::LogMultiGroup( vector<string>& runDirs ) {
 /**
  * LogMultiGroup destructor
  */
-LogMultiGroup::~LogMultiGroup( ) 
+LogMultiGroup::~LogMultiGroup( )
 {
 
         vector < LogGroup* >::const_iterator lg;
         for (lg = logGroups_.begin(); lg != logGroups_.end() ; lg++) {
                 delete *lg ;
         }
-         
+
 } ;
 
 
@@ -44,14 +44,14 @@ LogMultiGroup::~LogMultiGroup( )
  */
 IterOverLogGroups::IterOverLogGroups( LogMultiGroup* lmg,
                                       vector<string>& runs,
-                                      vector<string>& paramNames ) 
+                                      vector<string>& paramNames )
 {
         int found ;
         string runDirName ;
         int tIdx, tLogIdx ;
         int vIdx, vLogIdx ;
 
-        lmg_ = lmg ; 
+        lmg_ = lmg ;
 
         // Mapping from log group to an array of log indices
         map< LogGroup*, set< int > > lg2log ;
@@ -64,9 +64,9 @@ IterOverLogGroups::IterOverLogGroups( LogMultiGroup* lmg,
         // Go ahead and convert to doubles as well
         int idx = 0 ;
         for (lg = lmg->logGroups_.begin(); lg != lmg->logGroups_.end(); lg++) {
-                
+
                 (*lg)->convertToDoubleYes();
-                  
+
                 runDirName = (*lg)->getDataDir() ;
                 for (ss = runs.begin(); ss != runs.end(); ss++ ) {
                         if ( runDirName == *ss ) {
@@ -87,10 +87,10 @@ IterOverLogGroups::IterOverLogGroups( LogMultiGroup* lmg,
 
                 for (ss = paramNames.begin(); ss != paramNames.end(); ss++ ) {
 
-                        (*lg)->getParamIdx( "sys.exec.out.time", 
+                        (*lg)->getParamIdx( "sys.exec.out.time",
                                             &tIdx, &tLogIdx,
-                                            (*ss).c_str(), 
-                                            &vIdx, &vLogIdx ) ; 
+                                            (*ss).c_str(),
+                                            &vIdx, &vLogIdx ) ;
 
                         ParamIdx* pi = new ParamIdx ;
                         pi->logIdx = vLogIdx ;
@@ -100,7 +100,7 @@ IterOverLogGroups::IterOverLogGroups( LogMultiGroup* lmg,
                         // Keep list of log data sets with this group
                         // Weed out duplicates
                         found = 0 ;
-                        for (ii = logIndices.begin(); 
+                        for (ii = logIndices.begin();
                                  ii != logIndices.end(); ii++ ) {
 
                                 if (vLogIdx == *ii) {
@@ -126,7 +126,7 @@ IterOverLogGroups::IterOverLogGroups( LogMultiGroup* lmg,
         map < LogGroup*, set< int > >::const_iterator ll;
         for (ll = lg2log.begin(); ll != lg2log.end(); ll++) {
 
-                key = (*ll).first ; 
+                key = (*ll).first ;
 
                 IterPreserveTime* iter = new IterPreserveTime(
                                                 key,
@@ -153,7 +153,7 @@ void IterOverLogGroups::begin()
         }
 }
 
-// Finished iterating on all log groups in multigroup? 
+// Finished iterating on all log groups in multigroup?
 bool IterOverLogGroups::end()
 {
         int end = 1 ;
@@ -169,16 +169,16 @@ bool IterOverLogGroups::end()
         return( end ) ;
 }
 
-// Increment list of iterators which operate on each log group 
-void IterOverLogGroups::operator++(int) 
+// Increment list of iterators which operate on each log group
+void IterOverLogGroups::operator++(int)
 {
-                          
+
         static vector < IterPreserveTime* >::const_iterator ili ;
 
-        for (ili = listLogGroupIterators_.begin(); 
+        for (ili = listLogGroupIterators_.begin();
                  ili != listLogGroupIterators_.end(); ili++) {
 
-                // *ili is an element of list of iterators... 
+                // *ili is an element of list of iterators...
                 // *(*ili) is the iterator to iterate  --- Confusing!
                 (*(*ili))++ ;
         }
@@ -191,7 +191,7 @@ double IterOverLogGroups::getVal(string runName, string paramName)
         static int varIdx ;
         static int runIdx ;
 
- 
+
         lg     = runDirName2lg_[runName] ;
         runIdx = runDirName2runIdx_[runName] ;
         logIdx = runs_[runIdx][paramName]->logIdx ;
diff --git a/trick_source/data_products/Log/parseLogHeader.cpp b/trick_source/data_products/Log/parseLogHeader.cpp
index b5f03030..5b15a20e 100644
--- a/trick_source/data_products/Log/parseLogHeader.cpp
+++ b/trick_source/data_products/Log/parseLogHeader.cpp
@@ -1,5 +1,5 @@
 /**
-    Used to parse a Trick log header file, and load info for Log Classes 
+    Used to parse a Trick log header file, and load info for Log Classes
     @author Keith Vetter
     @version May 2002
 */
@@ -49,17 +49,17 @@ int LogGroup::parseLogHeaders()
                 // Full path of log header
                 sprintf(headerName, "%s/%s", pathToBinaryData_, headers_[i]);
 
-                // Open log header 
+                // Open log header
                 if ((fp_ = fopen(headerName, "r")) == NULL) {
                         fprintf(stderr,
                                 "\nERROR:\nCouldn't open file \"%s\" \n",
                                 headerName);
                         return (-1);
                 }
-                // Allocate strings, we know that buffers can't be 
+                // Allocate strings, we know that buffers can't be
                 // longer than file!
                 // Since headers are typically small, allocate them at ]
-                // the header size 
+                // the header size
                 fseek(fp_, 0, SEEK_END);
                 headerSize = ftell(fp_);
                 ::rewind(fp_);
@@ -129,7 +129,7 @@ int LogGroup::parseLogHeaders()
                                         return (-1);
                                 }
 
-                                // For Release-07 we need to convert the old unit specs by 
+                                // For Release-07 we need to convert the old unit specs by
                                 // adding explicit asterisk for multiplication. )
                                 {
                                         char new_units_spec[100];
diff --git a/trick_source/data_products/Log/trick_byteswap.cpp b/trick_source/data_products/Log/trick_byteswap.cpp
index bf93a34e..c82ff94d 100644
--- a/trick_source/data_products/Log/trick_byteswap.cpp
+++ b/trick_source/data_products/Log/trick_byteswap.cpp
@@ -1,11 +1,11 @@
 /*
-PURPOSE: 
+PURPOSE:
      (Routines for swapping byte order.  Borrowed from ISP.)
-REFERENCE: 
+REFERENCE:
      ((None))
 ASSUMPTIONS AND LIMITATIONS:
      ((None))
-CLASS: 
+CLASS:
      (N/A)
 LIBRARY DEPENDENCY:
     ((trick_byteswap.o))
@@ -76,7 +76,7 @@ float trick_byteswap_float(       /* RETURN: -- swapped bytes */
        *(((unsigned char *)&output) + 1) = *(((unsigned char *)&input) + 2);
        *(((unsigned char *)&output) + 2) = *(((unsigned char *)&input) + 1);
        *(((unsigned char *)&output) + 3) = *(((unsigned char *)&input));
-     
+
        return(output);
 }
 
@@ -100,7 +100,7 @@ long trick_byteswap_long(         /* RETURN: -- swapped byte */
                *(((unsigned char*)&output)+1) = *(((unsigned char*)&input)+6);
                *(((unsigned char*)&output)+2) = *(((unsigned char*)&input)+5);
                *(((unsigned char*)&output)+3) = *(((unsigned char*)&input)+4);
-          
+
                out += 4;
                *(((unsigned char*)out)   ) = *(((unsigned char*)&input)+3);
                *(((unsigned char*)out)+ 1) = *(((unsigned char*)&input)+2);
diff --git a/trick_source/data_products/Log/trick_byteswap.h b/trick_source/data_products/Log/trick_byteswap.h
index 52c49e63..a1ce5ab9 100644
--- a/trick_source/data_products/Log/trick_byteswap.h
+++ b/trick_source/data_products/Log/trick_byteswap.h
@@ -1,4 +1,4 @@
-/* 
+/*
 PURPOSE:
      (Byte swapping.)
 REFERENCE:
@@ -19,7 +19,7 @@ ICG:
 /* *************************************************************** */
 /* *************************************************************** */
 
-#ifndef _TRICK_BYTESWAP_H_        
+#ifndef _TRICK_BYTESWAP_H_
 #define _TRICK_BYTESWAP_H_
 
 /* Use the #defines to change the names of the functions
diff --git a/trick_source/data_products/Var/var.cpp b/trick_source/data_products/Var/var.cpp
index 301ead61..b89dfb67 100644
--- a/trick_source/data_products/Var/var.cpp
+++ b/trick_source/data_products/Var/var.cpp
@@ -1,5 +1,5 @@
 /**
-    A class interface for variables 
+    A class interface for variables
     @author Keith Vetter
     @version May 2002
 */
@@ -66,9 +66,9 @@ int Var::getNumDims() {
        if ( varName_[0] == '\0' ) {
                printf("ERROR: Must set varName before calling getNumDims().\n");
                return( -1 ) ;
-       } 
+       }
 
-       // numDimensions was previously calculated 
+       // numDimensions was previously calculated
        return ( nDimensions_ ) ;
 }
 
@@ -91,11 +91,11 @@ double Var::getScaleFactor() {
        return ( scaleFactor_ ) ;
 }
 
-/** Get variable's bias (offset or shift) 
- *   
+/** Get variable's bias (offset or shift)
+ *
  *  bias is the shift value for a variable
- *  So for a list of values 1.0, 2.0, 3.0 with a bias of say 8.0 
- *  My list becomes 9.0, 10.0, 11.0 
+ *  So for a list of values 1.0, 2.0, 3.0 with a bias of say 8.0
+ *  My list becomes 9.0, 10.0, 11.0
  */
 double Var::getBias() {
        return ( bias_ ) ;
@@ -115,7 +115,7 @@ double Var::getMaxRange() {
        return ( maxRange_ ) ;
 }
 
-/** Get variable's unit 
+/** Get variable's unit
  */
 std::string Var::getUnit() {
        return ( unit_ ) ;
@@ -135,9 +135,9 @@ std::string Var::setTimeUnit(std::string unit_name) {
        return ( timeUnit_ ) ;
 }
 
-/** 
+/**
  * Return variable name without dimensions
- * e.g. if varName == a[0-9].b[1-2].c 
+ * e.g. if varName == a[0-9].b[1-2].c
  *         a.b.c will be returned
  */
 const char* Var::getVarNameNoDims( ) {
@@ -145,17 +145,17 @@ const char* Var::getVarNameNoDims( ) {
        int ii, jj ;
        int len;
        char * temp_name ;
-    
+
        // Reallocate short name
-       len = varName_.length() ; 
+       len = varName_.length() ;
        temp_name = new char[len + 1] ;
-    
+
        jj = 0 ;
        for ( ii = 0; ii < len ; ii++ ) {
                temp_name[jj] = varName_[ii];
                if ( varName_[ii] == '[' || varName_[ii] == '(' ) {
                        jj--;
-                       while ( varName_[ii] != ']' && 
+                       while ( varName_[ii] != ']' &&
                                varName_[ii] != ')' && ii < len ) {
                                ii++;
                        }
@@ -165,7 +165,7 @@ const char* Var::getVarNameNoDims( ) {
        temp_name[jj] = '\0' ;
        shortName_ = temp_name ;
        delete[] temp_name ;
-    
+
        return(shortName_.c_str());
 }
 
@@ -185,7 +185,7 @@ int Var::compareNames( const char* name ) {
 
        ret = strcmp(this->getVarNameNoDims(),v->getVarNameNoDims());
        delete v ;
-   
+
        return(ret);
 }
 
@@ -196,7 +196,7 @@ int Var::compareNames( const char* name ) {
  *      getDimOffset("a.b[7].c[8]") returns 4
  *      since a.b[7] is the 4rth element of a.b[3-24].c[8] .
  *      a.b[3].c[8] is 0th, a.b[4].c[8] is the 1rst etc...
- */ 
+ */
 int Var::getDimOffset( const char* param ) {
 
        unsigned int i,j,k ;
@@ -220,14 +220,14 @@ int Var::getDimOffset( const char* param ) {
                // a[0-1].b[8].c has 3 params -> "a" "b" "c"
                unsigned int  numParams ;
 
-               /* 
+               /*
                 * a[0-1].b[8].c has (0,1),(8,8),(?,?) as dims
                 * a, b & c are MULTI, SINGLE & NONE dimensional
                 */
-               DIM * dims; 
-    
+               DIM * dims;
+
                // a[0-1].b[8].c parNames "a[0-1]" "b[8]" & "c"
-               char** parName ; 
+               char** parName ;
 
        } v1, v2 ;
 
@@ -242,25 +242,25 @@ int Var::getDimOffset( const char* param ) {
        v1.parName        = new char*[nParms] ;
        v2.parName        = new char*[nParms] ;
        int len = varName_.size() + 1 ;
-       for ( i = 0 ; i < nParms ; i++ ) { 
+       for ( i = 0 ; i < nParms ; i++ ) {
                v1.parName[i] = new char[len] ;
                v2.parName[i] = new char[len] ;
        }
-  
+
        // Do some allocation
        // Added nParms, since multidims expanded outgrow original string
        // e.g. a[0-2][2-3].b[0-9].c -> a[0-2].[2-3].b[0-9].c
        str    = new char[varName_.size()+1+nParms] ;
        v1name = new char[varName_.size()+1+nParms] ;
        v2name = new char[strlen(param)+1+nParms] ;
-  
+
        // Initialize v1 and v2 strings
        strcpy(v1name, varName_.c_str());
        strcpy(v2name, param);
 
-       /* 
+       /*
         * To handle multi dim specs, do the following ugliness
-        * change things like a[0].b[0-2][9-18][3-4] -> a[0].b[0-2].[9-18].[3-4] 
+        * change things like a[0].b[0-2][9-18][3-4] -> a[0].b[0-2].[9-18].[3-4]
         * Unfortunately, this was an afterthought, and it was hurried (sorry)
         */
        j = 0 ;
@@ -286,9 +286,9 @@ int Var::getDimOffset( const char* param ) {
       }
       str[j] = '\0' ;
       strcpy(v2name, str);
-    
-    
-      /* Get param names out of variable name */ 
+
+
+      /* Get param names out of variable name */
       /* a[0-1].b[8].c -> "a[0-1]", "b[8]", "c" */
       j = 0 ;
       v1.numParams = 0 ;
@@ -299,12 +299,12 @@ int Var::getDimOffset( const char* param ) {
                        strcpy(v1.parName[v1.numParams], str);
                        j = 0 ;
                        v1.numParams++ ;
-               } 
+               }
       }
       str[j] = '\0' ;
       strcpy(v1.parName[v1.numParams], str);
       v1.numParams++ ;
-      
+
       /* Get dimensions for each param name */
       for ( i = 0 ; i < v1.numParams; i++ ) {
 
@@ -316,7 +316,7 @@ int Var::getDimOffset( const char* param ) {
 
                        if ( v1.parName[i][j] == '[' ) {
                                j++ ;
-    
+
                                /* Assign lower dimension of param */
                                k = 0 ;
                                while ( isdigit( v1.parName[i][j] ) ) {
@@ -325,7 +325,7 @@ int Var::getDimOffset( const char* param ) {
                                }
                                str[k] = '\0' ;
                                v1.dims[i].lower = atoi(str) ;
-    
+
                                /* Handle upper dimension */
                                if ( v1.parName[i][j] == '-' ) {
                                        /* Multi-dimensional */
@@ -346,8 +346,8 @@ int Var::getDimOffset( const char* param ) {
                        }
                }
       }
-    
-      /* Get param names out of variable name */ 
+
+      /* Get param names out of variable name */
       /* a[0-1].b[8].c -> "a[0-1]", "b[8]", "c" */
       j = 0 ;
       v2.numParams = 0 ;
@@ -358,13 +358,13 @@ int Var::getDimOffset( const char* param ) {
                        strcpy(v2.parName[v2.numParams], str);
                        j = 0 ;
                        v2.numParams++ ;
-               } 
+               }
       }
       str[j] = '\0' ;
       strcpy(v2.parName[v2.numParams], str);
       v2.numParams++ ;
-      
-    
+
+
       /* Get dimensions for each param name */
       for ( i = 0 ; i < v2.numParams; i++ ) {
                v2.dims[i].dimensional = NONE ;
@@ -374,7 +374,7 @@ int Var::getDimOffset( const char* param ) {
 
                        if ( v2.parName[i][j] == '[' ) {
                                j++ ;
-    
+
                                /* Assign lower dimension of param */
                                k = 0 ;
                                while ( isdigit( v2.parName[i][j] ) ) {
@@ -383,7 +383,7 @@ int Var::getDimOffset( const char* param ) {
                                }
                                str[k] = '\0' ;
                                v2.dims[i].lower = atoi(str) ;
-    
+
                                /* Handle upper dimension */
                                if ( v2.parName[i][j] == '-' ) {
                                        /* Multi-dimensional */
@@ -404,24 +404,24 @@ int Var::getDimOffset( const char* param ) {
                        }
                }
       }
-    
+
       /* First make sure that v2 is in v1's space */
       for ( i = 0 ; i < v1.numParams ; i++ ) {
                if ( v1.dims[i].dimensional == MULTI ) {
-                       if ( v2.dims[i].lower < v1.dims[i].lower || 
+                       if ( v2.dims[i].lower < v1.dims[i].lower ||
                                v2.dims[i].upper > v1.dims[i].upper )  {
                                VAR_DELETE ;
-                               return ( -1 ) ; /* v2 not in v1's space */ 
-                       } 
+                               return ( -1 ) ; /* v2 not in v1's space */
+                       }
                }
                if ( v1.dims[i].dimensional == SINGLE ) {
                        if ( v1.dims[i].lower != v2.dims[i].lower ) {
                                VAR_DELETE ;
-                               return ( -1 ) ; /* v2 not in v1's space */ 
+                               return ( -1 ) ; /* v2 not in v1's space */
                        }
                }
       }
-    
+
       /* Next make sure that v2 is a single dimensional var */
       for ( i = 0 ; i < v2.numParams ; i++ ) {
                if ( v2.dims[i].dimensional == MULTI ) {
@@ -429,17 +429,17 @@ int Var::getDimOffset( const char* param ) {
                        return(-1);
                }
       }
-    
+
       /* Calculate offset of v2 into v1's space */
-    
+
       /* First, get all offsets into each dimension & size of each dimension */
       for ( i = 0 ; i < v1.numParams ; i++ ) {
                offsets[i] = v2.dims[i].upper - v1.dims[i].lower ;
                sizedims[i] = v1.dims[i].upper - v1.dims[i].lower + 1 ;
       }
-    
-      /* 
-       * Now go through magical algorithm to get offset 
+
+      /*
+       * Now go through magical algorithm to get offset
        * Think of it like an odometer where each cylinder has a different
        * number of numbers, and the numbers on each cylinder can
        * range from any start to stop point
@@ -448,12 +448,12 @@ int Var::getDimOffset( const char* param ) {
        * say v2 = x0[y0].x1[y1]...xN[yN]
        *
        * let si = ai - bi + 1  (i = 0..N)
-       * let oi = yi - ai      (i = 0..N) 
+       * let oi = yi - ai      (i = 0..N)
        *
        * offset= sN*sN-1*...s1(o0) + sN*sN-1*...s2(o1) + ... + sN(oN-1) + oN + 1
-       * 
-       * Then offset = offset - 1 for indexing 
-       */ 
+       *
+       * Then offset = offset - 1 for indexing
+       */
        for ( i = 0 ; i < v1.numParams ; i++ ) {
                sizeproducts[i] = 1 ;
                for ( j = i+1 ; j < v1.numParams ; j++ ) {
@@ -469,17 +469,17 @@ int Var::getDimOffset( const char* param ) {
                        return(-1);
                }
        }
-    
+
        VAR_DELETE ;
-    
+
        return ( offset ) ;
 }
 
 /**
  * Get byte size of variable e.g.
  *
- *  a[0-5]: 6*(4bytes/double) = 24 bytes in all 
- *  
+ *  a[0-5]: 6*(4bytes/double) = 24 bytes in all
+ *
  */
 int Var::getSize(  ) {
        return( byteSize_ ) ;
@@ -490,15 +490,15 @@ string Var::setVarName( const char* name ) {
 
        // Reallocate varName_
        varName_ = name ;
-    
-       // Set number of dimensions for variable 
+
+       // Set number of dimensions for variable
        nDimensions_ = calcNumDimensions();
-    
-       // Set byte size 
+
+       // Set byte size
        if ( varType_ != NONE ) {
           byteSize_ = calcByteSize();
        }
-       
+
        return( varName_ ) ;
 }
 
@@ -509,58 +509,58 @@ Var::enumType Var::getType ( ) {
 
 /** Get variable's type size (double->8, float->4 ...)*/
 int Var::getTypeSize () {
-   
+
        // I am avoiding another switch statement on type here
-    
+
        int totalSize ;
        int numDims ;
 
        // Get total byte size for variable and number of dimensions
        totalSize = calcByteSize() ;
-       numDims   = getNumDims() ; 
-   
+       numDims   = getNumDims() ;
+
        // So type size will be total size divided by number of dims
        return ( totalSize/numDims ) ;
 }
 
 /** Set variable type (double, float, int...) */
 int Var::setType ( char* type ) {
-   
+
        if         ( !strcasecmp(type, "char") ) {
                 varType_ = CHAR ;
-       } else if  ( !strcasecmp(type, "short") ) {    
+       } else if  ( !strcasecmp(type, "short") ) {
                 varType_ = SHORT ;
-       } else if  ( !strcasecmp(type, "int") ) {    
+       } else if  ( !strcasecmp(type, "int") ) {
                 varType_ = INT ;
-       } else if  ( !strcasecmp(type, "long") ) {    
+       } else if  ( !strcasecmp(type, "long") ) {
                 varType_ = LONG ;
-       } else if  ( !strcasecmp(type, "unsigned_char") ) {    
+       } else if  ( !strcasecmp(type, "unsigned_char") ) {
                 varType_ = UNSIGNED_CHAR ;
-       } else if  ( !strcasecmp(type, "unsigned_short") ) {    
+       } else if  ( !strcasecmp(type, "unsigned_short") ) {
                 varType_ = UNSIGNED_SHORT ;
-       } else if  ( !strcasecmp(type, "unsigned_int") ) {    
+       } else if  ( !strcasecmp(type, "unsigned_int") ) {
                 varType_ = UNSIGNED_INTEGER ;
-       } else if  ( !strcasecmp(type, "unsigned_long") ) {    
+       } else if  ( !strcasecmp(type, "unsigned_long") ) {
                 varType_ = UNSIGNED_LONG ;
-       } else if  ( !strcasecmp(type, "float") ) {    
+       } else if  ( !strcasecmp(type, "float") ) {
                 varType_ = FLOAT ;
-       } else if  ( !strcasecmp(type, "double") ) {    
+       } else if  ( !strcasecmp(type, "double") ) {
                 varType_ = DOUBLE ;
-       } else if  ( !strcasecmp(type, "long_long") ) {    
+       } else if  ( !strcasecmp(type, "long_long") ) {
                 varType_ = LONG_LONG ;
-       } else if  ( !strcasecmp(type, "unsigned_long_long") ) {    
+       } else if  ( !strcasecmp(type, "unsigned_long_long") ) {
                 varType_ = UNSIGNED_LONG_LONG ;
-       } else if  ( !strcasecmp(type, "void") ) {    
+       } else if  ( !strcasecmp(type, "void") ) {
                 varType_ = VOID ;
        } else {
                 varType_ = NONE ;
                 return( -1 ) ;
        }
-    
+
        return ( 0 ) ;
 }
 
-/** Calculates and returns -total- bytesize of variable */ 
+/** Calculates and returns -total- bytesize of variable */
 int Var::calcByteSize() {
 
        int size;
@@ -575,40 +575,40 @@ int Var::calcByteSize() {
 
        switch ( varType_ ) {
                case CHAR:
-                        size = sizeof(char); 
+                        size = sizeof(char);
                         break;
                case SHORT:
-                        size = sizeof(short); 
+                        size = sizeof(short);
                         break;
                case INT:
-                        size = sizeof(int); 
+                        size = sizeof(int);
                         break;
                case LONG:
-                        size = sizeof(long); 
+                        size = sizeof(long);
                         break;
                case UNSIGNED_CHAR:
-                        size = sizeof(unsigned char); 
+                        size = sizeof(unsigned char);
                         break;
                case UNSIGNED_SHORT:
-                        size = sizeof(unsigned short); 
+                        size = sizeof(unsigned short);
                         break;
                case UNSIGNED_INTEGER:
-                        size = sizeof(unsigned int); 
+                        size = sizeof(unsigned int);
                         break ;
                case UNSIGNED_LONG:
-                        size = sizeof(unsigned long); 
+                        size = sizeof(unsigned long);
                         break ;
                case FLOAT:
-                        size = sizeof(float); 
+                        size = sizeof(float);
                         break;
                case DOUBLE:
-                        size = sizeof(double); 
+                        size = sizeof(double);
                         break;
                case LONG_LONG:
-                        size = sizeof(long long); 
+                        size = sizeof(long long);
                         break ;
                case UNSIGNED_LONG_LONG:
-                        size = sizeof(unsigned long long); 
+                        size = sizeof(unsigned long long);
                         break ;
                case VOID:
                         size = 0;
@@ -625,13 +625,13 @@ int Var::calcByteSize() {
        }
 
        totalSize = size*nDimensions_ ;
-        
+
        return( totalSize );
 }
 
 /* Calculate and return total number of dimensions of variable e.g.
  *
- * Input a[0-4].b[8-9], 
+ * Input a[0-4].b[8-9],
  * Returns: 5*2 = 10 dimensions
  */
 int Var::calcNumDimensions() {
@@ -641,77 +641,77 @@ int Var::calcNumDimensions() {
        char* dim1;
        char* dim2;
        int  d1, d2;
-       int  numDims; 
+       int  numDims;
        int  numDimSpecs;
-    
+
        // Dims can't be longer than varName
        stringLen = varName_.size();
        dim1 = new char[stringLen+1] ;
        dim2 = new char[stringLen+1] ;
-       
+
        numDimSpecs = 0 ;
        numDims = 1 ;
        for ( i = 0; i < stringLen; i++ ) {
-                
+
                 if ( varName_[i] == ']' ) {
                                cerr << "ERROR: Missing open bracket in"
                                     << varName_ << endl ;
                                return( -1 );
                 }
-    
+
                 if ( varName_[i] == '[' ) {
-    
+
                        j = 0;
                        while ( varName_[i] != ']' ) {
-    
+
                               i++ ;
-    
+
                               // Missing close bracket?
                               if ( i == stringLen ) {
                                        cerr << "ERROR: Missing close bracket in"
                                             << varName_ << endl ;
                                        return( -1 ) ;
                               }
-    
-                              // Get dimension 1          
+
+                              // Get dimension 1
                               j = 0;
                               dim1[0] = '\0';
                               while ( isdigit(varName_[i]) ) {
-                                          
+
                                       dim1[j] = varName_[i] ;
-                                     
+
                                        i++; j++;
-    
+
                                        if ( i == stringLen  ) {
                                               cerr << "ERROR: Missing close "
-                                                   << "bracket in " 
+                                                   << "bracket in "
                                                    << varName_ << endl ;
                                               return( -1 ) ;
                                        }
                                        if ( j > 7 ) {
                                               printf("ERROR: Dimension spec "
-                                                     "too long.\n"); 
+                                                     "too long.\n");
                                               return( -1 ) ;
                                        }
                               }
                               dim1[j] = '\0';
-    
+
                               // Get dimension 2
                               j = 0 ;
                               if ( varName_[i] == '-' ) {
-    
+
                                        i++ ;
-    
+
                                        // Multi-dimensional
                                        while ( isdigit(varName_[i]) ) {
-                                      
+
                                                dim2[j] = varName_[i] ;
-                                        
+
                                                i++; j++;
-       
+
                                                if ( i == stringLen  ) {
                                                        cerr << "ERROR: Missing "
-                                                            << "close bracket" 
+                                                            << "close bracket"
                                                             << " in "
                                                             << varName_
                                                             << endl ;
@@ -719,50 +719,50 @@ int Var::calcNumDimensions() {
                                                }
                                                if ( j > 7 ) {
                                                        cerr << "ERROR: Dim "
-                                                            << "spec too long " 
+                                                            << "spec too long "
                                                             << "in "
                                                             << varName_
                                                             << endl ;
                                                        return( -1 ) ;
                                                }
-                                      
+
                                        }
                                        dim2[j] = '\0';
-    
-                               } else if ( varName_[i] == ']' ) {   
-    
+
+                               } else if ( varName_[i] == ']' ) {
+
                                        // Single dimensional
                                        strcpy(dim2, dim1);
-    
+
                                } else {
                                        cerr << "ERROR: Dimension has syntax "
                                             << "error with "
-                                            << varName_ << endl ; 
+                                            << varName_ << endl ;
                                        return( -1 ) ;
                                }
                        }
-               
+
                        if ( dim1[0] == '\0' || dim2[0] == '\0' ) {
                                cerr << "ERROR: Bad syntax in dimension "
-                                    << "specification for " 
+                                    << "specification for "
                                     << varName_ << endl ;
                                return( -1 );
                        }
-    
+
                        // Calculate number of dimensions
                        d1 = atoi(dim1);
                        d2 = atoi(dim2);
                        numDims = numDims * ( d2 - d1 + 1 ) ;
-    
+
                        // Increment number of dimension specs
                        numDimSpecs++ ;
                }
-       }             
-    
+       }
+
        // Free dims
        delete[] dim1 ;
        delete[] dim2 ;
-    
+
        return( numDims );
 }
 
@@ -773,7 +773,7 @@ int Var::calcNumDimensions() {
   * a[0-9][0-2].b[2-3].c has 4 parms "a[0-9], a[0-2], b[2-3] & c"
   */
 int Var::getNumParms() {
-  
+
        unsigned int i ;
        int nParms ;
 
@@ -784,11 +784,11 @@ int Var::getNumParms() {
        nParms = 1 ;
        for ( i = 0 ; i < varName_.size() ; i++ ) {
                if ( varName_[i] == '.' ) {
-                       nParms++ ; 
+                       nParms++ ;
                }
                if ( varName_[i] == ']' && varName_[i+1] == '['  ) {
                        nParms++ ;
-               }	
+               }
        }
 
        return(nParms);
diff --git a/trick_source/data_products/Var/var.h b/trick_source/data_products/Var/var.h
index 1b11ad2e..aa3fcebc 100644
--- a/trick_source/data_products/Var/var.h
+++ b/trick_source/data_products/Var/var.h
@@ -1,6 +1,6 @@
 
 /**
-    A variable class 
+    A variable class
     @author Keith Vetter
     @version May 2002
     @see Unit
@@ -28,8 +28,8 @@ class Var {
                const Var &operator= (Var& right) ;      // Assignment
 
                enum  enumType {
-                   CHAR, SHORT, INT, LONG, UNSIGNED_CHAR, UNSIGNED_SHORT, 
-	            UNSIGNED_INTEGER, UNSIGNED_LONG, FLOAT, DOUBLE, LONG_LONG, 
+                   CHAR, SHORT, INT, LONG, UNSIGNED_CHAR, UNSIGNED_SHORT,
+	            UNSIGNED_INTEGER, UNSIGNED_LONG, FLOAT, DOUBLE, LONG_LONG,
 	            UNSIGNED_LONG_LONG, VOID, NONE }  ;
 
                // Get Var Info
@@ -75,7 +75,7 @@ class Var {
                int   compareNames( const char* name );
 
                bool isProgramOutput ;
-     
+
        private:
 
                int calcNumDimensions();
@@ -88,7 +88,7 @@ class Var {
                string timeName_;   // name of time variable e.g. sys.exec.out.time
                string timeLabel_;   // e.g. "time"
 
-               int   byteSize_;  // a[0-5]: 6*(4bytes/double) = 24 bytes in all 
+               int   byteSize_;  // a[0-5]: 6*(4bytes/double) = 24 bytes in all
                int   nDimensions_; // a[0-3].b[1-6].c[3] has 4*6*1=24 dimensions
 
                enum   enumType varType_;
diff --git a/trick_source/sim_services/CheckPointAgent/ClassicCheckPointerAgent.cpp b/trick_source/sim_services/CheckPointAgent/ClassicCheckPointerAgent.cpp
index e59ba40d..8fc9f126 100644
--- a/trick_source/sim_services/CheckPointAgent/ClassicCheckPointerAgent.cpp
+++ b/trick_source/sim_services/CheckPointAgent/ClassicCheckPointerAgent.cpp
@@ -927,7 +927,7 @@ void Trick::ClassicCheckPointAgent::write_rvalue( std::ostream& chkpnt_os, void*
 
             ref_string = ref_string_from_ptr( pointer, attr, curr_dim);
 
-            chkpnt_os << ref_string.c_str() ; 
+            chkpnt_os << ref_string.c_str() ;
 
         } else { // Fixed dimension
 
diff --git a/trick_source/sim_services/CheckPointRestart/CheckPointRestart.cpp b/trick_source/sim_services/CheckPointRestart/CheckPointRestart.cpp
index 47bfec22..75128f72 100644
--- a/trick_source/sim_services/CheckPointRestart/CheckPointRestart.cpp
+++ b/trick_source/sim_services/CheckPointRestart/CheckPointRestart.cpp
@@ -234,7 +234,7 @@ int Trick::CheckPointRestart::do_checkpoint(std::string file_name, bool print_st
             }
             _Exit(0) ;
         }
-    } 
+    }
     else {
     // no fork
         if (obj_list.empty()) {
diff --git a/trick_source/sim_services/Clock/test/BC635Clock_test.cpp b/trick_source/sim_services/Clock/test/BC635Clock_test.cpp
index dc9bad5b..aa8e13de 100644
--- a/trick_source/sim_services/Clock/test/BC635Clock_test.cpp
+++ b/trick_source/sim_services/Clock/test/BC635Clock_test.cpp
@@ -1,10 +1,10 @@
 
 /******************NOTES**********************************************
  * The BC635 clock requires special hardware to work. These tests
- * ensure that the TPRO class properly handles cases in which no 
+ * ensure that the TPRO class properly handles cases in which no
  * hardware is in use.
  *
- * Listed requirements are under requirement Trick-153 (3.7.1.2) 
+ * Listed requirements are under requirement Trick-153 (3.7.1.2)
  * Real-time control shall be able to use an external clock source
  *********************************************************************/
 
@@ -12,7 +12,7 @@
 #include <iostream>
 #include <sys/types.h>
 #include <signal.h>
- 
+
 #include "gtest/gtest.h"
 #include "trick/Clock.hh"
 #include "trick/clock_proto.h"
diff --git a/trick_source/sim_services/Collect/collect.cpp b/trick_source/sim_services/Collect/collect.cpp
index b22a726e..c479ece6 100644
--- a/trick_source/sim_services/Collect/collect.cpp
+++ b/trick_source/sim_services/Collect/collect.cpp
@@ -10,7 +10,7 @@ to the new list.  The old list a collector will be freed.
 @details
 -# Get the current list length
 -# Allocate enough space to accomodate the current list + 1. (+1 for the size of the list)
--# Set the size of the new list in the first slot of the new list. 
+-# Set the size of the new list in the first slot of the new list.
 -# Copy the old list to the new.
 -# Append the new item to the new list.
 -# Delete the old list
@@ -52,7 +52,7 @@ to the new list.  The old list a collector will be freed.
 -# Get the current list length
 -# Count the number of items in the list that do not match the collectee.
 -# Allocate enough space to accomodate the new list. (+1 for the size of the list)
--# Set the size of the new list in the first slot of the new list. 
+-# Set the size of the new list in the first slot of the new list.
 -# Copy all of the items that do not match collectee to the new list
 -# Delete the old list
 -# Return the new list
diff --git a/trick_source/sim_services/CommandLineArguments/CommandLineArguments.cpp b/trick_source/sim_services/CommandLineArguments/CommandLineArguments.cpp
index 5a5c6fbd..053884c6 100644
--- a/trick_source/sim_services/CommandLineArguments/CommandLineArguments.cpp
+++ b/trick_source/sim_services/CommandLineArguments/CommandLineArguments.cpp
@@ -89,7 +89,7 @@ std::string & Trick::CommandLineArguments::get_cmdline_name_ref() {
       -# Save the simulation executable name as the full first argument
       -# Get the current working directory
       -# Save the current working directory as the default input directory.
-   -# If a relative or full directory is present in the command line arguments 
+   -# If a relative or full directory is present in the command line arguments
       -# split the command line argument on the last "/" character
       -# Save the back half of the split as the simulation executable name
       -# Save the current working directory
@@ -147,16 +147,16 @@ int Trick::CommandLineArguments::process_sim_args(int nargs , char **args) {
         // change back to the current directory
         chdir(buf);
     }
-    
+
     free(buf) ;
     free(buf2) ;
 
     if ( argc > 1 ) {
-    
+
         /* First argument is the input file name: '<Run_dir>/<file_name>' */
         input_file = argv[1] ;
         run_dir = argv[1] ;
-    
+
         found = run_dir.find_last_of("/") ;
         if ( found != std::string::npos ) {
             run_dir.erase(found) ;
@@ -212,7 +212,7 @@ int Trick::CommandLineArguments::output_dir_timestamped_on() {
     time_t date ;
     struct tm *curr_time ;
     char temp_str[256] ;
-    
+
     date = time(NULL) ;
     curr_time = localtime(&date) ;
 
diff --git a/trick_source/sim_services/DMTCP/DMTCP.cpp b/trick_source/sim_services/DMTCP/DMTCP.cpp
index 9765c53c..e06e1288 100644
--- a/trick_source/sim_services/DMTCP/DMTCP.cpp
+++ b/trick_source/sim_services/DMTCP/DMTCP.cpp
@@ -81,7 +81,7 @@ int Trick::DMTCP::post() {
     renameRestartScript();
 
     post_queue.reset_curr_index() ;
-    
+
     while ( (curr_job = post_queue.get_next_job()) != NULL )
         curr_job->call() ;
 
@@ -175,7 +175,7 @@ std::string Trick::DMTCP::getScriptName() {
     if ( ( mmw_script_name == default_script_name.str() ) or ( !isSpecialCharacter( mmw_script_name ) ) )
         restart_script_name = mmw_script_name;
 
-    // User specifed an invalid script name 
+    // User specifed an invalid script name
     else {
         std::cout << mmw_script_name.c_str() << " is not a valid name. The default DMTCP script name will be used: " << default_script_name.str() << endl;
         restart_script_name = default_script_name.str();
@@ -214,7 +214,7 @@ void Trick::DMTCP::dmtcpRenameCmd() {
     }
 
     // There is a bug in DMTCP that causes the DMTCP Coordinator (see dmtcp::DmtcpCoordinator::writeRestartScript())
-    // to not recognize ENV_VAR_CHECKPOINT_DIR when dumping a checkpoint from a restarted checkpoint. 
+    // to not recognize ENV_VAR_CHECKPOINT_DIR when dumping a checkpoint from a restarted checkpoint.
     // As a result, DMTCP writes the restart script to the current directory.
     // This code just checks to see if it's in the current dir, if so, move it to the ENV_VAR_CHECKPOINT_DIR with the new script name.
     ifstream no_env_dmtcp_file( no_env_dmtcp_restart_script.str().c_str() );
@@ -249,7 +249,7 @@ void Trick::DMTCP::dmtcpSystemCmd( const string& str ) {
 
     if ( real_system_ptr != NULL )
         (*real_system_ptr)( str.c_str() ) ;
-    else 
+    else
         system( str.c_str() );
 }
 
@@ -290,7 +290,7 @@ void Trick::DMTCP::dmtcpCleanup() {
 
     sprintf( dmtcp_restart_script_sh, "%s/dmtcp_restart_script.sh", lsp->env );
     unlink(dmtcp_restart_script_sh) ;
-    
+
     if ( !dmtcp_checkpoint_jobs_queue.empty() )
         dmtcp_checkpoint_jobs_queue.pop();
 #endif
diff --git a/trick_source/sim_services/DataTypes/include/NormalStructMember.hh b/trick_source/sim_services/DataTypes/include/NormalStructMember.hh
index 9209a046..8e96a746 100644
--- a/trick_source/sim_services/DataTypes/include/NormalStructMember.hh
+++ b/trick_source/sim_services/DataTypes/include/NormalStructMember.hh
@@ -40,7 +40,7 @@ public:
      */
     bool validate();
 
-    /** 
+    /**
     */
     MemberClass::e getMemberClass() const {
         return MemberClass::NORMAL;
diff --git a/trick_source/sim_services/DataTypes/include/PointerDataType.hh b/trick_source/sim_services/DataTypes/include/PointerDataType.hh
index bb6020ae..f7804a6a 100644
--- a/trick_source/sim_services/DataTypes/include/PointerDataType.hh
+++ b/trick_source/sim_services/DataTypes/include/PointerDataType.hh
@@ -22,7 +22,7 @@ class PointerDataType : public DataType {
     PointerDataType( TypeDictionary * typeDictionary,
                      std::string typeSpecifierName,
                      unsigned int n_dims,
-                     int dims[] ) throw (std::logic_error); 
+                     int dims[] ) throw (std::logic_error);
     /**
      Constructor for ArrayDataType.
      @param typeDictionary The Type Dictionary.
diff --git a/trick_source/sim_services/DataTypes/include/PointerValue.hh b/trick_source/sim_services/DataTypes/include/PointerValue.hh
index afb192d2..67695faa 100644
--- a/trick_source/sim_services/DataTypes/include/PointerValue.hh
+++ b/trick_source/sim_services/DataTypes/include/PointerValue.hh
@@ -32,6 +32,6 @@ class PointerValue : public Value {
     std::string toString();
 
     private:
-    void* value; 
+    void* value;
 };
 #endif
diff --git a/trick_source/sim_services/DataTypes/src/AllocInfo.cpp b/trick_source/sim_services/DataTypes/src/AllocInfo.cpp
index 14fb3094..fc948d07 100644
--- a/trick_source/sim_services/DataTypes/src/AllocInfo.cpp
+++ b/trick_source/sim_services/DataTypes/src/AllocInfo.cpp
@@ -15,7 +15,7 @@ const std::string AllocInfo::localPrefix = "trick_local_";
 const std::string AllocInfo::externPrefix = "trick_extern_";
 unsigned int AllocInfo::nextSerialNumber = 0;
 
-// PRIVATE MEMBER FUNCTION 
+// PRIVATE MEMBER FUNCTION
 void AllocInfo::initialize( const std::string& varName,
                             const std::string& typeSpecName,
                             unsigned int       dimsCount,
diff --git a/trick_source/sim_services/DataTypes/src/ArrayDataType.cpp b/trick_source/sim_services/DataTypes/src/ArrayDataType.cpp
index 05575fb7..f23084af 100644
--- a/trick_source/sim_services/DataTypes/src/ArrayDataType.cpp
+++ b/trick_source/sim_services/DataTypes/src/ArrayDataType.cpp
@@ -310,7 +310,7 @@ bool ArrayDataType::getElementInfo( LexicalAnalyzer* lexer, void* baseAddress, V
     bool errorCondition = false;
     nextToken = lexer->getToken();
     if (nextToken = Token::Integer) {
-       int index = std::atoi( (lexer->getText()).c_str() ); 
+       int index = std::atoi( (lexer->getText()).c_str() );
     }
     if ( (index >= 0) && (index < elementCount)) {
         const DataType*   elementDataType = subType->getDataType();
diff --git a/trick_source/sim_services/DataTypes/src/TypeDictionary.cpp b/trick_source/sim_services/DataTypes/src/TypeDictionary.cpp
index 63dc7479..c8f4a018 100644
--- a/trick_source/sim_services/DataTypes/src/TypeDictionary.cpp
+++ b/trick_source/sim_services/DataTypes/src/TypeDictionary.cpp
@@ -7,7 +7,7 @@
 // MEMBER FUNCTION
 TypeDictionary::TypeDictionary() {
 
-    // Add builtin types. 
+    // Add builtin types.
     addTypeDefinition("void", new PrimitiveDataType<void>() );
     addTypeDefinition("char", new PrimitiveDataType<char>() );
     addTypeDefinition("short", new PrimitiveDataType<short>() );
diff --git a/trick_source/sim_services/DataTypes/testing/EnumDeclarationTest.cpp b/trick_source/sim_services/DataTypes/testing/EnumDeclarationTest.cpp
index 4618891f..a1adb00a 100644
--- a/trick_source/sim_services/DataTypes/testing/EnumDeclarationTest.cpp
+++ b/trick_source/sim_services/DataTypes/testing/EnumDeclarationTest.cpp
@@ -157,7 +157,7 @@ TEST(EnumDeclaration, print_singleton_value) {
 
     int result = ss.str().compare("Monday");
 
-    EXPECT_EQ(0, result); 
+    EXPECT_EQ(0, result);
 
 
     class Foo { public : Foo () {
diff --git a/trick_source/sim_services/Environment/Environment_c_intf.cpp b/trick_source/sim_services/Environment/Environment_c_intf.cpp
index 9c517d30..a74e95a7 100644
--- a/trick_source/sim_services/Environment/Environment_c_intf.cpp
+++ b/trick_source/sim_services/Environment/Environment_c_intf.cpp
@@ -16,7 +16,7 @@ extern "C" int env_add_var( const char * variable_name, const char * value) {
     std::string var_string ;
     std::string value_string ;
 
-    // Add handling for NULL string.  
+    // Add handling for NULL string.
     if ( variable_name == NULL ) {
         var_string.clear() ;
     } else {
@@ -49,7 +49,7 @@ extern "C" const char * env_get_var( const char * variable_name ) {
 
     std::string var_string ;
 
-    // Add handling for NULL string.  
+    // Add handling for NULL string.
     if ( variable_name == NULL ) {
         var_string.clear() ;
     } else {
diff --git a/trick_source/sim_services/Executive/Executive.cpp b/trick_source/sim_services/Executive/Executive.cpp
index 28fce058..cf5835d4 100644
--- a/trick_source/sim_services/Executive/Executive.cpp
+++ b/trick_source/sim_services/Executive/Executive.cpp
@@ -58,7 +58,7 @@ Trick::Executive::Executive() {
     old_time_tic_value = 1000000 ;
     time_tic_value = 1000000 ;
 
-    // Set the JobData copy of the time_tic_value to the executive value 
+    // Set the JobData copy of the time_tic_value to the executive value
     Trick::JobData::set_time_tic_value(time_tic_value) ;
 
     // These trap flags are set in init_signal_handlers()
diff --git a/trick_source/sim_services/Executive/Executive_add_depends_on_job.cpp b/trick_source/sim_services/Executive/Executive_add_depends_on_job.cpp
index 8348d5e2..38cb167c 100644
--- a/trick_source/sim_services/Executive/Executive_add_depends_on_job.cpp
+++ b/trick_source/sim_services/Executive/Executive_add_depends_on_job.cpp
@@ -13,17 +13,17 @@
 -# Return an error if both jobs are on the same thread.
 -# The depend passed all checks, add the depends job to the target job dependency list
 */
-int Trick::Executive::add_depends_on_job( std::string target_job_string , unsigned int t_instance , 
+int Trick::Executive::add_depends_on_job( std::string target_job_string , unsigned int t_instance ,
                                           std::string depend_job_string , unsigned int d_instance ) {
 
     Trick::JobData * target_job ;
     Trick::JobData * depend_job ;
-    
+
     /* Find target job.  Return error if target job not found. */
     target_job = get_job(target_job_string, t_instance) ;
     if ( target_job == NULL ) {
         message_publish(MSG_ERROR, "add_depends_on_job: Could not find target job %s instance %d\n",
-         target_job_string.c_str(), t_instance) ; 
+         target_job_string.c_str(), t_instance) ;
         return(-1) ;
     }
 
@@ -31,20 +31,20 @@ int Trick::Executive::add_depends_on_job( std::string target_job_string , unsign
     depend_job = get_job(depend_job_string, d_instance) ;
     if ( depend_job == NULL ) {
         message_publish(MSG_ERROR, "add_depends_on_job: Could not find depend job %s instance %d\n",
-         depend_job_string.c_str(), d_instance) ; 
+         depend_job_string.c_str(), d_instance) ;
         return(-2) ;
     }
 
     /* Return an error if both jobs are on the same thread */
     if( target_job->thread == depend_job->thread) {
-        message_publish(MSG_ERROR, "add_depends_on_job: target job %s and depend job %s on the same thread", 
-         target_job_string.c_str() , depend_job_string.c_str()) ;  ; 
+        message_publish(MSG_ERROR, "add_depends_on_job: target job %s and depend job %s on the same thread",
+         target_job_string.c_str() , depend_job_string.c_str()) ;  ;
         return(-3) ;
     }
 
     /* Passed all checks, add the depends job to the target job dependency list */
     target_job->add_depend(depend_job) ;
-    
+
     return(0) ;
 
 }
diff --git a/trick_source/sim_services/Executive/Executive_add_scheduled_job_class.cpp b/trick_source/sim_services/Executive/Executive_add_scheduled_job_class.cpp
index fe7cb6ea..72cd715e 100644
--- a/trick_source/sim_services/Executive/Executive_add_scheduled_job_class.cpp
+++ b/trick_source/sim_services/Executive/Executive_add_scheduled_job_class.cpp
@@ -4,10 +4,10 @@
 #include "trick/Executive.hh"
 
 /**
-@details 
--# Gets the size of the class map. 
--# Add the incoming job class string as a key to the class_job map. Assign it the value of 
-   of ( scheduled_job_class_base + size_of_map ) 
+@details
+-# Gets the size of the class map.
+-# Add the incoming job class string as a key to the class_job map. Assign it the value of
+   of ( scheduled_job_class_base + size_of_map )
  */
 int Trick::Executive::add_scheduled_job_class( std::string in_name ) {
 
diff --git a/trick_source/sim_services/Executive/Executive_add_sim_object.cpp b/trick_source/sim_services/Executive/Executive_add_sim_object.cpp
index 837855a0..71526a09 100644
--- a/trick_source/sim_services/Executive/Executive_add_sim_object.cpp
+++ b/trick_source/sim_services/Executive/Executive_add_sim_object.cpp
@@ -4,7 +4,7 @@
 #include "trick/Executive.hh"
 
 /**
-@details 
+@details
 -# Assign the name of the sim_object.
 -# Call add_sim_object(Trick::SimObject *, const char *) for component objects that
    are to be processed before the current object.
diff --git a/trick_source/sim_services/Executive/Executive_c_intf.cpp b/trick_source/sim_services/Executive/Executive_c_intf.cpp
index 43e03c80..28cad5e6 100644
--- a/trick_source/sim_services/Executive/Executive_c_intf.cpp
+++ b/trick_source/sim_services/Executive/Executive_c_intf.cpp
@@ -1033,4 +1033,4 @@ int exec_register_scheduler( Trick::Scheduler * scheduler ) {
     }
     return -1 ;
 }
- 
+
diff --git a/trick_source/sim_services/Executive/Executive_check_all_jobs_handled.cpp b/trick_source/sim_services/Executive/Executive_check_all_jobs_handled.cpp
index 688adec0..9c30bc5c 100644
--- a/trick_source/sim_services/Executive/Executive_check_all_jobs_handled.cpp
+++ b/trick_source/sim_services/Executive/Executive_check_all_jobs_handled.cpp
@@ -28,7 +28,7 @@ int Trick::Executive::check_all_jobs_handled() {
             current_job = curr_obj->jobs[jj] ;
             if ( ! current_job->get_handled() ) {
                  message_publish(MSG_WARNING, "Warning: Job %s of job class \"%s\"is not handled by any scheduler\n" ,
-                 current_job->name.c_str(), current_job->job_class_name.c_str()) ; 
+                 current_job->name.c_str(), current_job->job_class_name.c_str()) ;
                  ret++ ;
             }
         }
diff --git a/trick_source/sim_services/Executive/Executive_checkpoint.cpp b/trick_source/sim_services/Executive/Executive_checkpoint.cpp
index a7e9669c..e82d86c3 100644
--- a/trick_source/sim_services/Executive/Executive_checkpoint.cpp
+++ b/trick_source/sim_services/Executive/Executive_checkpoint.cpp
@@ -23,7 +23,7 @@ int Trick::Executive::checkpoint() {
 
     /* copy all of the job information in a checkpointable array */
     if ( num_all_jobs > 0 ) {
-        all_jobs_for_checkpoint = (Trick::JobData *)TMM_declare_var( TRICK_STRUCTURED, "Trick::JobData", 
+        all_jobs_for_checkpoint = (Trick::JobData *)TMM_declare_var( TRICK_STRUCTURED, "Trick::JobData",
          0 , "all_jobs" , 1 , (int *)&num_all_jobs) ;
         for ( ii = 0 ; ii < num_all_jobs ; ii++ ) {
             all_jobs_for_checkpoint[ii] = *(all_jobs_vector[ii]) ;
diff --git a/trick_source/sim_services/Executive/Executive_get_process_id.cpp b/trick_source/sim_services/Executive/Executive_get_process_id.cpp
index e97ca984..fd174ae4 100644
--- a/trick_source/sim_services/Executive/Executive_get_process_id.cpp
+++ b/trick_source/sim_services/Executive/Executive_get_process_id.cpp
@@ -16,7 +16,7 @@ unsigned int Trick::Executive::get_process_id() {
             }
         }
     }
-    
+
     return(0) ;
 
 }
diff --git a/trick_source/sim_services/Executive/Executive_loop_multi_thread.cpp b/trick_source/sim_services/Executive/Executive_loop_multi_thread.cpp
index 6218836e..51e42255 100644
--- a/trick_source/sim_services/Executive/Executive_loop_multi_thread.cpp
+++ b/trick_source/sim_services/Executive/Executive_loop_multi_thread.cpp
@@ -138,7 +138,7 @@ int Trick::Executive::loop_multi_thread() {
             if ( ret != 0 ) {
                 exec_terminate_with_return(ret , curr_job->name.c_str() , 0 , "scheduled job did not return 0") ;
             }
-            /* System jobs next call time are not set until after they run. 
+            /* System jobs next call time are not set until after they run.
                Test their next job call time after they have been called */
             if ( curr_job->system_job_class ) {
                 main_sched_queue->test_next_job_call_time(curr_job , time_tics) ;
diff --git a/trick_source/sim_services/Executive/Executive_loop_single_thread.cpp b/trick_source/sim_services/Executive/Executive_loop_single_thread.cpp
index c304a2db..fc5ff874 100644
--- a/trick_source/sim_services/Executive/Executive_loop_single_thread.cpp
+++ b/trick_source/sim_services/Executive/Executive_loop_single_thread.cpp
@@ -72,7 +72,7 @@ int Trick::Executive::loop_single_thread() {
             if ( ret != 0 ) {
                 exec_terminate_with_return(ret , curr_job->name.c_str() , 0 , "scheduled job did not return 0") ;
             }
-            /* System jobs next call time are not set until after they run. 
+            /* System jobs next call time are not set until after they run.
                Test their next job call time after they have been called */
             if ( curr_job->system_job_class ) {
                 main_sched_queue->test_next_job_call_time(curr_job , time_tics) ;
diff --git a/trick_source/sim_services/Executive/Executive_set_simobject_onoff.cpp b/trick_source/sim_services/Executive/Executive_set_simobject_onoff.cpp
index 22c1bb8b..7c4bcaa7 100644
--- a/trick_source/sim_services/Executive/Executive_set_simobject_onoff.cpp
+++ b/trick_source/sim_services/Executive/Executive_set_simobject_onoff.cpp
@@ -12,7 +12,7 @@ int Trick::Executive::set_sim_object_onoff(std::string sim_object_name, int on)
         if ( ! sim_objects[ii]->name.compare(sim_object_name) ) {
             so = sim_objects[ii] ;
             for ( jj = 0 ; jj < so->jobs.size() ; jj++ ) {
-                so->jobs[jj]->disabled = !on ; 
+                so->jobs[jj]->disabled = !on ;
             }
             return(0) ;
         }
diff --git a/trick_source/sim_services/Executive/Executive_shutdown.cpp b/trick_source/sim_services/Executive/Executive_shutdown.cpp
index 3c84d7b4..e453ed80 100644
--- a/trick_source/sim_services/Executive/Executive_shutdown.cpp
+++ b/trick_source/sim_services/Executive/Executive_shutdown.cpp
@@ -1,4 +1,4 @@
-/* 
+/*
    PURPOSE: (Graceful Simulation termination with timing data output.)
 
    PROGRAMMERS:
diff --git a/trick_source/sim_services/Executive/Executive_write_s_job_execution.cpp b/trick_source/sim_services/Executive/Executive_write_s_job_execution.cpp
index 720d09e1..f6cd0428 100644
--- a/trick_source/sim_services/Executive/Executive_write_s_job_execution.cpp
+++ b/trick_source/sim_services/Executive/Executive_write_s_job_execution.cpp
@@ -121,7 +121,7 @@ int Trick::Executive::write_s_job_execution(FILE *fp) {
     for ( ii = 0 ; ii < other_schedulers.size() ; ii++ ) {
         other_schedulers[ii]->write_s_job_execution(fp) ;
     }
-    
+
     fprintf(fp, "\n===================================================================================================\n") ;
 
     fclose(fp);
diff --git a/trick_source/sim_services/Executive/Threads_child.cpp b/trick_source/sim_services/Executive/Threads_child.cpp
index 0291af8f..3a9ac40b 100644
--- a/trick_source/sim_services/Executive/Threads_child.cpp
+++ b/trick_source/sim_services/Executive/Threads_child.cpp
@@ -88,7 +88,7 @@ static int call_next_job(Trick::JobData * curr_job, Trick::ScheduledJobQueue & j
             -# For each scheduled jobs whose next call time is equal to the current queue time
                 -# Call call_next_job(Trick::JobData * curr_job, Trick::ScheduledJobQueue & job_queue, bool rt_nap, long long curr_time_tics)
     -# Switch if the child is a asynchronous thread
-        -# For each scheduled jobs 
+        -# For each scheduled jobs
             -# Call call_next_job(Trick::JobData * curr_job, Trick::ScheduledJobQueue & job_queue, bool rt_nap, long long curr_time_tics)
     -# Set the child complete flag
 */
diff --git a/trick_source/sim_services/Executive/test/Executive_test.cpp b/trick_source/sim_services/Executive/test/Executive_test.cpp
index be551e6c..eb59ed04 100644
--- a/trick_source/sim_services/Executive/test/Executive_test.cpp
+++ b/trick_source/sim_services/Executive/test/Executive_test.cpp
@@ -825,7 +825,7 @@ TEST_F(ExecutiveTest , SetSignalHandlers) {
 
 TEST_F(ExecutiveTest , JobOnOff) {
 	//req.add_requirement("2445198072");
-	
+
     Trick::JobData * curr_job ;
 
     exec_add_sim_object(&so1 , "so1") ;
diff --git a/trick_source/sim_services/InputProcessor/IPPython.cpp b/trick_source/sim_services/InputProcessor/IPPython.cpp
index 22b9218a..d0de8020 100644
--- a/trick_source/sim_services/InputProcessor/IPPython.cpp
+++ b/trick_source/sim_services/InputProcessor/IPPython.cpp
@@ -178,7 +178,7 @@ int Trick::IPPython::parse_condition(std::string in_string, int & cond_return_va
 
 }
 
-//Restart job that reloads event_list from checkpointable structures 
+//Restart job that reloads event_list from checkpointable structures
 int Trick::IPPython::restart() {
     /* Make shortcut names for all known sim_objects. */
     get_TMM_named_variables() ;
diff --git a/trick_source/sim_services/InputProcessor/IPPythonEvent.cpp b/trick_source/sim_services/InputProcessor/IPPythonEvent.cpp
index 14604ad1..cb2d6478 100644
--- a/trick_source/sim_services/InputProcessor/IPPythonEvent.cpp
+++ b/trick_source/sim_services/InputProcessor/IPPythonEvent.cpp
@@ -165,7 +165,7 @@ void Trick::IPPythonEvent::restart() {
 //Command to create a new condition using a model variable (or reset an existing condition variable), num is index starting at 0.
 int Trick::IPPythonEvent::condition_var(int num, std::string varname, std::string comment) {
     /** @par Detailed Design: */
-    /** @li Find the variable reference for the varname string and pass it to condition() */ 
+    /** @li Find the variable reference for the varname string and pass it to condition() */
     REF2* ref = ref_attributes((char*)varname.c_str());
     /** @li Emit an error if specified varname does not exist. */
     if (ref==NULL) {
@@ -180,7 +180,7 @@ int Trick::IPPythonEvent::condition_var(int num, std::string varname, std::strin
 //Command to create a new condition using a model job (or reset an existing condition job), num is index starting at 0.
 int Trick::IPPythonEvent::condition_job(int num, std::string jobname, std::string comment) {
     /** @par Detailed Design: */
-    /** @li Find the job for the jobname string and pass it to condition() */ 
+    /** @li Find the job for the jobname string and pass it to condition() */
     JobData *job = exec_get_job(jobname.c_str(),1);
     /** @li Emit an error if specified jobname does not exist. */
     if (job==NULL) {
@@ -201,7 +201,7 @@ int Trick::IPPythonEvent::condition(int num, std::string str, std::string commen
     /** @par Detailed Design: */
 
     if (num == condition_count) {
-        /** @li Add a new condition when num is sequential, i.e. it is equal to condition_count */ 
+        /** @li Add a new condition when num is sequential, i.e. it is equal to condition_count */
         condition_count++;
         if (condition_count == 1) {
             cond = (Trick::condition_t *)TMM_declare_var_s("Trick::condition_t[1]");
@@ -353,7 +353,7 @@ int Trick::IPPythonEvent::action_job(int num, std::string jobname, std::string c
 //Command to create a new action to turn a model job ON, num is index starting at 0.
 int Trick::IPPythonEvent::action_job_on(int num, std::string jobname, std::string comment) {
     /** @par Detailed Design: */
-    /** @li Find the job for the jobname string and pass it to action() */ 
+    /** @li Find the job for the jobname string and pass it to action() */
     JobData *job = exec_get_job(jobname.c_str(),1);
     /** @li Emit an error if specified jobname does not exist. */
     if (job==NULL) {
@@ -367,7 +367,7 @@ int Trick::IPPythonEvent::action_job_on(int num, std::string jobname, std::strin
 //Command to create a new action to turn a model job OFF, num is index starting at 0.
 int Trick::IPPythonEvent::action_job_off(int num, std::string jobname, std::string comment) {
     /** @par Detailed Design: */
-    /** @li Find the job for the jobname string and pass it to action() */ 
+    /** @li Find the job for the jobname string and pass it to action() */
     JobData *job = exec_get_job(jobname.c_str(),1);
     /** @li Emit an error if specified jobname does not exist. */
     if (job==NULL) {
@@ -381,9 +381,9 @@ int Trick::IPPythonEvent::action_job_off(int num, std::string jobname, std::stri
 //Command to create a new action and set its input string (or reset an existing action string), num is index starting at 0.
 int Trick::IPPythonEvent::action(int num, std::string str, std::string comment, JobData *job, int act_type) {
     /** @par Detailed Design: */
- 
+
     if (num == action_count) {
-        /** @li Add a new action when num is sequential, i.e. it is equal to action_count */ 
+        /** @li Add a new action when num is sequential, i.e. it is equal to action_count */
         action_count++;
         if (action_count == 1) {
             act = (Trick::action_t *)TMM_declare_var_s("Trick::action_t[1]");
diff --git a/trick_source/sim_services/InputProcessor/InputProcessor.cpp b/trick_source/sim_services/InputProcessor/InputProcessor.cpp
index 73cb3f36..1b92cf58 100644
--- a/trick_source/sim_services/InputProcessor/InputProcessor.cpp
+++ b/trick_source/sim_services/InputProcessor/InputProcessor.cpp
@@ -38,7 +38,7 @@ int Trick::InputProcessor::process_sim_args() {
     /* Process all other calling arguments */
     for (i = 2; i < argc; i++) {
 
-        /* 
+        /*
          * If there are more than 2 calling arguments
          */
 
diff --git a/trick_source/sim_services/Integrator/src/IntegLoopManager.cpp b/trick_source/sim_services/Integrator/src/IntegLoopManager.cpp
index 76ff1816..a3c5e80a 100644
--- a/trick_source/sim_services/Integrator/src/IntegLoopManager.cpp
+++ b/trick_source/sim_services/Integrator/src/IntegLoopManager.cpp
@@ -238,7 +238,7 @@ Trick::IntegLoopScheduler* Trick::IntegrationManager::get_integrated_by (
 
 /**
  Note the scheduler responsible for integrating the specified sim object.
- This annotation makes it possible to automatically remove a sim object from 
+ This annotation makes it possible to automatically remove a sim object from
  some integration loop if that object is added to another loop.
  @param sim_object A sim object integrated by the specified integ loop.
  @param integrator The integ loop that integrates the specified sim object.
diff --git a/trick_source/sim_services/Integrator/src/IntegLoopScheduler.cpp b/trick_source/sim_services/Integrator/src/IntegLoopScheduler.cpp
index 0d524dc0..e87488ba 100644
--- a/trick_source/sim_services/Integrator/src/IntegLoopScheduler.cpp
+++ b/trick_source/sim_services/Integrator/src/IntegLoopScheduler.cpp
@@ -258,7 +258,7 @@ void Trick::IntegLoopScheduler::restart_checkpoint()
 
 /**
  Rebuild the integration loop's job queues.
- This method is called internally upon adding or deleting sim objects, 
+ This method is called internally upon adding or deleting sim objects,
  and is called externally (S_define level) during initialization and
  after a checkpoint restart.
  */
@@ -315,7 +315,7 @@ void Trick::IntegLoopScheduler::clear_queue (
 }
 
 /**
- Call the enabled derivative jobs. 
+ Call the enabled derivative jobs.
  */
 void Trick::IntegLoopScheduler::call_deriv_jobs ()
 {
@@ -638,8 +638,8 @@ int Trick::IntegLoopScheduler::write_s_job_execution(FILE *fp)
 }
 
 /**
- Adds the incoming instrumentation job before target job if specified, or all jobs in the list. 
- @param instrument_job Pointer to the job that should be run previously. 
+ Adds the incoming instrumentation job before target job if specified, or all jobs in the list.
+ @param instrument_job Pointer to the job that should be run previously.
  */
 int Trick::IntegLoopScheduler::instrument_job_before (
     Trick::JobData * instrument_job)
@@ -660,7 +660,7 @@ int Trick::IntegLoopScheduler::instrument_job_before (
 
 /**
  Adds the incoming instrumentation job after target job if specified, or all jobs in the list.
- @param instrument_job Pointer to the job that should be run after each job. 
+ @param instrument_job Pointer to the job that should be run after each job.
  */
 int Trick::IntegLoopScheduler::instrument_job_after (
     Trick::JobData * instrument_job)
@@ -679,7 +679,7 @@ int Trick::IntegLoopScheduler::instrument_job_after (
 
 /**
  Removes all jobs in the list that match the name in_job.
- @param in_job name of the job that should be removed. 
+ @param in_job name of the job that should be removed.
  */
 int Trick::IntegLoopScheduler::instrument_job_remove(std::string in_job)
 {
diff --git a/trick_source/sim_services/Integrator/src/Integrator.cpp b/trick_source/sim_services/Integrator/src/Integrator.cpp
index 59be23fa..6a3eb7d6 100644
--- a/trick_source/sim_services/Integrator/src/Integrator.cpp
+++ b/trick_source/sim_services/Integrator/src/Integrator.cpp
@@ -88,12 +88,12 @@ int Trick::Integrator::integrate_2nd_order_ode (
 /**
  */
 void Trick::Integrator::state_in (double* arg1, ...) {
-    
+
     va_list ap;
     int i;
-    double* narg; 
+    double* narg;
 
-    va_start(ap, arg1); 
+    va_start(ap, arg1);
 
     i=0;
     narg = arg1;
@@ -101,7 +101,7 @@ void Trick::Integrator::state_in (double* arg1, ...) {
     while (narg != (double*)NULL) {
         state[i] = *narg;
         if (verbosity) message_publish(MSG_DEBUG,"  %g", *narg);
-        narg = va_arg(ap, double*); 
+        narg = va_arg(ap, double*);
         i++;
     };
     if (verbosity) message_publish(MSG_DEBUG,"\n");
@@ -111,12 +111,12 @@ void Trick::Integrator::state_in (double* arg1, ...) {
 /**
  */
 void Trick::Integrator::deriv_in ( double* arg1, ...) {
-    
+
     va_list ap;
     int i;
-    double* narg; 
+    double* narg;
 
-    va_start(ap, arg1); 
+    va_start(ap, arg1);
 
     i=0;
     narg = arg1;
@@ -124,7 +124,7 @@ void Trick::Integrator::deriv_in ( double* arg1, ...) {
     while (narg != (double*)NULL) {
         deriv[intermediate_step][i] = *narg;
         if (verbosity) message_publish(MSG_DEBUG,"  %g",*narg);
-        narg = va_arg(ap, double*); 
+        narg = va_arg(ap, double*);
         i++;
     };
     va_end(ap);
@@ -158,12 +158,12 @@ void Trick::Integrator::deriv2_in ( double* arg1, ...) {
 /**
  */
 void Trick::Integrator::state_out (double* arg1, ...) {
-    
+
     va_list ap;
     int i;
-    double* narg; 
+    double* narg;
 
-    va_start(ap, arg1); 
+    va_start(ap, arg1);
 
     i=0;
     narg = arg1;
@@ -171,7 +171,7 @@ void Trick::Integrator::state_out (double* arg1, ...) {
     while (narg != (double*)NULL) {
         *narg = state_ws[intermediate_step][i];
         if (verbosity) message_publish(MSG_DEBUG,"  %g",*narg);
-        narg = va_arg(ap, double*); 
+        narg = va_arg(ap, double*);
         i++;
     };
     if (verbosity) message_publish(MSG_DEBUG,"\n");
diff --git a/trick_source/sim_services/Integrator/src/Integrator_C_Intf.cpp b/trick_source/sim_services/Integrator/src/Integrator_C_Intf.cpp
index d98c423c..333891ce 100644
--- a/trick_source/sim_services/Integrator/src/Integrator_C_Intf.cpp
+++ b/trick_source/sim_services/Integrator/src/Integrator_C_Intf.cpp
@@ -11,23 +11,23 @@ extern Trick::Integrator* trick_curr_integ ;
 
 extern "C" int integrate() {
     return (trick_curr_integ->integrate());
-} 
+}
 
 extern "C" int integrate_1st_order_ode(const double* deriv, double* state) {
     return (trick_curr_integ->integrate_1st_order_ode(deriv, state));
-} 
+}
 
 extern "C" int integrate_2nd_order_ode(const double* acc, double* vel, double * pos) {
     return (trick_curr_integ->integrate_2nd_order_ode(acc, vel, pos));
-} 
+}
 
 extern "C" double get_integ_time() {
     return (trick_curr_integ->time);
-} 
+}
 
 extern "C" void set_integ_time(double time_value) {
     trick_curr_integ->time = time_value;
-} 
+}
 
 extern "C" void load_state(double* arg1, ... ) {
 
@@ -42,7 +42,7 @@ extern "C" void load_state(double* arg1, ... ) {
         if (trick_curr_integ->verbosity) message_publish(MSG_DEBUG,"LOAD STATE:\n");
         while (narg != (double*)NULL) {
             trick_curr_integ->state[i] = *narg;
-            if (trick_curr_integ->verbosity) message_publish(MSG_DEBUG,"%g\n",*narg); 
+            if (trick_curr_integ->verbosity) message_publish(MSG_DEBUG,"%g\n",*narg);
             narg = va_arg(ap, double*);
             i++;
         };
@@ -72,7 +72,7 @@ extern "C" void load_deriv( double* arg1, ...) {
         va_start(ap, arg1);
         i=0;
         narg = arg1;
-        if (trick_curr_integ->verbosity) message_publish(MSG_DEBUG,"LOAD DERIV: \n"); 
+        if (trick_curr_integ->verbosity) message_publish(MSG_DEBUG,"LOAD DERIV: \n");
         while (narg != (double*)NULL) {
             trick_curr_integ->deriv[trick_curr_integ->intermediate_step][i] = *narg;
             if (trick_curr_integ->verbosity) message_publish(MSG_DEBUG,"%g\n",*narg);
@@ -94,7 +94,7 @@ extern "C" void load_indexed_deriv(unsigned int index , double deriv) {
         message_publish(MSG_ERROR, "Integ load_indexed_deriv ERROR: trick_curr_integ is not set.\n") ;
     }
 }
-  
+
 extern "C" void load_deriv2( double* arg1, ...) {
 
     va_list ap;
@@ -117,7 +117,7 @@ extern "C" void load_deriv2( double* arg1, ...) {
         message_publish(MSG_ERROR, "Integ load_deriv ERROR: trick_curr_integ is not set.\n") ;
     }
 }
-  
+
 extern "C" void load_indexed_deriv2(unsigned int index , double deriv2) {
 
     if (trick_curr_integ != NULL) {
diff --git a/trick_source/sim_services/Integrator/src/regula_falsi.c b/trick_source/sim_services/Integrator/src/regula_falsi.c
index b3c86458..fa489d76 100644
--- a/trick_source/sim_services/Integrator/src/regula_falsi.c
+++ b/trick_source/sim_services/Integrator/src/regula_falsi.c
@@ -12,7 +12,7 @@ double regula_falsi(
 {
     if (R->iterations > 0 &&
         ((M_ABS(R->error) < R->error_tol) ||
-        (M_ABS(R->last_error - R->error) < R->error_tol))) 
+        (M_ABS(R->last_error - R->error) < R->error_tol)))
     {
         if (R->mode == Any) {
             /* The tgo is now zero */
diff --git a/trick_source/sim_services/Integrator/trick_algorithms/RKF45_Integrator.cpp b/trick_source/sim_services/Integrator/trick_algorithms/RKF45_Integrator.cpp
index a6d8e467..3558204d 100644
--- a/trick_source/sim_services/Integrator/trick_algorithms/RKF45_Integrator.cpp
+++ b/trick_source/sim_services/Integrator/trick_algorithms/RKF45_Integrator.cpp
@@ -4,7 +4,7 @@
 /**
  */
 void Trick::RKF45_Integrator::initialize(int State_size, double Dt) {
-    
+
     int i;
     const int n_steps = 6;
 
diff --git a/trick_source/sim_services/Integrator/trick_algorithms/RKF78_Integrator.cpp b/trick_source/sim_services/Integrator/trick_algorithms/RKF78_Integrator.cpp
index 737bdd65..7bf13893 100644
--- a/trick_source/sim_services/Integrator/trick_algorithms/RKF78_Integrator.cpp
+++ b/trick_source/sim_services/Integrator/trick_algorithms/RKF78_Integrator.cpp
@@ -19,13 +19,13 @@ void Trick::RKF78_Integrator::initialize(int State_size, double Dt) {
     deriv = INTEG_ALLOC( double*, n_steps);
     for(i=0; i<n_steps ; i++) {
         deriv[i] = INTEG_ALLOC( double, num_state);
-    } 
+    }
 
     /** Allocate the workspace.*/
     state_ws = INTEG_ALLOC( double*, n_steps);
     for(i=0; i<n_steps ; i++) {
         state_ws[i] = INTEG_ALLOC( double, num_state);
-    } 
+    }
 }
 
 /**
diff --git a/trick_source/sim_services/Integrator/unittest/IBall.cpp b/trick_source/sim_services/Integrator/unittest/IBall.cpp
index 905b1107..20ab7b68 100644
--- a/trick_source/sim_services/Integrator/unittest/IBall.cpp
+++ b/trick_source/sim_services/Integrator/unittest/IBall.cpp
@@ -125,7 +125,7 @@ int main(int argc, const char* argv[]) {
 //          break;
         default:
             std::cerr << "Invalid test number." << std::endl;
-        } 
+        }
 
         strcpy (dataout_name, "IBall_");
         strcat (dataout_name, Algorithm_name);
@@ -136,7 +136,7 @@ int main(int argc, const char* argv[]) {
 
         if (test_number > 0) {
             gplout << ", \\" << std::endl;
-        } 
+        }
 
         gplout << "\"" << dataout_name << "\" using 3:2 title \'" << Algorithm_name << "\' with lines";
 
diff --git a/trick_source/sim_services/Integrator/unittest/IRFBall.cpp b/trick_source/sim_services/Integrator/unittest/IRFBall.cpp
index beccdfe0..66379200 100644
--- a/trick_source/sim_services/Integrator/unittest/IRFBall.cpp
+++ b/trick_source/sim_services/Integrator/unittest/IRFBall.cpp
@@ -94,14 +94,14 @@ void IBall_sim( Integrator_type Alg,
         integ(I, &ball);
 
         // Advance time.
-        tick++;        
+        tick++;
         sim_time = tick * seconds_per_tick ;
 
         // If we are looking for roots ...
         if ( doing_dynamic_events ) {
             double tgo;
 
-            // ###RF### Given the current error, estimate how far (in time) we are from a root. 
+            // ###RF### Given the current error, estimate how far (in time) we are from a root.
             rf.error = ball.pos[0];
             tgo = regula_falsi(sim_time, &rf);
 
@@ -123,10 +123,10 @@ void IBall_sim( Integrator_type Alg,
 
                     t_test += tgo;
 
-                    // ###RF### Given the current error, estimate how far (in time) we are from the root. 
+                    // ###RF### Given the current error, estimate how far (in time) we are from the root.
                     rf.error = ball.pos[0];
                     tgo = regula_falsi( t_test, &rf);
-    
+
                     // If the estimated time-to-go is less than the chosen tolerance, then we have our root.
                     if (fabs( tgo) < rf.error_tol) {
                         printf("ROOT@ %18.14g\n", t_test);
@@ -197,7 +197,7 @@ int main(int argc, const char* argv[]) {
 //          break;
         default:
             std::cerr << "Invalid test number." << std::endl;
-        } 
+        }
 
         strcpy (dataout_name, "IBall_");
         strcat (dataout_name, Algorithm_name);
@@ -208,7 +208,7 @@ int main(int argc, const char* argv[]) {
 
         if (test_number > 0) {
             gplout << ", \\" << std::endl;
-        } 
+        }
 
         gplout << "\"" << dataout_name << "\" using 3:2 title \'" << Algorithm_name << "\' with lines";
 
diff --git a/trick_source/sim_services/Integrator/unittest/ISat.cpp b/trick_source/sim_services/Integrator/unittest/ISat.cpp
index 5db5047b..c06213b9 100644
--- a/trick_source/sim_services/Integrator/unittest/ISat.cpp
+++ b/trick_source/sim_services/Integrator/unittest/ISat.cpp
@@ -65,7 +65,7 @@ void calc_gravity( SATELLITE * S,
 
 }
 
-// 
+//
 // Reference: ISS SIGI Attitude Processor Orbit Equations EG2/Rodolfo Gonzalez 20 Aug 2003
 void orb_elem_to_intl( ORBITAL_ELEMENTS * O,          /* IN  */
                        PLANET           * P,          /* IN  */
@@ -146,7 +146,7 @@ int main(int argc, const char* argv[]) {
     planet.mass   = LUNAR_MASS;
     planet.radius = LUNAR_RADIUS;
 
-    orbital_elements.semi_major_axis = 2000000; // meters 
+    orbital_elements.semi_major_axis = 2000000; // meters
     orbital_elements.eccentricity = 0.2;
     orbital_elements.inclination = 5.0 * RADIANS_PER_DEGREE;
     orbital_elements.argument_of_perigee = 0.0;
@@ -208,6 +208,6 @@ int main(int argc, const char* argv[]) {
         std::cout << "(" << satellite.pos[0] <<","<< satellite.pos[1] <<","<< satellite.pos[2] << ")" << std::endl;
 
         tick++;
-        
+
     } while (sim_time < 10.0);
 }
diff --git a/trick_source/sim_services/Integrator/unittest/rftest.c b/trick_source/sim_services/Integrator/unittest/rftest.c
index 53da5d16..7a4cd945 100644
--- a/trick_source/sim_services/Integrator/unittest/rftest.c
+++ b/trick_source/sim_services/Integrator/unittest/rftest.c
@@ -23,11 +23,11 @@ int main( int argc, char*argv[]) {
       t_test = t;
 
       rf.error = sin( t_test);
-      tgo = regula_falsi(t_test, &rf); 
+      tgo = regula_falsi(t_test, &rf);
       while ( ( (t_test + tgo) < t_next) && !root) {
-          t_test += tgo; 
+          t_test += tgo;
           rf.error = sin( t_test);
-          tgo = regula_falsi(t_test, &rf); 
+          tgo = regula_falsi(t_test, &rf);
 
           if (fabs(tgo) < rf.error_tol) {
               printf("ROOT @ %18.14g\n", t_test);
diff --git a/trick_source/sim_services/MasterSlave/MSSharedMem.cpp b/trick_source/sim_services/MasterSlave/MSSharedMem.cpp
index f68fe7af..3f9e6acb 100644
--- a/trick_source/sim_services/MasterSlave/MSSharedMem.cpp
+++ b/trick_source/sim_services/MasterSlave/MSSharedMem.cpp
@@ -23,7 +23,7 @@ Trick::MSSharedMem::~MSSharedMem() {
 int Trick::MSSharedMem::set_sync_wait_limit(double in_limit) {
     /** @par Detailed Design */
     if ( in_limit > 0.0 ) {
-        /** @li if the incoming limit time is greater than zero, we will use it 
+        /** @li if the incoming limit time is greater than zero, we will use it
                 as the timeout value during read and write */
         sync_wait_limit = in_limit ;
     } else {
@@ -60,7 +60,7 @@ int Trick::MSSharedMem::process_sim_args() {
 
 int Trick::MSSharedMem::accept() {
 
-    int ret ; 
+    int ret ;
     /** @par Detailed Design */
     /** @li Call tsm_init to create shared memory for master. */
     tsm_dev.size = sizeof(MSSharedMemData);
@@ -83,7 +83,7 @@ int Trick::MSSharedMem::accept() {
 }
 
 int Trick::MSSharedMem::connect() {
-    int ret ; 
+    int ret ;
     /** @par Detailed Design */
     /** @li Call tsm_init to create shared memory for slave. */
     if (tsm_dev.size == 0) {
@@ -125,7 +125,7 @@ long long Trick::MSSharedMem::read_time() {
     struct timespec ts_Start;
 
     /** @par Detailed Design */
-    clock_gettime(CLOCK_THREAD_CPUTIME_ID, &ts_Start);    
+    clock_gettime(CLOCK_THREAD_CPUTIME_ID, &ts_Start);
 
     /** @li Get time from shared memory */
     while (MSQ_ISEMPTY(shm_addr->master_time)) {
@@ -153,7 +153,7 @@ MS_SIM_COMMAND Trick::MSSharedMem::read_command() {
     struct timespec ts_Start;
 
     /** @par Detailed Design */
-    clock_gettime(CLOCK_THREAD_CPUTIME_ID, &ts_Start);    
+    clock_gettime(CLOCK_THREAD_CPUTIME_ID, &ts_Start);
 
     if (getpid() == shm_addr->master_pid) {
     /** @li Get slave command from shared memory */
@@ -203,7 +203,7 @@ int Trick::MSSharedMem::read_port() {
     struct timespec ts_Start;
 
     /** @par Detailed Design */
-    clock_gettime(CLOCK_THREAD_CPUTIME_ID, &ts_Start);    
+    clock_gettime(CLOCK_THREAD_CPUTIME_ID, &ts_Start);
 
     /** @li Get port number from shared memory */
     while (shm_addr->slave_port == MS_ERROR_PORT) {
@@ -228,7 +228,7 @@ char Trick::MSSharedMem::read_name(char * read_data, size_t size) {
     struct timespec ts_Start;
 
     /** @par Detailed Design */
-    clock_gettime(CLOCK_THREAD_CPUTIME_ID, &ts_Start);    
+    clock_gettime(CLOCK_THREAD_CPUTIME_ID, &ts_Start);
 
     /** @li Get name (character array) from shared memory */
     while (shm_addr->chkpnt_name[0] == MS_ERROR_NAME) {
diff --git a/trick_source/sim_services/MasterSlave/MSSocket.cpp b/trick_source/sim_services/MasterSlave/MSSocket.cpp
index 3ff57dbf..f7654b11 100644
--- a/trick_source/sim_services/MasterSlave/MSSocket.cpp
+++ b/trick_source/sim_services/MasterSlave/MSSocket.cpp
@@ -26,12 +26,12 @@ int Trick::MSSocket::set_sync_wait_limit(double in_limit) {
     /** @par Detailed Design */
     sync_wait_limit = in_limit ;
     if ( in_limit > 0.0 ) {
-        /** @li if the incoming limit time is greater than zero, set the socket 
+        /** @li if the incoming limit time is greater than zero, set the socket
                 to TC_COMM_TIMED_BLOCKIO with the time limit of in_limit */
         tc_blockio(&tc_dev, TC_COMM_TIMED_BLOCKIO);
         tc_set_blockio_timeout_limit(&tc_dev, sync_wait_limit);
     } else {
-        /** @li if the incoming limit time is less than or equal to zero, set the socket 
+        /** @li if the incoming limit time is less than or equal to zero, set the socket
                 to TC_COMM_BLOCKIO (infinite block) */
         tc_blockio(&tc_dev, TC_COMM_BLOCKIO);
     }
@@ -49,18 +49,18 @@ std::string Trick::MSSocket::add_sim_args( std::string slave_type ) {
     gethostname(master_host, (size_t) 80);
 
     /** @li if master is running with dmtcp slave or vice versa, use "_dmtcp_multiconnect_tag"
-            for sync_port_tag. on restart, dmtcp will retain original slave pid, which will not 
+            for sync_port_tag. on restart, dmtcp will retain original slave pid, which will not
             match restarted master pid. sync_port_tag must match for master and slave(s) to
             connect/reconnect via tc_multiconnect() */
 
-    if  (slave_type == "dmtcp") 
+    if  (slave_type == "dmtcp")
         temp_stream << master_host << "_dmtcp_multiconnect_tag" ;
     else
         temp_stream << master_host << "_" << getpid() ;
 
     sync_port_tag = temp_stream.str() ;
 
-    /** @li return the unique identifier with the "-p" argument that is 
+    /** @li return the unique identifier with the "-p" argument that is
             specific to master/slave communications. */
     return("-p " + temp_stream.str()) ;
 }
@@ -91,7 +91,7 @@ int Trick::MSSocket::process_sim_args() {
 
 int Trick::MSSocket::accept() {
 
-    int ret ; 
+    int ret ;
     /** @par Detailed Design */
     /** @li Call tc_multiconnect to connect this master.  Use "master" as the my_tag argument */
     ret = tc_multiconnect(&tc_dev, (char *)"master", (char *)sync_port_tag.c_str(), NULL);
@@ -100,7 +100,7 @@ int Trick::MSSocket::accept() {
 }
 
 int Trick::MSSocket::connect() {
-    int ret ; 
+    int ret ;
     /** @par Detailed Design */
     /** @li Call tc_multiconnect to connect this slave.  Use "slave" as the my_tag argument */
     ret = tc_multiconnect(&tc_dev, (char *)"slave", (char *)sync_port_tag.c_str(), NULL);
@@ -126,7 +126,7 @@ int Trick::MSSocket::disconnect() {
 long long Trick::MSSocket::read_time() {
 
     long long in_time = 0 ;
-    int ret ; 
+    int ret ;
 
     /** @par Detailed Design */
     /** @li Call tc_read to get the time */
@@ -143,7 +143,7 @@ long long Trick::MSSocket::read_time() {
 MS_SIM_COMMAND Trick::MSSocket::read_command() {
 
     MS_SIM_COMMAND command ;
-    int ret ; 
+    int ret ;
 
     /** @par Detailed Design */
     /** @li Call tc_read to get the command */
@@ -161,7 +161,7 @@ MS_SIM_COMMAND Trick::MSSocket::read_command() {
 int Trick::MSSocket::read_port() {
 
     int in_port = 0 ;
-    int ret ; 
+    int ret ;
 
     /** @par Detailed Design */
     /** @li Call tc_read to get the port number */
@@ -177,7 +177,7 @@ int Trick::MSSocket::read_port() {
 
 char Trick::MSSocket::read_name(char * read_data, size_t size) {
 
-    int ret ; 
+    int ret ;
 
     /** @par Detailed Design */
     /** @li Call tc_read to get the name (character array) */
@@ -193,7 +193,7 @@ char Trick::MSSocket::read_name(char * read_data, size_t size) {
 
 int Trick::MSSocket::write_time(long long in_time) {
 
-    int ret ; 
+    int ret ;
 
     /** @par Detailed Design */
     /** @li Call tc_write to write the time */
@@ -205,7 +205,7 @@ int Trick::MSSocket::write_time(long long in_time) {
 
 int Trick::MSSocket::write_command(MS_SIM_COMMAND command) {
 
-    int ret ; 
+    int ret ;
 
     /** @par Detailed Design */
     /** @li Call tc_write to write the command */
@@ -217,7 +217,7 @@ int Trick::MSSocket::write_command(MS_SIM_COMMAND command) {
 
 int Trick::MSSocket::write_port(int in_port) {
 
-    int ret ; 
+    int ret ;
 
     /** @par Detailed Design */
     /** @li Call tc_write to write the port number */
diff --git a/trick_source/sim_services/MasterSlave/Slave.cpp b/trick_source/sim_services/MasterSlave/Slave.cpp
index df57f58a..5e768c50 100644
--- a/trick_source/sim_services/MasterSlave/Slave.cpp
+++ b/trick_source/sim_services/MasterSlave/Slave.cpp
@@ -100,9 +100,9 @@ int Trick::Slave::init() {
         exec_set_freeze_command(int(connection->read_command())) ;
         /** @li Read and set the pre_init, post_init, and end checkpoint flags according to the master. */
         chkpnt_flag = (int)connection->read_time();
-        checkpoint_pre_init(chkpnt_flag>>2 & 0x1); 
-        checkpoint_post_init(chkpnt_flag>>1 & 0x1); 
-        checkpoint_end(chkpnt_flag & 0x1); 
+        checkpoint_pre_init(chkpnt_flag>>2 & 0x1);
+        checkpoint_post_init(chkpnt_flag>>1 & 0x1);
+        checkpoint_end(chkpnt_flag & 0x1);
 
         dlclose(dlhandle) ;
 
@@ -193,7 +193,7 @@ int Trick::Slave::end_of_frame() {
         if (reconnected) {
             slave_command = MS_ReconnectCmd;
 
-            if (msg_published) 
+            if (msg_published)
                 reconnected = false;
             else
                 sent_reconnect_cmd = true;
@@ -211,7 +211,7 @@ int Trick::Slave::end_of_frame() {
                 /** @li if reading the master time returned an error exit the sim if sync_error_terminate == true */
                 message_publish(MSG_ERROR , "Slave lost sync with master. sync_error_terminate is true: Slave is terminating.\n") ;
                 exec_terminate_with_return(-1, __FILE__, __LINE__ , "Slave lost sync with master") ;
-            } 
+            }
             else {
                 if (slave_command != MS_FreezeCmd){
                     /** @li if reading the master time returned an error freeze the sim if sync_error_terminate == false */
@@ -234,7 +234,7 @@ int Trick::Slave::end_of_frame() {
                     /** @li if reading the master mode command returned an error exit the sim if sync_error_terminate == true */
                     message_publish(MSG_ERROR , "Slave lost sync with master. sync_error_terminate is true: Slave is terminating.\n") ;
                     exec_terminate_with_return(-1, __FILE__, __LINE__ , "Slave lost sync with master") ;
-                } 
+                }
                 else {
                     if (slave_command != MS_FreezeCmd) {
                         /** @li if reading the master mode command returned an error freeze the sim if sync_error_terminate == false */
@@ -292,7 +292,7 @@ fprintf(stderr, "SLAVE GOT ACK %d\n", command);
                 exec_set_exec_command((SIM_COMMAND)command) ;
                 if (reconnected) {
                     message_publish(MSG_INFO , "Slave has reconnected to master.\n") ;
-                    if (sent_reconnect_cmd) 
+                    if (sent_reconnect_cmd)
                         reconnected = false;
                     else
                         msg_published = true;
diff --git a/trick_source/sim_services/MemoryManager/MemoryManager.cpp b/trick_source/sim_services/MemoryManager/MemoryManager.cpp
index dec217a7..0ff7f4cc 100644
--- a/trick_source/sim_services/MemoryManager/MemoryManager.cpp
+++ b/trick_source/sim_services/MemoryManager/MemoryManager.cpp
@@ -64,7 +64,7 @@ Trick::MemoryManager::MemoryManager()
     primitive_types.insert(std::string("uint32_t")) ;
     primitive_types.insert(std::string("int64_t")) ;
     primitive_types.insert(std::string("uint64_t")) ;
-    
+
     trick_MM = this;
     return ;
 }
diff --git a/trick_source/sim_services/MemoryManager/MemoryManager_C_Intf.cpp b/trick_source/sim_services/MemoryManager/MemoryManager_C_Intf.cpp
index 7a76921d..c64a7577 100644
--- a/trick_source/sim_services/MemoryManager/MemoryManager_C_Intf.cpp
+++ b/trick_source/sim_services/MemoryManager/MemoryManager_C_Intf.cpp
@@ -13,8 +13,8 @@ extern Trick::MemoryManager* trick_MM;
  */
 extern "C" void* TMM_declare_var( TRICK_TYPE type, const char*class_name, int n_stars, const char* var_name, int n_cdims, int *cdims) {
     if (trick_MM != NULL) {
-        std::string sclass_name = class_name; 
-        std::string svar_name = var_name; 
+        std::string sclass_name = class_name;
+        std::string svar_name = var_name;
         return ( trick_MM->declare_var( type, sclass_name, n_stars, svar_name, n_cdims, cdims));
     } else {
         Trick::MemoryManager::emitError("TMM_declare_var() called before MemoryManager instantiation. Returning NULL.") ;
@@ -87,8 +87,8 @@ extern "C" void* TMM_declare_operatornew_var( const char * class_name, unsigned
  */
 extern "C" void* TMM_declare_ext_var( void* addr, TRICK_TYPE type, const char*class_name, int n_stars, const char* var_name, int n_cdims, int *cdims) {
     if (trick_MM != NULL) {
-        std::string sclass_name = class_name; 
-        std::string svar_name = var_name; 
+        std::string sclass_name = class_name;
+        std::string svar_name = var_name;
         return ( trick_MM->declare_extern_var( addr, type, sclass_name, n_stars, svar_name, n_cdims, cdims));
     } else {
         Trick::MemoryManager::emitError("TMM_declare_ext_var() called before MemoryManager instantiation. Returning NULL.\n") ;
@@ -129,7 +129,7 @@ extern "C" void* TMM_declare_ext_var_s( void* addr, const char* declaration) {
  This is the C Language, "identify the array by address", version of Trick::MemoryManager::resize_array.
  Resize each of the dimensions of the array at the given address. n_cdims specifies the number
  of dimensions and must match those of the array being resized. cdims specifies the new sizes
- for each of the dimensions.  
+ for each of the dimensions.
  */
 void* TMM_resize_array_a(void *address, int n_cdims, int *cdims){
     if (trick_MM != NULL) {
@@ -145,7 +145,7 @@ void* TMM_resize_array_a(void *address, int n_cdims, int *cdims){
  This is the C Language, "identify the array by name", version of Trick::MemoryManager::resize_array.
  Resize each of the dimensions of the array whose name is given. n_cdims specifies the number
  of dimensions and must match those of the array being resized. cdims specifies the new sizes
- for each of the dimensions.  
+ for each of the dimensions.
  */
 void* TMM_resize_array_n(const char *name, int n_cdims, int *cdims){
     if (trick_MM != NULL) {
@@ -416,7 +416,7 @@ extern "C" int TMM_add_shared_library_symbols(const char* filename) {
  */
 extern "C" void* add_var( TRICK_TYPE type, const char* stype, VAR_DECLARE* var_declare, char* units) {
     if (trick_MM != NULL) {
-        return( trick_MM->add_var(type, stype, var_declare, units )); 
+        return( trick_MM->add_var(type, stype, var_declare, units ));
     } else {
         Trick::MemoryManager::emitError("add_var() called before MemoryManager instantiation. Returning NULL.\n") ;
         return ((void*)NULL);
@@ -442,13 +442,13 @@ extern "C" int add_vars( TRICK_TYPE type, const char* stype, VAR_LIST* var_list,
  */
 extern "C" int ref_allocate(REF2 *R, int num) {
     if (trick_MM != NULL) {
-        return( trick_MM->ref_allocate( R, num)); 
+        return( trick_MM->ref_allocate( R, num));
     } else {
         Trick::MemoryManager::emitError("ref_allocate() called before MemoryManager instantiation.\n") ;
         return (1);
     }
 }
- 
+
 /**
  @relates Trick::MemoryManager
  This is the C Language version of Trick::MemoryManager::ref_attributes( name).
@@ -481,7 +481,7 @@ extern "C" int ref_assignment(REF2* R, V_TREE* V) {
  */
 extern "C" int ref_var(REF2 *R, char* name) {
     if (trick_MM != NULL) {
-        return( trick_MM->ref_var( R, name)); 
+        return( trick_MM->ref_var( R, name));
     } else {
         Trick::MemoryManager::emitError("ref_var() called before MemoryManager instantiation.\n") ;
         return (1);
@@ -494,7 +494,7 @@ extern "C" int ref_var(REF2 *R, char* name) {
  */
 extern "C" int get_size(void *addr) {
     if (trick_MM != NULL) {
-        return( trick_MM->get_size( addr)); 
+        return( trick_MM->get_size( addr));
     } else {
         Trick::MemoryManager::emitError("get_size() called before MemoryManager instantiation.\n") ;
         return (0);
@@ -507,7 +507,7 @@ extern "C" int get_size(void *addr) {
  */
 extern "C" int get_truncated_size(void *addr) {
     if (trick_MM != NULL) {
-        return( trick_MM->get_truncated_size( addr)); 
+        return( trick_MM->get_truncated_size( addr));
     } else {
         Trick::MemoryManager::emitError("get_truncated_size() called before MemoryManager instantiation.\n") ;
         return (0);
@@ -524,7 +524,7 @@ extern "C" int io_get_fixed_truncated_size(char *ptr __attribute__ ((unused)),
                                            int dims __attribute__ ((unused)),
                                            ATTRIBUTES * left_type __attribute__ ((unused))) {
     Trick::MemoryManager::emitError("io_get_fixed_truncated_size() is not implemented yet.\n") ;
-    return(0); 
+    return(0);
 }
 
 /**
diff --git a/trick_source/sim_services/MemoryManager/MemoryManager_add_attr_info.cpp b/trick_source/sim_services/MemoryManager/MemoryManager_add_attr_info.cpp
index a85e66f5..bd7e91f7 100644
--- a/trick_source/sim_services/MemoryManager/MemoryManager_add_attr_info.cpp
+++ b/trick_source/sim_services/MemoryManager/MemoryManager_add_attr_info.cpp
@@ -29,7 +29,7 @@ int Trick::MemoryManager::add_attr_info( const std::string & user_type_string ,
     unsigned int ii ;
     std::set<std::string>::iterator it ;
     std::map<std::string,std::string>::iterator mit;
-    
+
     /** @par Design Details: */
 
     user_type_name = user_type_string ;
@@ -102,7 +102,7 @@ int Trick::MemoryManager::add_attr_info( const std::string & user_type_string ,
 
         if ( init_sub_attr != NULL ) {     // If the initialization function was found,
             (*init_sub_attr)() ;           // then call it.
-        } else {  
+        } else {
             std::stringstream message;
             message << " ATTRIBUTES init routine for type \""
                     << user_type_name.c_str() << "\" not found.";
@@ -112,12 +112,12 @@ int Trick::MemoryManager::add_attr_info( const std::string & user_type_string ,
 
     } else { // The named user type isn't a structure type. Maybe it's an enumeration type.
 
-        // Check to see whether the user type name is in the enumeration_map. 
+        // Check to see whether the user type name is in the enumeration_map.
         ENUMERATION_MAP::iterator curr_pos = enumeration_map.find( user_type_name);
 
         // If it's not in the enumeration map then
         if (curr_pos == enumeration_map.end()) {
-            
+
             // Construct the name of the enumeration attributes.
             enum_attr_name = "enum" + user_type_name ;
 
@@ -143,7 +143,7 @@ int Trick::MemoryManager::add_attr_info( const std::string & user_type_string ,
             enum_attr = curr_pos->second;
         }
 
-        // Set the type information in the ATTRIBUTES structure that we are populating.      
+        // Set the type information in the ATTRIBUTES structure that we are populating.
         attr->type = TRICK_ENUMERATED ;
         attr->attr = enum_attr;
     }
diff --git a/trick_source/sim_services/MemoryManager/MemoryManager_alloc_depends.cpp b/trick_source/sim_services/MemoryManager/MemoryManager_alloc_depends.cpp
index 5a4d9509..f53c7769 100644
--- a/trick_source/sim_services/MemoryManager/MemoryManager_alloc_depends.cpp
+++ b/trick_source/sim_services/MemoryManager/MemoryManager_alloc_depends.cpp
@@ -15,7 +15,7 @@ void Trick::MemoryManager::get_alloc_deps_in_allocation(ALLOC_INFO* alloc_info )
 
     if (alloc_info == NULL) {
         std::cout << "ERROR: Trick::MemoryManager::get_alloc_deps_in_allocation called with alloc_info == NULL." << std::endl;
-        std::cout.flush();  
+        std::cout.flush();
         return;
     }
 
@@ -167,13 +167,13 @@ void Trick::MemoryManager::get_alloc_deps_in_arrayed_class(
             } else {
                 if (debug_level) {
                     std::cout << __FUNCTION__ << ": Pointer ("<< (void*)pointer <<") refers to memory that the MemoryManager doesn't know about." << std::endl;
-                    std::cout.flush();  
+                    std::cout.flush();
                 }
             }
         } else {
             if (debug_level) {
                 std::cout << __FUNCTION__ << ": Allocation reference is NULL." << std::endl;
-                std::cout.flush();  
+                std::cout.flush();
             }
         }
 
@@ -214,18 +214,18 @@ void Trick::MemoryManager::get_alloc_deps_in_intrinsic( void* address, ATTRIBUTE
                 if (alloc_info != NULL) {
                     if (debug_level) {
                         std::cout << __FUNCTION__ <<  ": @" << (void*)address << "." << attr->name << "[" << offset << "] points to @" << (void*)pointer << std::endl;
-                    } 
+                    }
                     get_alloc_deps_in_allocation(alloc_info);
                 } else {
                     if (debug_level) {
                         std::cout << __FUNCTION__ <<  ": Pointer ("<< (void*)pointer <<") refers to memory that the MemoryManager doesn't know about." << std::endl;
-                        std::cout.flush();  
-                    } 
+                        std::cout.flush();
+                    }
                 }
             } else {
                 if (debug_level) {
                     std::cout << __FUNCTION__ <<  ": Allocation reference is NULL." << std::endl;
-                    std::cout.flush();  
+                    std::cout.flush();
                 }
             }
 
diff --git a/trick_source/sim_services/MemoryManager/MemoryManager_clear_memory.cpp b/trick_source/sim_services/MemoryManager/MemoryManager_clear_memory.cpp
index 460d42d2..a71e1ffa 100644
--- a/trick_source/sim_services/MemoryManager/MemoryManager_clear_memory.cpp
+++ b/trick_source/sim_services/MemoryManager/MemoryManager_clear_memory.cpp
@@ -7,7 +7,7 @@ void Trick::MemoryManager::clear_rvalue( void* base_address, ATTRIBUTES* attr, i
     char* final_address;
     int remaining_dimensions = attr->num_index - curr_dim;
 
-    /** @par Detailed Description: */ 
+    /** @par Detailed Description: */
 
     /** @par
         If we're referencing a singleton then calculate the address
@@ -116,27 +116,27 @@ void Trick::MemoryManager::clear_rvalue( void* base_address, ATTRIBUTES* attr, i
 
        extent = attr->index[curr_dim].size ;
 
-       /**  @par 
+       /**  @par
             If the array is unconstrained (i.e., it's a pointer) then we just need to check
             whether the pointer is NULL.
         */
-       if ( extent == 0) { 
+       if ( extent == 0) {
            final_address = (char*)base_address;
            *(void**)final_address = NULL;
 
-       /** @par 
+       /** @par
            If the array (at this dimension) is constrained (i.e., it's a fixed array )
            then it is nil if and only if each of it's sub-elements (at the next dimension,
            which can themselves be arrays) are nil. So, for each of the elements in current
            dimension, we recursively call is_nil_valued() on each of the sub-elements to
            find out whether this array is nil valued and return the result.
-           */ 
+           */
        } else {
            int ii;
 
            for (ii=0; ii < extent; ii++) {
-               clear_rvalue( base_address, attr, curr_dim + 1, offset * extent + ii); 
-           } 
+               clear_rvalue( base_address, attr, curr_dim + 1, offset * extent + ii);
+           }
        }
 
     } else {
@@ -156,7 +156,7 @@ void Trick::MemoryManager::clear_class( char *address, ATTRIBUTES * A) {
      */
 
     for (jj = 0; A[jj].name[0] != '\0'; jj++) {
-        /* 
+        /*
          * For all the parameters in this data structure...
          */
 
@@ -181,7 +181,7 @@ void Trick::MemoryManager::clear_class( char *address, ATTRIBUTES * A) {
                     if ( A[jj].attr != NULL ) {
                         clear_class( element_addr, (ATTRIBUTES*)(A[jj].attr));
                     }
-                } 
+                }
             } else {
                 clear_rvalue( element_addr, &(A[jj]), 0, 0);
             }
@@ -230,7 +230,7 @@ void Trick::MemoryManager::clear_var( void* address) {
     if (alloc_info != NULL) {
         reference_attr = make_reference_attr( alloc_info);
         if (alloc_info->type == TRICK_STRUCTURED ) {
-            if (alloc_info->num_index != 0) { 
+            if (alloc_info->num_index != 0) {
                 clear_arrayed_class( (char*)(alloc_info->start), reference_attr, 0, 0) ;
             } else {
                 clear_class( (char*)(alloc_info->start), alloc_info->attr) ;
@@ -253,7 +253,7 @@ void Trick::MemoryManager::clear_var( const char* name) {
 
     VARIABLE_MAP::iterator pos;
     ALLOC_INFO *alloc_info;
-    
+
     pthread_mutex_lock(&mm_mutex);
     pos = variable_map.find( name);
 
@@ -264,7 +264,7 @@ void Trick::MemoryManager::clear_var( const char* name) {
         clear_var( alloc_info->start);
     } else {
         std::stringstream message;
-        message << "Can't clear variable \"" << name 
+        message << "Can't clear variable \"" << name
                 << "\" because it doesn't exist.";
         emitError(message.str());
     }
@@ -308,7 +308,7 @@ void Trick::MemoryManager::reset_memory() {
     n_addrs = deletion_list.size();
     for (ii = 0 ; ii < n_addrs ; ii ++) {
         delete_var( deletion_list[ii], false);
-    } 
+    }
 
     // reset counter to 100mil.  This (hopefully) ensures all alloc'ed ids are after external variables.
     alloc_info_map_counter = 100000000 ;
diff --git a/trick_source/sim_services/MemoryManager/MemoryManager_declare_var.cpp b/trick_source/sim_services/MemoryManager/MemoryManager_declare_var.cpp
index 272811e7..7efc319a 100644
--- a/trick_source/sim_services/MemoryManager/MemoryManager_declare_var.cpp
+++ b/trick_source/sim_services/MemoryManager/MemoryManager_declare_var.cpp
@@ -35,7 +35,7 @@
  \code FOO::BAR (*A)[3][4] = (FOO::BAR(*)[3][4])trick_MM->declare_var("FOO::BAR my_array[3][4]"); \endcode
  */
 
-// PUBLIC MEMBER FUNCTION: void* Trick::MemoryManager::declare_var(TRICK_TYPE type,std::string user_type_name, int n_stars, std::string var_name, int n_cdims, int *cdims); 
+// PUBLIC MEMBER FUNCTION: void* Trick::MemoryManager::declare_var(TRICK_TYPE type,std::string user_type_name, int n_stars, std::string var_name, int n_cdims, int *cdims);
 void* Trick::MemoryManager::declare_var( TRICK_TYPE type,
                                         std::string user_type_name,
                                         int n_stars,
diff --git a/trick_source/sim_services/MemoryManager/MemoryManager_get_size.cpp b/trick_source/sim_services/MemoryManager/MemoryManager_get_size.cpp
index 8b853f26..015cae1d 100644
--- a/trick_source/sim_services/MemoryManager/MemoryManager_get_size.cpp
+++ b/trick_source/sim_services/MemoryManager/MemoryManager_get_size.cpp
@@ -53,7 +53,7 @@ int Trick::MemoryManager::get_truncated_size(void *addr) {
 int Trick::MemoryManager::io_get_fixed_truncated_size(char *ptr, ATTRIBUTES * A, char *str, int dims, ATTRIBUTES * left_type)
 {
 
-#if 1 
+#if 1
     int i = 0, j;
     long offset;
     int my_index[9];
diff --git a/trick_source/sim_services/MemoryManager/MemoryManager_io_src_intf.cpp b/trick_source/sim_services/MemoryManager/MemoryManager_io_src_intf.cpp
index 05b451fc..715cfb49 100644
--- a/trick_source/sim_services/MemoryManager/MemoryManager_io_src_intf.cpp
+++ b/trick_source/sim_services/MemoryManager/MemoryManager_io_src_intf.cpp
@@ -35,7 +35,7 @@ void* Trick::MemoryManager::io_src_allocate_class(const char* class_name, int nu
 
     for (ii = 0; ii < strlen(alloc_fn_name); ii++) {
         if ( alloc_fn_name[ii] == ':') {
-            alloc_fn_name[ii] = '_'; 
+            alloc_fn_name[ii] = '_';
         }
     }
 
@@ -124,12 +124,12 @@ void Trick::MemoryManager::io_src_delete_class(ALLOC_INFO * alloc_info) {
     }
 }
 
-// MEMBER FUNCTION: size_t Trick::MemoryManager::io_src_sizeof_user_type( const char* user_type_name); 
+// MEMBER FUNCTION: size_t Trick::MemoryManager::io_src_sizeof_user_type( const char* user_type_name);
 /**
  * There should be a function whose name is of the form:
  *      io_src_sizeof_<user_type>
  * linked into the simulation executable. We need to find
- * it and call it. 
+ * it and call it.
  */
 size_t Trick::MemoryManager::io_src_sizeof_user_type( const char* user_type_name) {
 
diff --git a/trick_source/sim_services/MemoryManager/MemoryManager_is_alloced.cpp b/trick_source/sim_services/MemoryManager/MemoryManager_is_alloced.cpp
index 0f822a73..d940fc84 100644
--- a/trick_source/sim_services/MemoryManager/MemoryManager_is_alloced.cpp
+++ b/trick_source/sim_services/MemoryManager/MemoryManager_is_alloced.cpp
@@ -23,7 +23,7 @@ int Trick::MemoryManager::var_exists( std::string var_name) {
     if (variable_pos != variable_map.end()) {
         pthread_mutex_unlock(&mm_mutex);
         return (1);
-    } 
+    }
     pthread_mutex_unlock(&mm_mutex);
     return (0);
 }
diff --git a/trick_source/sim_services/MemoryManager/MemoryManager_map_external_object.cpp b/trick_source/sim_services/MemoryManager/MemoryManager_map_external_object.cpp
index 506bc3e0..3737547a 100644
--- a/trick_source/sim_services/MemoryManager/MemoryManager_map_external_object.cpp
+++ b/trick_source/sim_services/MemoryManager/MemoryManager_map_external_object.cpp
@@ -64,7 +64,7 @@ void* Trick::MemoryManager::
     }
     if (n_elems == 0) {
         std::stringstream message;
-        message << "declare_extern_var() can't register \"" << var_name 
+        message << "declare_extern_var() can't register \"" << var_name
                 << "\" because one or more of its constrained dimensions "
                 << "is zero, thus making its total size zero.";
         emitError(message.str());
@@ -204,7 +204,7 @@ void* Trick::MemoryManager::
     void* res_address = NULL;
     int cdims[8];
     int n_cdims;
- 
+
     ADefParseContext* context = NULL;
     std::stringstream alloc_decl_sstream;
 
diff --git a/trick_source/sim_services/MemoryManager/MemoryManager_realloc.cpp b/trick_source/sim_services/MemoryManager/MemoryManager_realloc.cpp
index 76abcf07..72824eae 100644
--- a/trick_source/sim_services/MemoryManager/MemoryManager_realloc.cpp
+++ b/trick_source/sim_services/MemoryManager/MemoryManager_realloc.cpp
@@ -88,7 +88,7 @@ void* Trick::MemoryManager::resize_array( void *address, int n_cdims, int *cdims
 
     /** @li Determine the number of constrained dimensions in the existing allocation.*/
     pre_n_cdims = 0;
-    for (ii=0 ; ii<alloc_info->num_index ; ii++) { 
+    for (ii=0 ; ii<alloc_info->num_index ; ii++) {
        if (alloc_info->index[ii]!=0) {
            pre_n_cdims++;
        }
@@ -113,7 +113,7 @@ void* Trick::MemoryManager::resize_array( void *address, int n_cdims, int *cdims
             emitError(message.str());
         }
         return ( (void*)NULL);
-    } 
+    }
 
     /** @li Calculate the new number of elements to be allocated. */
     new_n_elems = 1;
@@ -137,7 +137,7 @@ void* Trick::MemoryManager::resize_array( void *address, int n_cdims, int *cdims
             emitError(message.str());
             pthread_mutex_unlock(&mm_mutex);
             return ((void*)NULL);
-        }  
+        }
     } else if ((alloc_info->type == TRICK_STRING) && (n_stars == 0 ) ) {
         new_address = new (std::nothrow) std::string[new_n_elems];
         if (new_address == NULL) {
diff --git a/trick_source/sim_services/MemoryManager/MemoryManager_ref_allocate.cpp b/trick_source/sim_services/MemoryManager/MemoryManager_ref_allocate.cpp
index b941b909..91e55980 100644
--- a/trick_source/sim_services/MemoryManager/MemoryManager_ref_allocate.cpp
+++ b/trick_source/sim_services/MemoryManager/MemoryManager_ref_allocate.cpp
@@ -40,7 +40,7 @@ int Trick::MemoryManager::ref_allocate(REF2 * R , int num ) {
         // FIXME: Is this correct? Or is this an old Bogus kludge?
         *((char **)R->address) = (char*)resize_array( *((char **) R->address), num);
     }
-    
+
     /** @li Return the error status.*/
     return (0);
 
diff --git a/trick_source/sim_services/MemoryManager/MemoryManager_ref_assignment.cpp b/trick_source/sim_services/MemoryManager/MemoryManager_ref_assignment.cpp
index d742588c..3e19d7a8 100644
--- a/trick_source/sim_services/MemoryManager/MemoryManager_ref_assignment.cpp
+++ b/trick_source/sim_services/MemoryManager/MemoryManager_ref_assignment.cpp
@@ -96,7 +96,7 @@ int Trick::MemoryManager::assign_recursive(void* base_addr, ATTRIBUTES* attr, in
                    std::cout.flush();
                }
                break;
-           case TRICK_ENUMERATED : 
+           case TRICK_ENUMERATED :
                if (v_tree && v_tree->v_data) {
                    if ((size_t)attr->size == sizeof(int)) {
                        assign_addr = (char*)base_addr + offset * sizeof(int);
@@ -127,7 +127,7 @@ int Trick::MemoryManager::assign_recursive(void* base_addr, ATTRIBUTES* attr, in
            case TRICK_UNSIGNED_LONG :
                assign_addr = (char*)base_addr + offset * sizeof(long);
                if (v_tree && v_tree->v_data) {
-                   long input_value; 
+                   long input_value;
                    input_value = vval_long(v_tree->v_data);
                    if (cf == NULL) {
                        *(long *)assign_addr = input_value;
@@ -197,7 +197,7 @@ int Trick::MemoryManager::assign_recursive(void* base_addr, ATTRIBUTES* attr, in
                break;
            case TRICK_BITFIELD :
            case TRICK_UNSIGNED_BITFIELD : {
-                   int input_value; 
+                   int input_value;
                    assign_addr = (char*)base_addr + offset * (size_t)attr->size;
                    if (v_tree && v_tree->v_data) {
                        input_value = vval_int(v_tree->v_data);
@@ -273,7 +273,7 @@ int Trick::MemoryManager::assign_recursive(void* base_addr, ATTRIBUTES* attr, in
 
            if (v_tree && v_tree->v_data) {
 
-               if ((remaining_dimensions == 1) && (v_tree->v_data->type == TRICK_STRING)) { 
+               if ((remaining_dimensions == 1) && (v_tree->v_data->type == TRICK_STRING)) {
                    *(char**)assign_addr = mm_strdup( vval_string(v_tree->v_data));
                } else {
                    *(void**)assign_addr = vval_voidp(v_tree->v_data);
@@ -314,12 +314,12 @@ int Trick::MemoryManager::assign_recursive(void* base_addr, ATTRIBUTES* attr, in
                }
 
            } else if ( (attr->type == TRICK_WCHAR) &&
-                       (remaining_dimensions == 1)) { 
+                       (remaining_dimensions == 1)) {
 
                assign_addr = (char*)base_addr + offset * size_of_curr_dim * sizeof(wchar_t);
 
                if ((v_tree) &&
-                   (v_tree->v_data->type == TRICK_WSTRING) &&  
+                   (v_tree->v_data->type == TRICK_WSTRING) &&
                    (v_tree->v_data->value.wcp != NULL)) {
 
                        int rhs_len = (int)wcslen(v_tree->v_data->value.wcp) + 1;
@@ -333,7 +333,7 @@ int Trick::MemoryManager::assign_recursive(void* base_addr, ATTRIBUTES* attr, in
                            return (1);
                        }
                } else if ((v_tree) &&
-                          (v_tree->v_data->type == TRICK_STRING) && 
+                          (v_tree->v_data->type == TRICK_STRING) &&
                           (v_tree->v_data->value.cp != NULL)) {
 
                        int rhs_len = (int)ncs_to_wcs_len(v_tree->v_data->value.cp) + 1;
diff --git a/trick_source/sim_services/MemoryManager/MemoryManager_ref_name.cpp b/trick_source/sim_services/MemoryManager/MemoryManager_ref_name.cpp
index a56a96f7..5c5464ea 100644
--- a/trick_source/sim_services/MemoryManager/MemoryManager_ref_name.cpp
+++ b/trick_source/sim_services/MemoryManager/MemoryManager_ref_name.cpp
@@ -1,4 +1,4 @@
-/* 
+/*
    PURPOSE: (Construct a parse tree representation of a parameter reference name from the input file.)
 
    PROGRAMMERS: (((Robert W. Bailey) (LinCom) (7/95) (CR#600) (--)) ((Robert W. Bailey) (LinCom Corp) (Feb 1991) (v1.0)
@@ -12,7 +12,7 @@
 #include "trick/reference.h"
 #include "trick/parameter_types.h"
 #include "trick/mm_error.h"
-#include <stdlib.h> 
+#include <stdlib.h>
 
 //FIXME TODO make a error file
 /////// MM_NO_ERROR 0
@@ -76,7 +76,7 @@ int Trick::MemoryManager::ref_name(REF2 * R, char *name) {
         }
     } else {
         addr = (char *)R->address + attr->offset;
-        if ( R->create_add_path ) { 
+        if ( R->create_add_path ) {
             ADDRESS_NODE * address_node ;
 
             if ( attr->offset != 0 ) {
diff --git a/trick_source/sim_services/MemoryManager/MemoryManager_ref_var.cpp b/trick_source/sim_services/MemoryManager/MemoryManager_ref_var.cpp
index dde97fdc..b4ab5944 100644
--- a/trick_source/sim_services/MemoryManager/MemoryManager_ref_var.cpp
+++ b/trick_source/sim_services/MemoryManager/MemoryManager_ref_var.cpp
@@ -30,7 +30,7 @@ int Trick::MemoryManager::ref_var( REF2* R,
         pthread_mutex_unlock(&mm_mutex);
         return (MM_OK);
     } else {
-        // ERROR. 
+        // ERROR.
     }
     pthread_mutex_unlock(&mm_mutex);
 
diff --git a/trick_source/sim_services/MemoryManager/MemoryManager_restore.cpp b/trick_source/sim_services/MemoryManager/MemoryManager_restore.cpp
index 2925d7eb..3f0083c7 100644
--- a/trick_source/sim_services/MemoryManager/MemoryManager_restore.cpp
+++ b/trick_source/sim_services/MemoryManager/MemoryManager_restore.cpp
@@ -73,7 +73,7 @@ int Trick::MemoryManager::read_checkpoint(const char* filename ) {
 
 int Trick::MemoryManager::read_checkpoint_from_string(const char* s ) {
 
-    // Create a stream from the string argument. 
+    // Create a stream from the string argument.
     std::stringstream ss;
 
     if ( s!= NULL) {
@@ -84,7 +84,7 @@ int Trick::MemoryManager::read_checkpoint_from_string(const char* s ) {
              */
             ss << ";" ;
         }
-        return ( read_checkpoint( &ss )); 
+        return ( read_checkpoint( &ss ));
     } else {
         emitError("Checkpoint string is NULL.") ;
     }
diff --git a/trick_source/sim_services/MemoryManager/MemoryManager_strdup.cpp b/trick_source/sim_services/MemoryManager/MemoryManager_strdup.cpp
index a6c0437f..fae4cd16 100644
--- a/trick_source/sim_services/MemoryManager/MemoryManager_strdup.cpp
+++ b/trick_source/sim_services/MemoryManager/MemoryManager_strdup.cpp
@@ -10,7 +10,7 @@ char* Trick::MemoryManager::mm_strdup( const char* s) {
 
     /** @par Design: */
     /** @li Allocate sufficient space for the duplicate character string. */
-    extent = (int)strlen(s)+1; 
+    extent = (int)strlen(s)+1;
 
     /** @li Allocate the duplicate character string */
     allocation = (char*)declare_var(TRICK_CHARACTER, "", 0, "", 1, &extent);
diff --git a/trick_source/sim_services/MemoryManager/RefParseContext.cpp b/trick_source/sim_services/MemoryManager/RefParseContext.cpp
index b2a10840..df5362a9 100644
--- a/trick_source/sim_services/MemoryManager/RefParseContext.cpp
+++ b/trick_source/sim_services/MemoryManager/RefParseContext.cpp
@@ -2,8 +2,8 @@
 #include <stdlib.h>
 #include "trick/RefParseContext.hh"
 
-/** 
- Constructor 
+/**
+ Constructor
  */ RefParseContext::RefParseContext( Trick::MemoryManager *in_mem_mgr, std::istream* in_is = &std::cin ) {
 
    // Set verif input and echo input flags.
@@ -18,8 +18,8 @@
 
 }
 
-/** 
- Destructor 
+/**
+ Destructor
  */
 RefParseContext::~RefParseContext() {
     destroy_scanner();
diff --git a/trick_source/sim_services/MemoryManager/extract_bitfield.c b/trick_source/sim_services/MemoryManager/extract_bitfield.c
index 242877b2..19179642 100644
--- a/trick_source/sim_services/MemoryManager/extract_bitfield.c
+++ b/trick_source/sim_services/MemoryManager/extract_bitfield.c
@@ -28,23 +28,23 @@ int extract_bitfield_any(int value,     /* In: Value to extract bits from */
 
     if (un.c[sizeof(long) - 1] == 1) {
 
-        /* 
-         * Big endian 
+        /*
+         * Big endian
          */
 
         mask = 0x00000001 << (start + bits - 1);
 
         if (mask & value) {
 
-            /* 
-             * This is a negative value 
+            /*
+             * This is a negative value
              */
 
             for (i = start, j = 0; j < bits; i++, j++) {
-                /* 
-                 * First, turn off all bits associated with 
+                /*
+                 * First, turn off all bits associated with
                  * this bit field within the unsigned integer.
-                 * Then assign the input value to the 
+                 * Then assign the input value to the
                  * appropriate bits in the unsigned integer.
                  */
                 mask = 0x00000001 << i;
@@ -55,15 +55,15 @@ int extract_bitfield_any(int value,     /* In: Value to extract bits from */
             sbf = -((sbf >> start) + 1);
         } else {
 
-            /* 
-             * This is a positive value 
+            /*
+             * This is a positive value
              */
 
             for (i = start, j = 0; j < bits; i++, j++) {
-                /* 
-                 * First, turn off all bits associated with 
+                /*
+                 * First, turn off all bits associated with
                  * this bit field within the unsigned integer.
-                 * Then assign the input value to the appropriate 
+                 * Then assign the input value to the appropriate
                  * bits in the unsigned integer.
                  */
                 mask = 0x00000001 << i;
@@ -75,11 +75,11 @@ int extract_bitfield_any(int value,     /* In: Value to extract bits from */
         }
     } else {
 
-        /* 
-         * Little endian 
+        /*
+         * Little endian
          */
 
-        /* 
+        /*
          * Shift the bit field contents of the current value
          * to the lsb of the underlying int.
          */
diff --git a/trick_source/sim_services/MemoryManager/extract_unsigned_bitfield.c b/trick_source/sim_services/MemoryManager/extract_unsigned_bitfield.c
index 4aaa9900..21ac2938 100644
--- a/trick_source/sim_services/MemoryManager/extract_unsigned_bitfield.c
+++ b/trick_source/sim_services/MemoryManager/extract_unsigned_bitfield.c
@@ -27,8 +27,8 @@ unsigned int extract_unsigned_bitfield_any(unsigned int value,  /* In: Value to
 
     if (un.c[sizeof(long) - 1] == 1) {
 
-        /* 
-         * Big endian 
+        /*
+         * Big endian
          */
 
         mask = 0x00000001 << (start + bits - 1);
@@ -44,8 +44,8 @@ unsigned int extract_unsigned_bitfield_any(unsigned int value,  /* In: Value to
         bf = bf >> start;
     } else {
 
-        /* 
-         * Little endian 
+        /*
+         * Little endian
          */
 
         /* Shift the bit field contents of the current value to the lsb of the underlying int. */
diff --git a/trick_source/sim_services/MemoryManager/insert_bitfield.c b/trick_source/sim_services/MemoryManager/insert_bitfield.c
index 06b8cba4..f9ca7ce9 100644
--- a/trick_source/sim_services/MemoryManager/insert_bitfield.c
+++ b/trick_source/sim_services/MemoryManager/insert_bitfield.c
@@ -27,37 +27,37 @@ unsigned int insert_bitfield_any(unsigned int bitfield, /* In: Bitfiled to inser
     /* Mask out sign extension bits in case the value is negative */
     value &= (0xFFFFFFFF >> (32 - bits));
 
-    /* 
+    /*
      * Create a mask for the purpose of clearing the previous value of
-     * the bit field parameter for which an input was received, while 
-     * preserving the other values in the underlying memory location 
+     * the bit field parameter for which an input was received, while
+     * preserving the other values in the underlying memory location
      * shared by other bit field parameters.  Do a bitwise AND of this
      * mask with the underlying bit field memory location.  The input
      * value has been copied into an unsigned int.  Shift the bits of
      * that unsigned int the appropriate number of bits so that the bit
-     * position of the input value withing the unsigned int maps to the 
-     * bit position at which it needs to be stored in the underlying bit 
-     * field memory location. Do a bitwise OR of the shifted value with 
-     * the underlying bit field memory location, thus replacing the 
-     * previous value of the input bit field parameter with the input 
-     * value while preserving the values of other bit field parameters 
+     * position of the input value withing the unsigned int maps to the
+     * bit position at which it needs to be stored in the underlying bit
+     * field memory location. Do a bitwise OR of the shifted value with
+     * the underlying bit field memory location, thus replacing the
+     * previous value of the input bit field parameter with the input
+     * value while preserving the values of other bit field parameters
      * that share the same underlying memory location.
      * On big endian architectures, the most significant byte (MSB) of an
      * integer is the first byte (i.e, the byte at the starting memory
      * location of the integer).  On little endian architectures. the
-     * least significant byte (LSB) is the first byte.  The manner in 
+     * least significant byte (LSB) is the first byte.  The manner in
      * which bit fields are packed into a structure is not defined in
-     * the ANSI standard, but what has been observed on several 
+     * the ANSI standard, but what has been observed on several
      * platforms is that the bit field values are stored in the order in
-     * which they were declared, with the first bit field starting at 
+     * which they were declared, with the first bit field starting at
      * the first byte.  Therefore, the first bit field of a structure
-     * on a big endian machine is stored at the high order end of its 
+     * on a big endian machine is stored at the high order end of its
      * memory location; on a little endian machine, the first bit field
-     * is stored at the low order end of its memory location.  These 
-     * storage differences influence the construction of the bit field 
+     * is stored at the low order end of its memory location.  These
+     * storage differences influence the construction of the bit field
      * mask and the number of bits by which the input value is shifted.
      *
-     * Keith says that the comment above might be the longest 
+     * Keith says that the comment above might be the longest
      * in Trick source code.  I haven't read it.  It might even
      * be longer than the sum total of all other comments.
      * When the comments are longer than the code it worries me.
diff --git a/trick_source/sim_services/MemoryManager/parameter_types.c b/trick_source/sim_services/MemoryManager/parameter_types.c
index 6a57c809..f1ffbab5 100644
--- a/trick_source/sim_services/MemoryManager/parameter_types.c
+++ b/trick_source/sim_services/MemoryManager/parameter_types.c
@@ -31,7 +31,7 @@ static struct {
     {TRICK_WSTRING,              "TRICK_WSTRING"},
     {TRICK_VOID_PTR,             "TRICK_VOID_PTR"},
     {TRICK_ENUMERATED,           "TRICK_ENUMERATED"},
-    {TRICK_STRUCTURED,           "TRICK_STRUCTURED"} 
+    {TRICK_STRUCTURED,           "TRICK_STRUCTURED"}
 };
 
 #define N_PAIRS (sizeof(trick_type_name_map)/sizeof(trick_type_name_map[0]))
diff --git a/trick_source/sim_services/MemoryManager/ref_to_value.c b/trick_source/sim_services/MemoryManager/ref_to_value.c
index b9bf0845..1e485c99 100644
--- a/trick_source/sim_services/MemoryManager/ref_to_value.c
+++ b/trick_source/sim_services/MemoryManager/ref_to_value.c
@@ -39,10 +39,10 @@ int ref_to_value(REF2 * R, V_DATA * V)
 
     char *address = 0;
 
-    /* 
-     * This function is called from within the YACC parser. 
-     * This function relies on the REF data structure to be filled -- 
-     * YACC fills part of the REF struct and ref_attributes() fills 
+    /*
+     * This function is called from within the YACC parser.
+     * This function relies on the REF data structure to be filled --
+     * YACC fills part of the REF struct and ref_attributes() fills
      * the rest.
      *
      * This function will get the value of the parameter pointed by REF and
diff --git a/trick_source/sim_services/MemoryManager/test/Bitfield_tests.cpp b/trick_source/sim_services/MemoryManager/test/Bitfield_tests.cpp
index f3e3271c..77d08527 100644
--- a/trick_source/sim_services/MemoryManager/test/Bitfield_tests.cpp
+++ b/trick_source/sim_services/MemoryManager/test/Bitfield_tests.cpp
@@ -13,52 +13,52 @@ namespace Trick {
 
 typedef struct {
     unsigned int var1 :14;
-    unsigned int var2 :5; 
+    unsigned int var2 :5;
     unsigned int var3 :12;
-    unsigned int var4 :1; 
+    unsigned int var4 :1;
 } uintBits;
 
 typedef struct {
-    int var1 :7; 
+    int var1 :7;
     int var2 :16;
-    int var3 :3; 
-    int var4 :6; 
+    int var3 :3;
+    int var4 :6;
 } intBits;
 
 typedef struct {
-    unsigned char var1 :3; 
-    unsigned char var2 :2; 
-    unsigned char var3 :2; 
-    unsigned char var4 :1; 
+    unsigned char var1 :3;
+    unsigned char var2 :2;
+    unsigned char var3 :2;
+    unsigned char var4 :1;
 } ucharBits;
 
 typedef struct {
-    char var1 :2; 
-    char var2 :2; 
-    char var3 :2; 
-    char var4 :2; 
+    char var1 :2;
+    char var2 :2;
+    char var3 :2;
+    char var4 :2;
 } charBits;
 
 typedef struct {
-    unsigned short var1 :4; 
-    unsigned short var2 :2; 
-    unsigned short var3 :9; 
-    unsigned short var4 :1; 
+    unsigned short var1 :4;
+    unsigned short var2 :2;
+    unsigned short var3 :9;
+    unsigned short var4 :1;
 } ushortBits;
 
 typedef struct {
-    short var1 :8; 
-    short var2 :1; 
-    short var3 :2; 
-    short var4 :5; 
+    short var1 :8;
+    short var2 :1;
+    short var3 :2;
+    short var4 :5;
 } shortBits;
 
 /* this struct should be the size of the largest member
  *  * (in this case, unsigned int) */
 typedef struct {
-    unsigned char var1 :3; 
-    short var2 :8; 
-    int var3 :9; 
+    unsigned char var1 :3;
+    short var2 :8;
+    int var3 :9;
     unsigned int var4 :12;
 } mixBits;
 
@@ -94,7 +94,7 @@ class BitfieldsTest : public ::testing::Test {
         		bitVals[1] = 0;
         		bitVals[2] = (1 << (bitSizes[2]/2)) - 1;
         		bitVals[3] = (1 << bitSizes[3]) - 1;
-    		}   
+    		}
 
     		for (unsigned int i = 0; i < 4; i++) {
 
@@ -115,18 +115,18 @@ class BitfieldsTest : public ::testing::Test {
         			EXPECT_EQ(num, bitVals[i]);
         		}
         	}
-        	
+
 			bitRep.b.var1 = bitVals[0];
         	bitRep.b.var2 = bitVals[1];
         	bitRep.b.var3 = bitVals[2];
         	bitRep.b.var4 = bitVals[3];
-        
+
 			EXPECT_EQ(test, bitRep.total);
 
         	//printf("Decimal: %d %d %d %d\n", bitVals[0], bitVals[1], bitVals[2], bitVals[3]);
         	return 0;
 		}
-        
+
 
 };
 
@@ -148,7 +148,7 @@ TEST_F(BitfieldsTest, UnsignedChar) {
 
 	int bitSizes[4] = {3, 2, 2, 1};
 
-	bitTest <unsigned char, ucharBits> (bitSizes, false);	
+	bitTest <unsigned char, ucharBits> (bitSizes, false);
 }
 
 TEST_F(BitfieldsTest, UnsignedShort) {
@@ -159,7 +159,7 @@ TEST_F(BitfieldsTest, UnsignedShort) {
 	bitTest <unsigned short, ushortBits> (bitSizes, false);
 }
 TEST_F(BitfieldsTest, Int) {
-	//req.add_requirement("1151502390"); 
+	//req.add_requirement("1151502390");
 
 	int bitSizes[4] = {7, 16, 3, 6};
 
diff --git a/trick_source/sim_services/MemoryManager/test/MM_alloc_deps.hh b/trick_source/sim_services/MemoryManager/test/MM_alloc_deps.hh
index 8496b1b0..be4d941f 100644
--- a/trick_source/sim_services/MemoryManager/test/MM_alloc_deps.hh
+++ b/trick_source/sim_services/MemoryManager/test/MM_alloc_deps.hh
@@ -3,7 +3,7 @@ PURPOSE: (Testing)
 */
 
 typedef struct udt1 {
-  double x; 
+  double x;
   struct udt1 *udt_p;
   double *dbl_p;
 } UDT1;
diff --git a/trick_source/sim_services/MemoryManager/test/MM_ref_name_from_address.hh b/trick_source/sim_services/MemoryManager/test/MM_ref_name_from_address.hh
index e9d318f6..2d514917 100644
--- a/trick_source/sim_services/MemoryManager/test/MM_ref_name_from_address.hh
+++ b/trick_source/sim_services/MemoryManager/test/MM_ref_name_from_address.hh
@@ -3,14 +3,14 @@ PURPOSE: (Testing)
 */
 
 typedef struct udt1 {
-    double x; 
+    double x;
     struct udt1 *udt_p;
     double *dbl_p;
 } UDT1;
 
 typedef struct udt2 {
     UDT1   udt1_var;
-    double x; 
+    double x;
     struct udt1 *udt_p;
     double *dbl_p;
 } UDT2;
diff --git a/trick_source/sim_services/MemoryManager/test/MM_write_checkpoint.hh b/trick_source/sim_services/MemoryManager/test/MM_write_checkpoint.hh
index 0778d1e9..94ba8c2e 100644
--- a/trick_source/sim_services/MemoryManager/test/MM_write_checkpoint.hh
+++ b/trick_source/sim_services/MemoryManager/test/MM_write_checkpoint.hh
@@ -7,7 +7,7 @@ typedef enum {
     } MONTH;
 
 typedef struct udt1 {
-  double x; 
+  double x;
   struct udt1 *udt_p;
   double *dbl_p;
   MONTH *month_p;
diff --git a/trick_source/sim_services/MemoryManager/vval.c b/trick_source/sim_services/MemoryManager/vval.c
index 849e684d..3fba3a2f 100644
--- a/trick_source/sim_services/MemoryManager/vval.c
+++ b/trick_source/sim_services/MemoryManager/vval.c
@@ -348,7 +348,7 @@ wchar_t *vval_wstring(V_DATA * V)
     switch (V->type) {
         case TRICK_STRING:{
 
-#if 0   
+#if 0
 // FIXME
                 wchar_t *wcs;
                 size_t wcs_size;
diff --git a/trick_source/sim_services/MemoryManager/wcs_ext.c b/trick_source/sim_services/MemoryManager/wcs_ext.c
index c1947952..f332cf9d 100644
--- a/trick_source/sim_services/MemoryManager/wcs_ext.c
+++ b/trick_source/sim_services/MemoryManager/wcs_ext.c
@@ -45,7 +45,7 @@ size_t wcs_to_ncs(const wchar_t * wcs, char *ncs, size_t ncs_max_len)
 
         if (iswprint(wcint)) {
             int len;
-            /* The wide character is printable in the current locale, so create a multibyte, external representation of 
+            /* The wide character is printable in the current locale, so create a multibyte, external representation of
                it. Note that the external representation will also be printable in the current locale. */
 
             if (wcint == '\'') {
@@ -125,7 +125,7 @@ size_t ncs_to_wcs(const char *ncs, wchar_t * wcs, size_t w_max_size)
 
     memset(&state, '\0', sizeof(state));
 
-    /* While we have another wide-character and there is sufficient space to store it ... The extra (len > 0 ) check is 
+    /* While we have another wide-character and there is sufficient space to store it ... The extra (len > 0 ) check is
        for the Macs because mbrtowc still returns values > 0 if len == 0 */
     while (((nbytes = mbrtowc(&wc_in, ncs, len, &state)) > 0) && (len > 0)) {
 
diff --git a/trick_source/sim_services/Message/MessageCout.cpp b/trick_source/sim_services/Message/MessageCout.cpp
index 9c278170..8e115634 100644
--- a/trick_source/sim_services/Message/MessageCout.cpp
+++ b/trick_source/sim_services/Message/MessageCout.cpp
@@ -11,7 +11,7 @@ Trick::MessageCout::MessageCout() {
     name = "cout" ;
 }
 
-void Trick::MessageCout::update( unsigned int level , std::string header , std::string message ) { 
+void Trick::MessageCout::update( unsigned int level , std::string header , std::string message ) {
 
     /** @par Design Details: */
     std::string color_code ;
@@ -39,7 +39,7 @@ void Trick::MessageCout::update( unsigned int level , std::string header , std::
 
     /** @li Prints the received message to the standard output stream. */
     if (enabled && level < 100 ) {
-        
+
         // Building the final string in a temporary stream ensures an automic call to cout, which prevents
         // multithreaded sims from interleaving header and message elements.
         std::ostringstream oss;
@@ -50,5 +50,5 @@ void Trick::MessageCout::update( unsigned int level , std::string header , std::
         }
         std::cout << oss.str() << std::flush;
     }
-} 
+}
 
diff --git a/trick_source/sim_services/Message/MessagePublisher.cpp b/trick_source/sim_services/Message/MessagePublisher.cpp
index 435e4452..d5e9f0b2 100644
--- a/trick_source/sim_services/Message/MessagePublisher.cpp
+++ b/trick_source/sim_services/Message/MessagePublisher.cpp
@@ -66,7 +66,7 @@ int Trick::MessagePublisher::publish(int level , std::string message) {
         }
     } else {
         // If there are no subscribers, that probably means things have not been inited yet... just print message only
-        
+
         // Building the final string in a temporary stream ensures an automic call to cout, which prevents
         // multithreaded sims from interleaving header and message elements.
         std::ostringstream oss;
diff --git a/trick_source/sim_services/Message/message_publish_standalone.cpp b/trick_source/sim_services/Message/message_publish_standalone.cpp
index 9a7fd106..4d9a3296 100644
--- a/trick_source/sim_services/Message/message_publish_standalone.cpp
+++ b/trick_source/sim_services/Message/message_publish_standalone.cpp
@@ -22,7 +22,7 @@ extern "C" int message_publish_standalone(int level, const char * format_msg, ..
     date = time(NULL) ;
     strftime(date_buf, (size_t) 20, "%Y/%m/%d,%H:%M:%S", localtime(&date));
     (void) gethostname(hostname, (size_t) 48);
-    fprintf(stdout, "|L %d|%s|  |%s|T %d|%.2f| %s" , level, 
+    fprintf(stdout, "|L %d|%s|  |%s|T %d|%.2f| %s" , level,
             // so that we don't call any exec routines, use process id 0 and sim time 0.0
             date_buf, hostname , 0, 0.0, msg_buf) ;
     fflush(stdout) ;
diff --git a/trick_source/sim_services/MonteCarlo/MonteCarlo_funcs.cpp b/trick_source/sim_services/MonteCarlo/MonteCarlo_funcs.cpp
index be4426db..115d98b3 100644
--- a/trick_source/sim_services/MonteCarlo/MonteCarlo_funcs.cpp
+++ b/trick_source/sim_services/MonteCarlo/MonteCarlo_funcs.cpp
@@ -114,7 +114,7 @@ void Trick::MonteCarlo::set_num_runs(unsigned int in_num_runs) {
     }
     update_actual_num_runs();
 }
-  
+
 unsigned int Trick::MonteCarlo::get_num_runs() {
     return num_runs;
 }
@@ -163,17 +163,17 @@ void Trick::MonteCarlo::add_variable(Trick::MonteVar *variable) {
     variables.push_back(variable);
 }
 
-/** 
+/**
  * @par Detailed Design:
- * Get a pointer to a MonteVar by name. Note this is used in conjunction with 
+ * Get a pointer to a MonteVar by name. Note this is used in conjunction with
  * %factory so that swig produces methods returning all derived types
  */
 Trick::MonteVar * Trick::MonteCarlo::get_variable(std::string variable_name) {
 
     for (std::vector<Trick::MonteVar *>::const_iterator i = variables.begin(); i != variables.end(); ++i) {
         if ( (*i) and (*i)->name.compare(variable_name) == 0 ) {
-            return (*i); 
-        } 
+            return (*i);
+        }
     }
     return (NULL);
 }
@@ -251,7 +251,7 @@ void Trick::MonteCarlo::disable_slave(std::string name, bool disabled){
             }
             return;
         }
-    }    
+    }
 }
 
 int Trick::MonteCarlo::process_sim_args() {
@@ -290,7 +290,7 @@ int Trick::MonteCarlo::shutdown() {
             run_queue(&slave_post_queue, "in slave_post queue") ;
             tc_disconnect(&data_connection_device);
         } else {
-            if (verbosity >= ERROR) 
+            if (verbosity >= ERROR)
                 message_publish(MSG_ERROR, "Monte ERROR: Child failed to connect to data connection.\n") ;
         }
     }
diff --git a/trick_source/sim_services/MonteCarlo/MonteCarlo_master_shutdown.cpp b/trick_source/sim_services/MonteCarlo/MonteCarlo_master_shutdown.cpp
index 27aa168e..255816f6 100644
--- a/trick_source/sim_services/MonteCarlo/MonteCarlo_master_shutdown.cpp
+++ b/trick_source/sim_services/MonteCarlo/MonteCarlo_master_shutdown.cpp
@@ -62,7 +62,7 @@ void Trick::MonteCarlo::shutdown_slaves() {
     }
 }
 void Trick::MonteCarlo::print_statistics(FILE** fp) {
-    static const char *exit_status_string[] = 
+    static const char *exit_status_string[] =
       {"Incomplete", "Complete", "Core Dumped", "Timed Out",
        "No Permission to Output Directory", "Bad Input" } ;
 
diff --git a/trick_source/sim_services/MonteCarlo/MonteCarlo_receive_results.cpp b/trick_source/sim_services/MonteCarlo/MonteCarlo_receive_results.cpp
index 25a3a82b..aafc804a 100644
--- a/trick_source/sim_services/MonteCarlo/MonteCarlo_receive_results.cpp
+++ b/trick_source/sim_services/MonteCarlo/MonteCarlo_receive_results.cpp
@@ -46,7 +46,7 @@ void Trick::MonteCarlo::receive_results() {
         current_run = ntohl(current_run);
 
         /**
-         * <ul><li> This run may have already been resolved by another curr_slave if 
+         * <ul><li> This run may have already been resolved by another curr_slave if
          * this curr_slave was marked as having timed out. If that is the case,
          * discard these results.
          */
diff --git a/trick_source/sim_services/MonteCarlo/MonteCarlo_receive_slave_results.cpp b/trick_source/sim_services/MonteCarlo/MonteCarlo_receive_slave_results.cpp
index 73ab2d97..c9b160b7 100644
--- a/trick_source/sim_services/MonteCarlo/MonteCarlo_receive_slave_results.cpp
+++ b/trick_source/sim_services/MonteCarlo/MonteCarlo_receive_slave_results.cpp
@@ -25,11 +25,11 @@ void Trick::MonteCarlo::receive_slave_results() {
     }
     /**
      * <li> If the slave is in the INITIALIZING state, it will send us the
-     * machine name and port over which it is listening for new runs. 
+     * machine name and port over which it is listening for new runs.
      */
     if (curr_slave->state == MonteSlave::INITIALIZING) {
         if (verbosity >= ALL) {
-            message_publish(MSG_INFO, "Monte [Master] Receiving initialization information from %s:%d.\n", 
+            message_publish(MSG_INFO, "Monte [Master] Receiving initialization information from %s:%d.\n",
                             curr_slave->machine_name.c_str(), curr_slave->id) ;
         }
         read_machine_name(curr_slave) ;
@@ -45,7 +45,7 @@ void Trick::MonteCarlo::receive_slave_results() {
         exit_status = ntohl(exit_status);
         tc_disconnect(&connection_device);
         /**
-         * <ul><li> This run may have already been resolved by another curr_slave if 
+         * <ul><li> This run may have already been resolved by another curr_slave if
          * this curr_slave was marked as having timed out. If that is the case,
          * discard these results.
          */
@@ -57,8 +57,8 @@ void Trick::MonteCarlo::receive_slave_results() {
         /** <li> Otherwise, check the exit status: */
         } else {
             switch (exit_status) {
-                /** <ul><li> Unkown errors, core dumps, and 
-                  * successfully completed runs are not redispatched. 
+                /** <ul><li> Unkown errors, core dumps, and
+                  * successfully completed runs are not redispatched.
                   */
                 default:
                     if (verbosity >= ERROR) {
@@ -79,17 +79,17 @@ void Trick::MonteCarlo::receive_slave_results() {
                     if (verbosity >= ERROR) {
                         message_publish(MSG_ERROR, "Monte [Master] %s:%d reported core dump for run %d. Skipping.\n",
                                         curr_slave->machine_name.c_str(), curr_slave->id, curr_slave->current_run->id) ;
-                    } 
+                    }
                     resolve_run(curr_slave, MonteRun::CORED);
                 break;
                 case MonteRun::COMPLETE:
                     resolve_run(curr_slave, MonteRun::COMPLETE);
                 break;
                 /**
-                 * <li> Timeouts and permission errors are redispatched. However, 
+                 * <li> Timeouts and permission errors are redispatched. However,
                  * we must first check to see if this run has already been processed
                  * in #check_timeouts, which can occur when the master determines
-                 * that a curr_slave has timed out, and then that curr_slave itself reports 
+                 * that a curr_slave has timed out, and then that curr_slave itself reports
                  * a timeout or permission error. </ul>
                  */
                 case MonteRun::TIMEDOUT:
@@ -98,7 +98,7 @@ void Trick::MonteCarlo::receive_slave_results() {
                                         curr_slave->machine_name.c_str(), curr_slave->id, curr_slave->current_run->id) ;
                     }
                     if (!(curr_slave->state == MonteSlave::UNRESPONSIVE_RUNNING ||
-                          curr_slave->state == MonteSlave::UNRESPONSIVE_STOPPING)) 
+                          curr_slave->state == MonteSlave::UNRESPONSIVE_STOPPING))
                     {
                         handle_retry(curr_slave, MonteRun::TIMEDOUT);
                     }
@@ -109,7 +109,7 @@ void Trick::MonteCarlo::receive_slave_results() {
                                         curr_slave->machine_name.c_str(), curr_slave->id, curr_slave->current_run->id) ;
                     }
                     if (!(curr_slave->state == MonteSlave::UNRESPONSIVE_RUNNING ||
-                          curr_slave->state == MonteSlave::UNRESPONSIVE_STOPPING)) 
+                          curr_slave->state == MonteSlave::UNRESPONSIVE_STOPPING))
                     {
                         handle_retry(curr_slave, MonteRun::NO_PERM);
                     }
@@ -142,7 +142,7 @@ void Trick::MonteCarlo::read_machine_name(Trick::MonteSlave *curr_slave) {
 
     tc_read(&connection_device, (char *)&num_bytes, (int)sizeof(num_bytes));
     num_bytes = ntohl(num_bytes) ;
-    if (tc_read(&connection_device, slave_name, num_bytes) == num_bytes ) { 
+    if (tc_read(&connection_device, slave_name, num_bytes) == num_bytes ) {
         curr_slave->state = MonteSlave::READY;
         slave_name[num_bytes] = '\0';
         curr_slave->machine_name = std::string(slave_name);
diff --git a/trick_source/sim_services/MonteCarlo/MonteCarlo_run_queue.cpp b/trick_source/sim_services/MonteCarlo/MonteCarlo_run_queue.cpp
index 57734042..c5e2a9c5 100644
--- a/trick_source/sim_services/MonteCarlo/MonteCarlo_run_queue.cpp
+++ b/trick_source/sim_services/MonteCarlo/MonteCarlo_run_queue.cpp
@@ -22,7 +22,7 @@ int Trick::MonteCarlo::run_queue(Trick::ScheduledJobQueue* queue, std::string in
         ret = curr_job->call() ;
         if ( ret != 0 ) {
             except_file = in_string ;
-            throw Trick::ExecutiveException(ret , curr_job->name.c_str() , 0 , 
+            throw Trick::ExecutiveException(ret , curr_job->name.c_str() , 0 ,
                                         curr_job->job_class_name + " job did not return 0") ;
         }
     }
diff --git a/trick_source/sim_services/MonteCarlo/MonteCarlo_slave_process_run.cpp b/trick_source/sim_services/MonteCarlo/MonteCarlo_slave_process_run.cpp
index e12b7bd0..220b38ec 100644
--- a/trick_source/sim_services/MonteCarlo/MonteCarlo_slave_process_run.cpp
+++ b/trick_source/sim_services/MonteCarlo/MonteCarlo_slave_process_run.cpp
@@ -34,7 +34,7 @@ int Trick::MonteCarlo::slave_process_run() {
     tc_disconnect(&connection_device);
 
     /**
-     * <li> fork() a child process to execute the simulation. 
+     * <li> fork() a child process to execute the simulation.
      * This allows the slave to monitor the child and continue running
      * if it crashes or times out.
      */
diff --git a/trick_source/sim_services/MonteCarlo/MonteCarlo_spawn_slaves.cpp b/trick_source/sim_services/MonteCarlo/MonteCarlo_spawn_slaves.cpp
index 0bc7592f..e6b6caa4 100644
--- a/trick_source/sim_services/MonteCarlo/MonteCarlo_spawn_slaves.cpp
+++ b/trick_source/sim_services/MonteCarlo/MonteCarlo_spawn_slaves.cpp
@@ -10,13 +10,13 @@
 
 /**
  * @par Detailed Design:
- * This function is responsible for actually issuing the system call that 
+ * This function is responsible for actually issuing the system call that
  * will create the slave simulations on the appropriate machines.
  */
 void Trick::MonteCarlo::spawn_slaves() {
     /** <ul><li> For all slaves: */
     for (std::vector<MonteSlave *>::size_type i = 0; i < slaves.size(); ++i) {
-        /** <ul><li> If the slave is in the UNINITIALZED state, then 
+        /** <ul><li> If the slave is in the UNINITIALZED state, then
           * set up the command string for starting the slave.
           */
         if (slaves[i]->state == MonteSlave::UNINITIALIZED) {
@@ -86,8 +86,8 @@ void Trick::MonteCarlo::default_slave_dispatch_pre_text(Trick::MonteSlave* slave
                 if (slave_to_init->user_remote_shell.empty()) {
                     slave_to_init->user_remote_shell = unix_ssh;
                     if (verbosity >= ERROR) {
-                        message_publish(MSG_WARNING, "Monte: TRICK_USER_REMOTE_SH specified for Slave %s:%d, but no shell given.\n" 
-                                                     "Defaulting to %s.\n", 
+                        message_publish(MSG_WARNING, "Monte: TRICK_USER_REMOTE_SH specified for Slave %s:%d, but no shell given.\n"
+                                                     "Defaulting to %s.\n",
                                         machine_name.c_str(), slave_to_init->id, slave_to_init->user_remote_shell.c_str()) ;
                     }
                 }
@@ -101,8 +101,8 @@ void Trick::MonteCarlo::default_slave_dispatch_pre_text(Trick::MonteSlave* slave
         buffer += " " + slave_to_init->remote_shell_args + " " + slave_to_init->machine_name + " '";
     }
 
-    /** <li> Add the user command string to allow passing 
-     * of environment variables and such to the slave. 
+    /** <li> Add the user command string to allow passing
+     * of environment variables and such to the slave.
      */
     if (!user_cmd_string.empty()) {
         buffer += user_cmd_string + "; ";
diff --git a/trick_source/sim_services/MonteCarlo/MonteVarFile.cpp b/trick_source/sim_services/MonteCarlo/MonteVarFile.cpp
index 29467254..6a0ba1d4 100644
--- a/trick_source/sim_services/MonteCarlo/MonteVarFile.cpp
+++ b/trick_source/sim_services/MonteCarlo/MonteVarFile.cpp
@@ -13,7 +13,7 @@ Trick::MonteVarFile::MonteVarFile(std::string in_name, std::string in_file_name,
     this->name = in_name;
     this->column = in_column;
     this->unit = in_unit;
-  
+
     set_file_name(in_file_name);
     buffer = new char[4096];
 
@@ -48,7 +48,7 @@ std::string Trick::MonteVarFile::get_next_value() {
             ntokens++;
         }
 
-        // Verify the input column number is valid 
+        // Verify the input column number is valid
         if ( (column == 0) || (column > ntokens) ) {
             char string[100];
             sprintf(string, "Trick:MonteVarFile An invalid column number %d, valid column numbers are 1 - %d", column, ntokens);
diff --git a/trick_source/sim_services/MonteCarlo/MonteVarRandom.cpp b/trick_source/sim_services/MonteCarlo/MonteVarRandom.cpp
index c29b7e43..77e77f15 100644
--- a/trick_source/sim_services/MonteCarlo/MonteVarRandom.cpp
+++ b/trick_source/sim_services/MonteCarlo/MonteVarRandom.cpp
@@ -31,12 +31,12 @@ Trick::MonteVarRandom::MonteVarRandom(std::string in_name, Distribution in_distr
 #if (defined(_HAVE_TR1_RANDOM) || defined(_HAVE_STL_RANDOM))
     unsigned long seed = randist.seed;
     double unused = 0.0;
-    StlRandomGenerator::StlDistribution stlDist = 
+    StlRandomGenerator::StlDistribution stlDist =
         static_cast<StlRandomGenerator::StlDistribution>(distribution);
-    StlRandomGenerator::StlEngine stlEngine = 
+    StlRandomGenerator::StlEngine stlEngine =
         static_cast<StlRandomGenerator::StlEngine>(engineType);
     if (engineType != NO_ENGINE) {
-        // note: in practice, these will have to be changed by calling set_mu, etc, 
+        // note: in practice, these will have to be changed by calling set_mu, etc,
         // in the input file after construction.
 
         switch (randist.type) {
@@ -138,19 +138,19 @@ std::string Trick::MonteVarRandom::get_next_value() {
         double sigma_range = static_cast<double>(randist.sigma_range) * randist.sigma;
         double min = get_absolute_min();
         double max = get_absolute_max();
-        
+
         unsigned int count = 0;
         while (count < 100) {
             return_value = (*stlGenPtr)();
             count++;
-            
+
             if (return_value.d < min || return_value.d > max) {
                 continue;
             } else {
-                
+
                 if (0 == randist.sigma_range // 0== means sigma_range algorithm is turned off
-                    || std::fabs(return_value.d - randist.mu) <= sigma_range) { 
-                    break; 
+                    || std::fabs(return_value.d - randist.mu) <= sigma_range) {
+                    break;
                 }
             }
         }
@@ -159,7 +159,7 @@ std::string Trick::MonteVarRandom::get_next_value() {
             sprintf(string, "Trick:MonteVarRandom failed to generate a random value for variable \"%s\"\n", name.c_str());
             exec_terminate_with_return(-1, __FILE__, __LINE__, string);
         }
-        
+
     } else {
         if (trick_gsl_rand(&randist, &return_value) != 0) {
             char string[100];
@@ -167,7 +167,7 @@ std::string Trick::MonteVarRandom::get_next_value() {
             exec_terminate_with_return(-1, __FILE__, __LINE__, string);
         }
     }
-    
+
     switch (randist.type) {
         case TRICK_GSL_POISSON:
             // STL returns int, GSL returns unsigned int
@@ -189,19 +189,19 @@ std::string Trick::MonteVarRandom::get_next_value() {
     if (unit.empty()) {
         return name + std::string(" = ") + value ;
     } else {
-        return name + std::string(" = trick.attach_units(\"") + unit + std::string("\", ")  + value + 
+        return name + std::string(" = trick.attach_units(\"") + unit + std::string("\", ")  + value +
                std::string(")") ;
     }
 }
 
-///@details Update the full set of STL random settings 
+///@details Update the full set of STL random settings
 /// (Call after any of the settings: randist.mu .set_min, max, min_is_relative, max_is_relative
-/// are called.) 
+/// are called.)
 void
 Trick::MonteVarRandom::updateStlRandom() {
-    
+
     if (stlGenPtr) {
-        
+
         switch (randist.type) {
         case GAUSSIAN:
             stlGenPtr->set_param(randist.mu, randist.sigma);
diff --git a/trick_source/sim_services/MonteCarlo/StlRandomGenerator.cpp b/trick_source/sim_services/MonteCarlo/StlRandomGenerator.cpp
index ccf5fa0c..6cc51d0d 100644
--- a/trick_source/sim_services/MonteCarlo/StlRandomGenerator.cpp
+++ b/trick_source/sim_services/MonteCarlo/StlRandomGenerator.cpp
@@ -4,7 +4,7 @@
 
 StlRandomGenerator::StlRandomGenerator(double          in_param_a,
                                        double          in_param_b,
-                                       unsigned long   in_seed, 
+                                       unsigned long   in_seed,
                                        StlDistribution in_dist_type,
                                        StlEngine       in_engine_type)
 :   initialSeed(in_seed),
@@ -18,9 +18,9 @@ StlRandomGenerator::~StlRandomGenerator()
 }
 
 
-///@details return a pointer-to-base-class for a new StlRandomGeneratorSub object 
+///@details return a pointer-to-base-class for a new StlRandomGeneratorSub object
 ///         of the input-specified type
-StlRandomGenerator* 
+StlRandomGenerator*
 StlRandomGeneratorFactory::newGenerator(
     double        in_param_a,
     double        in_param_b,
@@ -40,254 +40,254 @@ StlRandomGeneratorFactory::newGenerator(
 #define UNIFORM_REAL_DIST  std::uniform_real
 #define TRICK_DEFAULT_ENGINE_CLASS std::ranlux_base_01 // because mt19937 doesnt return within canonical range for GCC 4.4.7
 #endif
-    
+
     switch (in_engine_type * 1000 + in_dist_type) {
-        
+
     // ------------- TRICK_DEFAULT_ENGINE --------------------------------------
-        
+
     case StlRandomGenerator::TRICK_DEFAULT_ENGINE*1000 + StlRandomGenerator::GAUSSIAN:
         return static_cast< StlRandomGenerator* > (
-            new StlRandomGeneratorSub< TRICK_DEFAULT_ENGINE_CLASS, std::normal_distribution<double> > 
+            new StlRandomGeneratorSub< TRICK_DEFAULT_ENGINE_CLASS, std::normal_distribution<double> >
                 (in_param_a, in_param_b, in_seed, in_dist_type, in_engine_type)
         );
         break;
     case StlRandomGenerator::TRICK_DEFAULT_ENGINE*1000 + StlRandomGenerator::FLAT:
         return static_cast< StlRandomGenerator* > (
-            new StlRandomGeneratorSub< TRICK_DEFAULT_ENGINE_CLASS, UNIFORM_REAL_DIST<double> > 
+            new StlRandomGeneratorSub< TRICK_DEFAULT_ENGINE_CLASS, UNIFORM_REAL_DIST<double> >
                 (in_param_a, in_param_b, in_seed, in_dist_type, in_engine_type)
         );
         break;
     case StlRandomGenerator::TRICK_DEFAULT_ENGINE*1000 + StlRandomGenerator::POISSON:
         return static_cast< StlRandomGenerator* > (
-            new StlRandomGeneratorSub< TRICK_DEFAULT_ENGINE_CLASS, std::poisson_distribution<STL_POISSON_TEMPLATE_TYPES> > 
+            new StlRandomGeneratorSub< TRICK_DEFAULT_ENGINE_CLASS, std::poisson_distribution<STL_POISSON_TEMPLATE_TYPES> >
                 (in_param_a, in_param_b, in_seed, in_dist_type, in_engine_type)
         );
         break;
-    
+
 
 #ifdef _HAVE_TR1_RANDOM
     // ------------- RANLUX_BASE_01_ENGINE ---------------------------------------------
-    
+
     case StlRandomGenerator::RANLUX_BASE_01_ENGINE*1000 + StlRandomGenerator::GAUSSIAN:
         return static_cast< StlRandomGenerator* > (
-            new StlRandomGeneratorSub< std::ranlux_base_01, std::normal_distribution<double> > 
+            new StlRandomGeneratorSub< std::ranlux_base_01, std::normal_distribution<double> >
                 (in_param_a, in_param_b, in_seed, in_dist_type, in_engine_type)
         );
         break;
     case StlRandomGenerator::RANLUX_BASE_01_ENGINE*1000 + StlRandomGenerator::FLAT:
         return static_cast< StlRandomGenerator* > (
-            new StlRandomGeneratorSub< std::ranlux_base_01, UNIFORM_REAL_DIST<double> > 
+            new StlRandomGeneratorSub< std::ranlux_base_01, UNIFORM_REAL_DIST<double> >
                 (in_param_a, in_param_b, in_seed, in_dist_type, in_engine_type)
         );
         break;
     case StlRandomGenerator::RANLUX_BASE_01_ENGINE*1000 + StlRandomGenerator::POISSON:
         return static_cast< StlRandomGenerator* > (
-            new StlRandomGeneratorSub< std::ranlux_base_01, std::poisson_distribution<STL_POISSON_TEMPLATE_TYPES> > 
+            new StlRandomGeneratorSub< std::ranlux_base_01, std::poisson_distribution<STL_POISSON_TEMPLATE_TYPES> >
                 (in_param_a, in_param_b, in_seed, in_dist_type, in_engine_type)
         );
         break;
 
     // ------------- RANLUX_64_BASE_01_ENGINE ---------------------------------------------
-    
+
     case StlRandomGenerator::RANLUX_64_BASE_01_ENGINE*1000 + StlRandomGenerator::GAUSSIAN:
         return static_cast< StlRandomGenerator* > (
-            new StlRandomGeneratorSub< std::ranlux64_base_01, std::normal_distribution<double> > 
+            new StlRandomGeneratorSub< std::ranlux64_base_01, std::normal_distribution<double> >
                 (in_param_a, in_param_b, in_seed, in_dist_type, in_engine_type)
         );
         break;
     case StlRandomGenerator::RANLUX_64_BASE_01_ENGINE*1000 + StlRandomGenerator::FLAT:
         return static_cast< StlRandomGenerator* > (
-            new StlRandomGeneratorSub< std::ranlux64_base_01, UNIFORM_REAL_DIST<double> > 
+            new StlRandomGeneratorSub< std::ranlux64_base_01, UNIFORM_REAL_DIST<double> >
                 (in_param_a, in_param_b, in_seed, in_dist_type, in_engine_type)
         );
         break;
     case StlRandomGenerator::RANLUX_64_BASE_01_ENGINE*1000 + StlRandomGenerator::POISSON:
         return static_cast< StlRandomGenerator* > (
-            new StlRandomGeneratorSub< std::ranlux64_base_01, std::poisson_distribution<STL_POISSON_TEMPLATE_TYPES> > 
+            new StlRandomGeneratorSub< std::ranlux64_base_01, std::poisson_distribution<STL_POISSON_TEMPLATE_TYPES> >
                 (in_param_a, in_param_b, in_seed, in_dist_type, in_engine_type)
         );
         break;
 
 #else
 
-// std::minstd_rand and mt19937 are not provided for TR1, because GCC 4.4.7 (at least) 
-// they return outside the canonical range 0 <= x < 1. 
+// std::minstd_rand and mt19937 are not provided for TR1, because GCC 4.4.7 (at least)
+// they return outside the canonical range 0 <= x < 1.
 // This causes an infinite loop in std::normal_distribution
-    
+
     // ------------- MINSTD_RAND_ENGINE ---------------------------------------------
-    
+
     case StlRandomGenerator::MINSTD_RAND_ENGINE*1000 + StlRandomGenerator::GAUSSIAN:
         return static_cast< StlRandomGenerator* > (
-            new StlRandomGeneratorSub< std::minstd_rand, std::normal_distribution<double> > 
+            new StlRandomGeneratorSub< std::minstd_rand, std::normal_distribution<double> >
                 (in_param_a, in_param_b, in_seed, in_dist_type, in_engine_type)
         );
         break;
     case StlRandomGenerator::MINSTD_RAND_ENGINE*1000 + StlRandomGenerator::FLAT:
         return static_cast< StlRandomGenerator* > (
-            new StlRandomGeneratorSub< std::minstd_rand, UNIFORM_REAL_DIST<double> > 
+            new StlRandomGeneratorSub< std::minstd_rand, UNIFORM_REAL_DIST<double> >
                 (in_param_a, in_param_b, in_seed, in_dist_type, in_engine_type)
         );
         break;
     case StlRandomGenerator::MINSTD_RAND_ENGINE*1000 + StlRandomGenerator::POISSON:
         return static_cast< StlRandomGenerator* > (
-            new StlRandomGeneratorSub< std::minstd_rand, std::poisson_distribution<STL_POISSON_TEMPLATE_TYPES> > 
+            new StlRandomGeneratorSub< std::minstd_rand, std::poisson_distribution<STL_POISSON_TEMPLATE_TYPES> >
                 (in_param_a, in_param_b, in_seed, in_dist_type, in_engine_type)
         );
         break;
 
     // ------------- MT19937_ENGINE ---------------------------------------------
-    
+
     case StlRandomGenerator::MT19937_ENGINE*1000 + StlRandomGenerator::GAUSSIAN:
         return static_cast< StlRandomGenerator* > (
-            new StlRandomGeneratorSub< std::mt19937, std::normal_distribution<double> > 
+            new StlRandomGeneratorSub< std::mt19937, std::normal_distribution<double> >
                 (in_param_a, in_param_b, in_seed, in_dist_type, in_engine_type)
         );
         break;
     case StlRandomGenerator::MT19937_ENGINE*1000 + StlRandomGenerator::FLAT:
         return static_cast< StlRandomGenerator* > (
-            new StlRandomGeneratorSub< std::mt19937, UNIFORM_REAL_DIST<double> > 
+            new StlRandomGeneratorSub< std::mt19937, UNIFORM_REAL_DIST<double> >
                 (in_param_a, in_param_b, in_seed, in_dist_type, in_engine_type)
         );
         break;
     case StlRandomGenerator::MT19937_ENGINE*1000 + StlRandomGenerator::POISSON:
         return static_cast< StlRandomGenerator* > (
-            new StlRandomGeneratorSub< std::mt19937, std::poisson_distribution<STL_POISSON_TEMPLATE_TYPES> > 
+            new StlRandomGeneratorSub< std::mt19937, std::poisson_distribution<STL_POISSON_TEMPLATE_TYPES> >
                 (in_param_a, in_param_b, in_seed, in_dist_type, in_engine_type)
         );
         break;
-    
+
 // these engines are all C++11 only
     // ------------- MT19937_64_ENGINE ---------------------------------------------
-    
+
     case StlRandomGenerator::MT19937_64_ENGINE*1000 + StlRandomGenerator::GAUSSIAN:
         return static_cast< StlRandomGenerator* > (
-            new StlRandomGeneratorSub< std::mt19937_64, std::normal_distribution<double> > 
+            new StlRandomGeneratorSub< std::mt19937_64, std::normal_distribution<double> >
                 (in_param_a, in_param_b, in_seed, in_dist_type, in_engine_type)
         );
         break;
     case StlRandomGenerator::MT19937_64_ENGINE*1000 + StlRandomGenerator::FLAT:
         return static_cast< StlRandomGenerator* > (
-            new StlRandomGeneratorSub< std::mt19937_64, UNIFORM_REAL_DIST<double> > 
+            new StlRandomGeneratorSub< std::mt19937_64, UNIFORM_REAL_DIST<double> >
                 (in_param_a, in_param_b, in_seed, in_dist_type, in_engine_type)
         );
         break;
     case StlRandomGenerator::MT19937_64_ENGINE*1000 + StlRandomGenerator::POISSON:
         return static_cast< StlRandomGenerator* > (
-            new StlRandomGeneratorSub< std::mt19937_64, std::poisson_distribution<STL_POISSON_TEMPLATE_TYPES> > 
+            new StlRandomGeneratorSub< std::mt19937_64, std::poisson_distribution<STL_POISSON_TEMPLATE_TYPES> >
                 (in_param_a, in_param_b, in_seed, in_dist_type, in_engine_type)
         );
         break;
 
     // ------------- RANLUX_24_BASE_ENGINE ---------------------------------------------
-    
+
     case StlRandomGenerator::RANLUX_24_BASE_ENGINE*1000 + StlRandomGenerator::GAUSSIAN:
         return static_cast< StlRandomGenerator* > (
-            new StlRandomGeneratorSub< std::ranlux24_base, std::normal_distribution<double> > 
+            new StlRandomGeneratorSub< std::ranlux24_base, std::normal_distribution<double> >
                 (in_param_a, in_param_b, in_seed, in_dist_type, in_engine_type)
         );
         break;
     case StlRandomGenerator::RANLUX_24_BASE_ENGINE*1000 + StlRandomGenerator::FLAT:
         return static_cast< StlRandomGenerator* > (
-            new StlRandomGeneratorSub< std::ranlux24_base, UNIFORM_REAL_DIST<double> > 
+            new StlRandomGeneratorSub< std::ranlux24_base, UNIFORM_REAL_DIST<double> >
                 (in_param_a, in_param_b, in_seed, in_dist_type, in_engine_type)
         );
         break;
     case StlRandomGenerator::RANLUX_24_BASE_ENGINE*1000 + StlRandomGenerator::POISSON:
         return static_cast< StlRandomGenerator* > (
-            new StlRandomGeneratorSub< std::ranlux24_base, std::poisson_distribution<STL_POISSON_TEMPLATE_TYPES> > 
+            new StlRandomGeneratorSub< std::ranlux24_base, std::poisson_distribution<STL_POISSON_TEMPLATE_TYPES> >
                 (in_param_a, in_param_b, in_seed, in_dist_type, in_engine_type)
         );
         break;
 
     // ------------- RANLUX_44_BASE_ENGINE ---------------------------------------------
-    
+
     case StlRandomGenerator::RANLUX_44_BASE_ENGINE*1000 + StlRandomGenerator::GAUSSIAN:
         return static_cast< StlRandomGenerator* > (
-            new StlRandomGeneratorSub< std::ranlux48_base, std::normal_distribution<double> > 
+            new StlRandomGeneratorSub< std::ranlux48_base, std::normal_distribution<double> >
                 (in_param_a, in_param_b, in_seed, in_dist_type, in_engine_type)
         );
         break;
     case StlRandomGenerator::RANLUX_44_BASE_ENGINE*1000 + StlRandomGenerator::FLAT:
         return static_cast< StlRandomGenerator* > (
-            new StlRandomGeneratorSub< std::ranlux48_base, UNIFORM_REAL_DIST<double> > 
+            new StlRandomGeneratorSub< std::ranlux48_base, UNIFORM_REAL_DIST<double> >
                 (in_param_a, in_param_b, in_seed, in_dist_type, in_engine_type)
         );
         break;
     case StlRandomGenerator::RANLUX_44_BASE_ENGINE*1000 + StlRandomGenerator::POISSON:
         return static_cast< StlRandomGenerator* > (
-            new StlRandomGeneratorSub< std::ranlux48_base, std::poisson_distribution<STL_POISSON_TEMPLATE_TYPES> > 
+            new StlRandomGeneratorSub< std::ranlux48_base, std::poisson_distribution<STL_POISSON_TEMPLATE_TYPES> >
                 (in_param_a, in_param_b, in_seed, in_dist_type, in_engine_type)
         );
         break;
 
     // ------------- RANLUX_24_ENGINE ---------------------------------------------
-    
+
     case StlRandomGenerator::RANLUX_24_ENGINE*1000 + StlRandomGenerator::GAUSSIAN:
         return static_cast< StlRandomGenerator* > (
-            new StlRandomGeneratorSub< std::ranlux24, std::normal_distribution<double> > 
+            new StlRandomGeneratorSub< std::ranlux24, std::normal_distribution<double> >
                 (in_param_a, in_param_b, in_seed, in_dist_type, in_engine_type)
         );
         break;
     case StlRandomGenerator::RANLUX_24_ENGINE*1000 + StlRandomGenerator::FLAT:
         return static_cast< StlRandomGenerator* > (
-            new StlRandomGeneratorSub< std::ranlux24, UNIFORM_REAL_DIST<double> > 
+            new StlRandomGeneratorSub< std::ranlux24, UNIFORM_REAL_DIST<double> >
                 (in_param_a, in_param_b, in_seed, in_dist_type, in_engine_type)
         );
         break;
     case StlRandomGenerator::RANLUX_24_ENGINE*1000 + StlRandomGenerator::POISSON:
         return static_cast< StlRandomGenerator* > (
-            new StlRandomGeneratorSub< std::ranlux24, std::poisson_distribution<STL_POISSON_TEMPLATE_TYPES> > 
+            new StlRandomGeneratorSub< std::ranlux24, std::poisson_distribution<STL_POISSON_TEMPLATE_TYPES> >
                 (in_param_a, in_param_b, in_seed, in_dist_type, in_engine_type)
         );
         break;
 
     // ------------- RANLUX_44_ENGINE ---------------------------------------------
-    
+
     case StlRandomGenerator::RANLUX_44_ENGINE*1000 + StlRandomGenerator::GAUSSIAN:
         return static_cast< StlRandomGenerator* > (
-            new StlRandomGeneratorSub< std::ranlux48, std::normal_distribution<double> > 
+            new StlRandomGeneratorSub< std::ranlux48, std::normal_distribution<double> >
                 (in_param_a, in_param_b, in_seed, in_dist_type, in_engine_type)
         );
         break;
     case StlRandomGenerator::RANLUX_44_ENGINE*1000 + StlRandomGenerator::FLAT:
         return static_cast< StlRandomGenerator* > (
-            new StlRandomGeneratorSub< std::ranlux48, UNIFORM_REAL_DIST<double> > 
+            new StlRandomGeneratorSub< std::ranlux48, UNIFORM_REAL_DIST<double> >
                 (in_param_a, in_param_b, in_seed, in_dist_type, in_engine_type)
         );
         break;
     case StlRandomGenerator::RANLUX_44_ENGINE*1000 + StlRandomGenerator::POISSON:
         return static_cast< StlRandomGenerator* > (
-            new StlRandomGeneratorSub< std::ranlux48, std::poisson_distribution<STL_POISSON_TEMPLATE_TYPES> > 
+            new StlRandomGeneratorSub< std::ranlux48, std::poisson_distribution<STL_POISSON_TEMPLATE_TYPES> >
                 (in_param_a, in_param_b, in_seed, in_dist_type, in_engine_type)
         );
         break;
 
     // ------------- KNUTH_B_ENGINE ---------------------------------------------
-    
+
     case StlRandomGenerator::KNUTH_B_ENGINE*1000 + StlRandomGenerator::GAUSSIAN:
         return static_cast< StlRandomGenerator* > (
-            new StlRandomGeneratorSub< std::knuth_b, std::normal_distribution<double> > 
+            new StlRandomGeneratorSub< std::knuth_b, std::normal_distribution<double> >
                 (in_param_a, in_param_b, in_seed, in_dist_type, in_engine_type)
         );
         break;
     case StlRandomGenerator::KNUTH_B_ENGINE*1000 + StlRandomGenerator::FLAT:
         return static_cast< StlRandomGenerator* > (
-            new StlRandomGeneratorSub< std::knuth_b, UNIFORM_REAL_DIST<double> > 
+            new StlRandomGeneratorSub< std::knuth_b, UNIFORM_REAL_DIST<double> >
                 (in_param_a, in_param_b, in_seed, in_dist_type, in_engine_type)
         );
         break;
     case StlRandomGenerator::KNUTH_B_ENGINE*1000 + StlRandomGenerator::POISSON:
         return static_cast< StlRandomGenerator* > (
-            new StlRandomGeneratorSub< std::knuth_b, std::poisson_distribution<STL_POISSON_TEMPLATE_TYPES> > 
+            new StlRandomGeneratorSub< std::knuth_b, std::poisson_distribution<STL_POISSON_TEMPLATE_TYPES> >
                 (in_param_a, in_param_b, in_seed, in_dist_type, in_engine_type)
         );
         break;
 #endif
-    
+
     default:
         throw std::invalid_argument(std::string("error: StlRandomGeneratorFactory::newGenerator called for unimplemented std::random  (engine,distribution) combination."));
     }
-    
+
 
 #else
     // without either _HAVE_TR1_RANDOM or _HAVE_STL_RANDOM, return null pointer.
diff --git a/trick_source/sim_services/MonteCarlo/test/MonteCarlo_test.cpp b/trick_source/sim_services/MonteCarlo/test/MonteCarlo_test.cpp
index 54749fee..693d7a63 100644
--- a/trick_source/sim_services/MonteCarlo/test/MonteCarlo_test.cpp
+++ b/trick_source/sim_services/MonteCarlo/test/MonteCarlo_test.cpp
@@ -276,7 +276,7 @@ TEST_F(MonteCarloTest, TestSettingValues) {
     EXPECT_EQ(exec.get_verbosity(), exec.INFORMATIONAL) ;
     exec.set_verbosity(exec.ALL) ;
     EXPECT_EQ(exec.get_verbosity(), exec.ALL) ;
-    
+
 }
 
 TEST_F(MonteCarloTest, TestRanges) {
@@ -436,7 +436,7 @@ TEST_F(MonteCarloTest, MonteVarRandom_NonGSL) {
     var4.set_max(4.0) ;
     var4.set_seed(12345);
     // for this test, let sigma_range default to 1   var4.set_sigma_range(0) ;
-    
+
     exec.add_variable(&var4) ;
     // Test MonteVarRandom
     // non GSL library variables
@@ -460,7 +460,7 @@ TEST_F(MonteCarloTest, MonteVarFixed) {
     EXPECT_EQ(var5.name, "time_to_fire_5") ;
     EXPECT_EQ(var5.unit, "") ;
     EXPECT_EQ(exec.variables.size(), 1) ;
-} 
+}
 
 ///@brief check that the final distribution is correct. (Bug 6950: The non-GSL was wrong for GAUSSIAN and FLAT)
 TEST_F(MonteCarloTest, MonteVarRandom_Gaussian_distributionMatchesSpec) {
@@ -470,44 +470,44 @@ TEST_F(MonteCarloTest, MonteVarRandom_Gaussian_distributionMatchesSpec) {
 
     Trick::MonteVarRandom var6("time_to_fire_1", Trick::MonteVarRandom::GAUSSIAN) ;
     exec.add_variable(&var6) ;
-    
+
     double expected_mean  = 10.0 ;
     double expected_sigma = 2.0 ;
-    
+
     var6.set_seed(12345) ;
     var6.set_mu(expected_mean) ;
     var6.set_sigma(expected_sigma) ;
     var6.set_min(-10.0) ;
     var6.set_max(10.0) ;
     var6.set_sigma_range(0) ;
-    
+
     // maintain running sums for calculating mean and variance
     double mean = 0.0 ;
     double sum_variance = 0.0 ;
     int    n = 0 ;
     double delta = 0.0 ;
     int    numRuns = 100 ;
-    
+
     for (int ii = 0; ii <= numRuns; ++ii) {
-        
+
         {
             var6.get_next_value() ;
             str = var6.value ;
             std::stringstream sstream(str) ;
             sstream >> value ;
         }
-        
+
         n++ ;
         delta = value - mean ;
         mean += delta / (double)n ;
         sum_variance += delta * (value - mean) ;
     }
-    
+
     // final statistics
     double variance = sum_variance / (double) (n - 1) ;
     double sigma = sqrt(variance) ;
-    
-    
+
+
     EXPECT_NEAR(expected_mean,  mean,  0.05 * expected_mean) ;
     EXPECT_NEAR(expected_sigma, sigma, 0.10 * expected_sigma) ;
 }
@@ -523,49 +523,49 @@ TEST_F(MonteCarloTest, MonteVarRandom_Gaussian_nonGslSigmaRangeDefaulted_maxDevi
 
     Trick::MonteVarRandom var7("time_to_fire_1", Trick::MonteVarRandom::GAUSSIAN) ;
     exec.add_variable(&var7) ;
-    
+
     double expected_mean  = 10.0 ;
     double expected_sigma = 2.0 ;
-    
+
     var7.set_seed(12345) ;
     var7.set_mu(expected_mean) ;
     var7.set_sigma(expected_sigma) ;
     var7.set_min(-10.0) ;
     var7.set_max(10.0) ;
-    
+
     // without this call, default sigma_range is 1
     // var7.set_sigma_range(0) ;
-    
+
     int    num_runs = 100 ;
     double sigmas_max_deviation_from_mean = 0.0 ;
     double deviation_sigmas = 0.0 ;
-    
+
     for (int ii = 0; ii <= num_runs; ++ii) {
-        
+
         {
             var7.get_next_value() ;
             str = var7.value ;
             std::stringstream sstream(str) ;
             sstream >> value ;
         }
-        
+
         deviation_sigmas = fabs( (value - expected_mean) / expected_sigma ) ;
-        
+
         if (deviation_sigmas > sigmas_max_deviation_from_mean) {
             sigmas_max_deviation_from_mean = deviation_sigmas ;
         }
     }
-    
-    // Loose constraint: anything .LE. 1 will pass. 
+
+    // Loose constraint: anything .LE. 1 will pass.
     // (Doesn't require the largest deviations to be around 1.
     // In other words, even max deviations of zero would pass.)
     //EXPECT_LE(sigmas_max_deviation_from_mean, 1.0) ;
-    
-    // tighter constraint: the max deviation with 100 runs 
+
+    // tighter constraint: the max deviation with 100 runs
     // should be pretty close to but still <= 1.0.
     // This specifies the range 0.9 .. 1.0
     EXPECT_NEAR(sigmas_max_deviation_from_mean, 0.95, 0.05) ;
-} 
+}
 
 ///@brief test set_sigma_range feature works for STL random
 TEST_F(MonteCarloTest, MonteVarRandom_StlGaussian_nonGslSigmaRangeDefaulted_maxDeviationFromMeanIs1Sigma) {
@@ -575,49 +575,49 @@ TEST_F(MonteCarloTest, MonteVarRandom_StlGaussian_nonGslSigmaRangeDefaulted_maxD
 
     Trick::MonteVarRandom var9("time_to_fire_1", Trick::MonteVarRandom::GAUSSIAN, "", Trick::MonteVarRandom::TRICK_DEFAULT_ENGINE) ;
     exec.add_variable(&var9) ;
-    
+
     double expected_mean  = 10.0 ;
     double expected_sigma = 2.0 ;
-    
+
     var9.set_seed(12345) ;
     var9.set_mu(expected_mean) ;
     var9.set_sigma(expected_sigma) ;
     var9.set_min(-10.0) ;
     var9.set_max(10.0) ;
-    
+
     // without this call, default sigma_range is 1
     // var9.set_sigma_range(0) ;
-    
+
     int    num_runs = 1000 ;
     double sigmas_max_deviation_from_mean = 0.0 ;
     double deviation_sigmas = 0.0 ;
-    
+
     for (int ii = 0; ii <= num_runs; ++ii) {
-        
+
         {
             var9.get_next_value() ;
             str = var9.value ;
             std::stringstream sstream(str) ;
             sstream >> value ;
         }
-        
+
         deviation_sigmas = fabs( (value - expected_mean) / expected_sigma ) ;
-        
+
         if (deviation_sigmas > sigmas_max_deviation_from_mean) {
             sigmas_max_deviation_from_mean = deviation_sigmas ;
         }
     }
-    
-    // Loose constraint: anything .LE. 1 will pass. 
+
+    // Loose constraint: anything .LE. 1 will pass.
     // (Doesn't require the largest deviations to be around 1.
     // In other words, even max deviations of zero would pass.)
     //EXPECT_LE(sigmas_max_deviation_from_mean, 1.0) ;
-    
-    // tighter constraint: the max deviation with 100 runs 
+
+    // tighter constraint: the max deviation with 100 runs
     // should be pretty close to but still <= 1.0.
     // This specifies the range 0.9 .. 1.0
     EXPECT_NEAR(sigmas_max_deviation_from_mean, 0.95, 0.05) ;
-} 
+}
 
 
 #endif // not _HAVE_GSL
@@ -632,39 +632,39 @@ TEST_F(MonteCarloTest, MonteVarRandom_StlGaussian_distributionMatchesSpec) {
     Trick::MonteVarRandom var8("time_to_fire_1", Trick::MonteVarRandom::GAUSSIAN, "--",
                                 Trick::MonteVarRandom::TRICK_DEFAULT_ENGINE) ;
     exec.add_variable(&var8) ;
-    
+
     double expected_mean  = 10.0 ;
     double expected_sigma = 2.0 ;
-    
+
     var8.set_seed(12345) ;
     var8.set_sigma_range(0) ;
     var8.set_mu(expected_mean) ;
     var8.set_sigma(expected_sigma) ;
     var8.set_min(-10.0) ;
     var8.set_max(10.0) ;
-    
+
     // maintain running sums for calculating mean and variance
     double mean = 0.0 ;
     double sum_variance = 0.0 ;
     int    n = 0 ;
     double delta = 0.0 ;
     int    numRuns = 100 ;
-    
+
     for (int ii = 0; ii <= numRuns; ++ii) {
-        
+
         {
             var8.get_next_value() ;
             str = var8.value ;
             std::stringstream sstream(str) ;
             sstream >> value ;
         }
-        
+
         n++ ;
         delta = value - mean ;
         mean += delta / (double)n ;
         sum_variance += delta * (value - mean) ;
     }
-    
+
     // final statistics
     double variance = sum_variance / (double) (n - 1) ;
     double sigma = sqrt(variance) ;
@@ -674,7 +674,7 @@ TEST_F(MonteCarloTest, MonteVarRandom_StlGaussian_distributionMatchesSpec) {
 }
 
 
-///@breif test relative min/max work as expected for STL 
+///@breif test relative min/max work as expected for STL
 TEST_F(MonteCarloTest, MonteVarRandom_StlGaussian_relativeMinMaxWorks) {
     //req.add_requirement("3932595803");
     std::string str ;
@@ -682,10 +682,10 @@ TEST_F(MonteCarloTest, MonteVarRandom_StlGaussian_relativeMinMaxWorks) {
 
     Trick::MonteVarRandom var6("time_to_fire_1", Trick::MonteVarRandom::GAUSSIAN) ;
     exec.add_variable(&var6) ;
-    
+
     double expected_mean  = 10.0 ;
     double expected_sigma = 2.0 ;
-    
+
     var6.set_seed(12345) ;
     var6.set_sigma_range(0) ;
     var6.set_mu(expected_mean) ;
@@ -694,12 +694,12 @@ TEST_F(MonteCarloTest, MonteVarRandom_StlGaussian_relativeMinMaxWorks) {
     var6.set_max(1.0) ;
     var6.set_min_is_relative(true) ;
     var6.set_max_is_relative(true) ;
-    
+
     // maintain running sums for calculating mean and variance
     int    numRuns = 100 ;
     double saw_min =  1000.0;
     double saw_max = -1000.0;
-    
+
     for (int ii = 0; ii <= numRuns; ++ii) {
         {
             var6.get_next_value() ;
@@ -714,14 +714,14 @@ TEST_F(MonteCarloTest, MonteVarRandom_StlGaussian_relativeMinMaxWorks) {
             saw_max = value;
         }
     }
-    
-    // these conditions should be true if valid 
+
+    // these conditions should be true if valid
     // relative min/max range of 10 +/- 1 is being imposed
     EXPECT_NEAR(9.05, saw_min, 0.05) ;
     EXPECT_NEAR(10.95, saw_max, 0.05) ;
 }
 
-///@breif test relative min/max works after calling set_mu, as expected for STL 
+///@breif test relative min/max works after calling set_mu, as expected for STL
 TEST_F(MonteCarloTest, MonteVarRandom_StlGaussian_callSetMu_relativeMinMaxWorks) {
     //req.add_requirement("3932595803");
     std::string str ;
@@ -729,10 +729,10 @@ TEST_F(MonteCarloTest, MonteVarRandom_StlGaussian_callSetMu_relativeMinMaxWorks)
 
     Trick::MonteVarRandom var11("time_to_fire_1", Trick::MonteVarRandom::GAUSSIAN) ;
     exec.add_variable(&var11) ;
-    
+
     double expected_mean  = 10.0 ;
     double expected_sigma = 2.0 ;
-    
+
     var11.set_seed(12345) ;
     var11.set_sigma_range(0) ;
     var11.set_mu(expected_mean + 100.0) ;
@@ -742,12 +742,12 @@ TEST_F(MonteCarloTest, MonteVarRandom_StlGaussian_callSetMu_relativeMinMaxWorks)
     var11.set_min_is_relative(true) ;
     var11.set_max_is_relative(true) ;
     var11.set_mu(expected_mean) ;
-    
+
     // maintain running sums for calculating mean and variance
     int    numRuns = 100 ;
     double saw_min =  1000.0;
     double saw_max = -1000.0;
-    
+
     for (int ii = 0; ii <= numRuns; ++ii) {
         {
             var11.get_next_value() ;
@@ -762,14 +762,14 @@ TEST_F(MonteCarloTest, MonteVarRandom_StlGaussian_callSetMu_relativeMinMaxWorks)
             saw_max = value;
         }
     }
-    
-    // these conditions should be true if valid 
+
+    // these conditions should be true if valid
     // relative min/max range of 10 +/- 1 is being imposed
     EXPECT_NEAR(9.05, saw_min, 0.05) ;
     EXPECT_NEAR(10.95, saw_max, 0.05) ;
 }
 
-///@breif test absolute min/max works after changing from relative, as expected for STL 
+///@breif test absolute min/max works after changing from relative, as expected for STL
 TEST_F(MonteCarloTest, MonteVarRandom_StlGaussian_changeToAbsolute_MinMaxWorks) {
     //req.add_requirement("3932595803");
     std::string str ;
@@ -777,25 +777,25 @@ TEST_F(MonteCarloTest, MonteVarRandom_StlGaussian_changeToAbsolute_MinMaxWorks)
 
     Trick::MonteVarRandom var11("time_to_fire_1", Trick::MonteVarRandom::GAUSSIAN) ;
     exec.add_variable(&var11) ;
-    
+
     double expected_mean  = 10.0 ;
     double expected_sigma = 2.0 ;
-    
+
     var11.set_seed(12345) ;
     var11.set_sigma_range(0) ;
     var11.set_mu(expected_mean) ;
     var11.set_sigma(expected_sigma) ;
     var11.set_min(9.0) ;
     var11.set_max(11.0) ;
-    
+
     var11.set_min_is_relative(false) ;
     var11.set_max_is_relative(false) ;
-    
+
     // maintain running sums for calculating mean and variance
     int    numRuns = 100 ;
     double saw_min =  1000.0;
     double saw_max = -1000.0;
-    
+
     for (int ii = 0; ii <= numRuns; ++ii) {
         {
             var11.get_next_value() ;
@@ -810,8 +810,8 @@ TEST_F(MonteCarloTest, MonteVarRandom_StlGaussian_changeToAbsolute_MinMaxWorks)
             saw_max = value;
         }
     }
-    
-    // these conditions should be true if valid 
+
+    // these conditions should be true if valid
     // relative min/max range of 10 +/- 1 is being imposed
     EXPECT_NEAR(9.05, saw_min, 0.05) ;
     EXPECT_NEAR(10.95, saw_max, 0.05) ;
@@ -825,10 +825,10 @@ TEST_F(MonteCarloTest, MonteVarRandom_StlGaussian_setSeed_TakesEffect) {
 
     Trick::MonteVarRandom var10("time_to_fire_1", Trick::MonteVarRandom::GAUSSIAN) ;
     exec.add_variable(&var10) ;
-    
+
     double expected_mean  = 10.0 ;
     double expected_sigma = 2.0 ;
-    
+
     var10.set_seed(12345) ;
     var10.set_sigma_range(0) ;
     var10.set_mu(expected_mean) ;
@@ -837,9 +837,9 @@ TEST_F(MonteCarloTest, MonteVarRandom_StlGaussian_setSeed_TakesEffect) {
     var10.set_max(10.0) ;
     var10.set_min_is_relative(true) ;
     var10.set_max_is_relative(true) ;
-    
+
     int numRuns = 10;
-    
+
     for (int ii = 0; ii < numRuns; ++ii) {
         {
             var10.get_next_value() ;
@@ -849,9 +849,9 @@ TEST_F(MonteCarloTest, MonteVarRandom_StlGaussian_setSeed_TakesEffect) {
         }
     }
     double first_value = value;
-    
+
     var10.set_seed(12345) ;
-    
+
     for (int ii = 0; ii < numRuns; ++ii) {
         {
             var10.get_next_value() ;
@@ -861,7 +861,7 @@ TEST_F(MonteCarloTest, MonteVarRandom_StlGaussian_setSeed_TakesEffect) {
         }
     }
     double second_value = value;
-    
+
     EXPECT_NEAR(first_value, second_value, 0.000001) ;
 }
 
diff --git a/trick_source/sim_services/RealtimeSync/RealtimeSync_c_intf.cpp b/trick_source/sim_services/RealtimeSync/RealtimeSync_c_intf.cpp
index 9d343075..c3f38c7b 100644
--- a/trick_source/sim_services/RealtimeSync/RealtimeSync_c_intf.cpp
+++ b/trick_source/sim_services/RealtimeSync/RealtimeSync_c_intf.cpp
@@ -103,14 +103,14 @@ extern "C" int real_time_lock_memory(int yes_no) {
     int ret = 0 ;
 #if __linux
     if ( yes_no ) {
-        if ((ret = mlockall(MCL_CURRENT | MCL_FUTURE)) != 0 ) { 
+        if ((ret = mlockall(MCL_CURRENT | MCL_FUTURE)) != 0 ) {
             perror("Error locking memory.");
             message_publish(MSG_ERROR, "Error %d when requesting memory lock.\n", errno);
         } else {
             message_publish(MSG_INFO, "Sim locked memory\n");
         }
     } else {
-        if ( (ret = munlockall()) != 0 ) { 
+        if ( (ret = munlockall()) != 0 ) {
             perror("Error unlocking memory.");
             message_publish(MSG_ERROR, "Error %d when requesting memory unlock.\n", errno);
         } else {
diff --git a/trick_source/sim_services/ScheduledJobQueue/ScheduledJobQueue.cpp b/trick_source/sim_services/ScheduledJobQueue/ScheduledJobQueue.cpp
index a43602ca..c05e8691 100644
--- a/trick_source/sim_services/ScheduledJobQueue/ScheduledJobQueue.cpp
+++ b/trick_source/sim_services/ScheduledJobQueue/ScheduledJobQueue.cpp
@@ -45,7 +45,7 @@ Trick::ScheduledJobQueue::~ScheduledJobQueue( ) {
 -# Increment the size of the queue.
 */
 int Trick::ScheduledJobQueue::push( JobData * new_job ) {
- 
+
     unsigned int ii , jj ;
 
     /* Allocate additional memory for the additional job in the queue */
@@ -53,7 +53,7 @@ int Trick::ScheduledJobQueue::push( JobData * new_job ) {
 
     new_job->set_handled(true) ;
 
-    /* Find the correct insertion spot in the queue by comparing 
+    /* Find the correct insertion spot in the queue by comparing
        the job_class, the phase, the sim_object id, and the job_id in that order. */
     /* While searching for the correct insertion spot, copy all jobs that precede
        the incoming job to the newly allocated queue space. */
@@ -280,7 +280,7 @@ Trick::JobData * Trick::ScheduledJobQueue::get_next_job() {
     /* return NULL if we are at the end of the list  */
     if ( curr_index >= list_size ) {
         curr_index = list_size ;
-        return(NULL) ; 
+        return(NULL) ;
     } else {
         /* return the next enabled job, or NULL if we reach the end of the list */
         while (curr_index < list_size ) {
@@ -290,7 +290,7 @@ Trick::JobData * Trick::ScheduledJobQueue::get_next_job() {
             }
         }
     }
-    return(NULL) ; 
+    return(NULL) ;
 }
 
 /**
@@ -305,7 +305,7 @@ Trick::JobData * Trick::ScheduledJobQueue::get_next_job() {
            set the overall job call time to the current job's next job call time.
         -# Increment the #curr_index.
         -# Return the current job if the job is enabled.
-    -# Else 
+    -# Else
         -# If the job's next job call time is lower than the overall next job call time
            set the overall job call time to the current job's next job call time.
         -# Increment the #curr_index.
diff --git a/trick_source/sim_services/ScheduledJobQueue/test/ScheduledJobQueue_test.cpp b/trick_source/sim_services/ScheduledJobQueue/test/ScheduledJobQueue_test.cpp
index 9880793c..ba1c3cc5 100644
--- a/trick_source/sim_services/ScheduledJobQueue/test/ScheduledJobQueue_test.cpp
+++ b/trick_source/sim_services/ScheduledJobQueue/test/ScheduledJobQueue_test.cpp
@@ -17,8 +17,8 @@ class ScheduledJobQueueTest : public ::testing::Test {
 
         ScheduledJobQueueTest() {}
         ~ScheduledJobQueueTest() {}
-        virtual void SetUp() {} 
-        virtual void TearDown() {} 
+        virtual void SetUp() {}
+        virtual void TearDown() {}
 
 } ;
 
@@ -30,22 +30,22 @@ TEST_F( ScheduledJobQueueTest , PushJobsbyJobOrder ) {
     EXPECT_EQ( sjq.size() , (unsigned int)0) ;
     EXPECT_TRUE( sjq.empty() ) ;
 
-    job_ptr = new Trick::JobData(0, 2 , "class_100", NULL, 1.0 , "job_1") ; 
+    job_ptr = new Trick::JobData(0, 2 , "class_100", NULL, 1.0 , "job_1") ;
     job_ptr->sim_object_id = 1 ;
     job_ptr->job_class = 100 ;
     sjq.push(job_ptr) ;
 
-    job_ptr = new Trick::JobData(0, 2 , "class_100", NULL, 1.0 , "job_2") ; 
+    job_ptr = new Trick::JobData(0, 2 , "class_100", NULL, 1.0 , "job_2") ;
     job_ptr->sim_object_id = 1 ;
     job_ptr->job_class = 100 ;
     sjq.push(job_ptr) ;
 
-    job_ptr = new Trick::JobData(0, 2 , "class_100", NULL, 1.0 , "job_3") ; 
+    job_ptr = new Trick::JobData(0, 2 , "class_100", NULL, 1.0 , "job_3") ;
     job_ptr->sim_object_id = 1 ;
     job_ptr->job_class = 100 ;
     sjq.push(job_ptr) ;
 
-    job_ptr = new Trick::JobData(0, 2 , "class_100", NULL, 1.0 , "job_4") ; 
+    job_ptr = new Trick::JobData(0, 2 , "class_100", NULL, 1.0 , "job_4") ;
     job_ptr->sim_object_id = 1 ;
     job_ptr->job_class = 100 ;
     sjq.push(job_ptr) ;
@@ -77,22 +77,22 @@ TEST_F( ScheduledJobQueueTest , PushJobsbySimObjectOrder ) {
 
     EXPECT_EQ( sjq.size() , (unsigned int)0) ;
 
-    job_ptr = new Trick::JobData(0, 2 , "class_100", NULL, 1.0 , "job_3") ; 
+    job_ptr = new Trick::JobData(0, 2 , "class_100", NULL, 1.0 , "job_3") ;
     job_ptr->sim_object_id = 3 ;
     job_ptr->job_class = 100 ;
     sjq.push(job_ptr) ;
 
-    job_ptr = new Trick::JobData(0, 2 , "class_100", NULL, 1.0 , "job_4") ; 
+    job_ptr = new Trick::JobData(0, 2 , "class_100", NULL, 1.0 , "job_4") ;
     job_ptr->sim_object_id = 4 ;
     job_ptr->job_class = 100 ;
     sjq.push(job_ptr) ;
 
-    job_ptr = new Trick::JobData(0, 2 , "class_100", NULL, 1.0 , "job_1") ; 
+    job_ptr = new Trick::JobData(0, 2 , "class_100", NULL, 1.0 , "job_1") ;
     job_ptr->sim_object_id = 1 ;
     job_ptr->job_class = 100 ;
     sjq.push(job_ptr) ;
 
-    job_ptr = new Trick::JobData(0, 2 , "class_100", NULL, 1.0 , "job_2") ; 
+    job_ptr = new Trick::JobData(0, 2 , "class_100", NULL, 1.0 , "job_2") ;
     job_ptr->sim_object_id = 2 ;
     job_ptr->job_class = 100 ;
     sjq.push(job_ptr) ;
@@ -120,22 +120,22 @@ TEST_F( ScheduledJobQueueTest , PushJobsbyPhaseOrder ) {
 
     EXPECT_EQ( sjq.size() , (unsigned int)0) ;
 
-    job_ptr = new Trick::JobData(0, 2 , "class_100", NULL, 1.0 , "job_3", "", 3) ; 
+    job_ptr = new Trick::JobData(0, 2 , "class_100", NULL, 1.0 , "job_3", "", 3) ;
     job_ptr->sim_object_id = 1 ;
     job_ptr->job_class = 100 ;
     sjq.push(job_ptr) ;
 
-    job_ptr = new Trick::JobData(0, 2 , "class_100", NULL, 1.0 , "job_4", "", 4) ; 
+    job_ptr = new Trick::JobData(0, 2 , "class_100", NULL, 1.0 , "job_4", "", 4) ;
     job_ptr->sim_object_id = 1 ;
     job_ptr->job_class = 100 ;
     sjq.push(job_ptr) ;
 
-    job_ptr = new Trick::JobData(0, 2 , "class_100", NULL, 1.0 , "job_1", "", 1) ; 
+    job_ptr = new Trick::JobData(0, 2 , "class_100", NULL, 1.0 , "job_1", "", 1) ;
     job_ptr->sim_object_id = 1 ;
     job_ptr->job_class = 100 ;
     sjq.push(job_ptr) ;
 
-    job_ptr = new Trick::JobData(0, 2 , "class_100", NULL, 1.0 , "job_2", "", 2) ; 
+    job_ptr = new Trick::JobData(0, 2 , "class_100", NULL, 1.0 , "job_2", "", 2) ;
     job_ptr->sim_object_id = 1 ;
     job_ptr->job_class = 100 ;
     sjq.push(job_ptr) ;
@@ -163,22 +163,22 @@ TEST_F( ScheduledJobQueueTest , PushJobsbyJobClassOrder ) {
 
     EXPECT_EQ( sjq.size() , (unsigned int)0) ;
 
-    job_ptr = new Trick::JobData(0, 2 , "class_103", NULL, 1.0 , "job_3", "", 1) ; 
+    job_ptr = new Trick::JobData(0, 2 , "class_103", NULL, 1.0 , "job_3", "", 1) ;
     job_ptr->sim_object_id = 1 ;
     job_ptr->job_class = 103 ;
     sjq.push(job_ptr) ;
 
-    job_ptr = new Trick::JobData(0, 2 , "class_101", NULL, 1.0 , "job_4", "", 1) ; 
+    job_ptr = new Trick::JobData(0, 2 , "class_101", NULL, 1.0 , "job_4", "", 1) ;
     job_ptr->sim_object_id = 1 ;
     job_ptr->job_class = 104 ;
     sjq.push(job_ptr) ;
 
-    job_ptr = new Trick::JobData(0, 2 , "class_102", NULL, 1.0 , "job_1", "", 1) ; 
+    job_ptr = new Trick::JobData(0, 2 , "class_102", NULL, 1.0 , "job_1", "", 1) ;
     job_ptr->sim_object_id = 1 ;
     job_ptr->job_class = 101 ;
     sjq.push(job_ptr) ;
 
-    job_ptr = new Trick::JobData(0, 2 , "class_100", NULL, 1.0 , "job_2", "", 1) ; 
+    job_ptr = new Trick::JobData(0, 2 , "class_100", NULL, 1.0 , "job_2", "", 1) ;
     job_ptr->sim_object_id = 1 ;
     job_ptr->job_class = 102 ;
     sjq.push(job_ptr) ;
@@ -206,22 +206,22 @@ TEST_F( ScheduledJobQueueTest , PushJobsIgnoreSimObject ) {
 
     EXPECT_EQ( sjq.size() , (unsigned int)0) ;
 
-    job_ptr = new Trick::JobData(0, 2 , "class_103", NULL, 1.0 , "job_1", "", 1) ; 
+    job_ptr = new Trick::JobData(0, 2 , "class_103", NULL, 1.0 , "job_1", "", 1) ;
     job_ptr->sim_object_id = 3 ;
     job_ptr->job_class = 100 ;
     sjq.push_ignore_sim_object(job_ptr) ;
 
-    job_ptr = new Trick::JobData(0, 2 , "class_101", NULL, 1.0 , "job_2", "", 1) ; 
+    job_ptr = new Trick::JobData(0, 2 , "class_101", NULL, 1.0 , "job_2", "", 1) ;
     job_ptr->sim_object_id = 4 ;
     job_ptr->job_class = 100 ;
     sjq.push_ignore_sim_object(job_ptr) ;
 
-    job_ptr = new Trick::JobData(0, 2 , "class_102", NULL, 1.0 , "job_3", "", 1) ; 
+    job_ptr = new Trick::JobData(0, 2 , "class_102", NULL, 1.0 , "job_3", "", 1) ;
     job_ptr->sim_object_id = 1 ;
     job_ptr->job_class = 100 ;
     sjq.push_ignore_sim_object(job_ptr) ;
 
-    job_ptr = new Trick::JobData(0, 2 , "class_100", NULL, 1.0 , "job_4", "", 1) ; 
+    job_ptr = new Trick::JobData(0, 2 , "class_100", NULL, 1.0 , "job_4", "", 1) ;
     job_ptr->sim_object_id = 2 ;
     job_ptr->job_class = 100 ;
     sjq.push_ignore_sim_object(job_ptr) ;
@@ -249,22 +249,22 @@ TEST_F( ScheduledJobQueueTest , TopJob ) {
 
     EXPECT_TRUE( sjq.top() == NULL ) ;
 
-    job_ptr = new Trick::JobData(0, 2 , "class_100", NULL, 1.0 , "job_1") ; 
+    job_ptr = new Trick::JobData(0, 2 , "class_100", NULL, 1.0 , "job_1") ;
     job_ptr->sim_object_id = 1 ;
     job_ptr->job_class = 100 ;
     sjq.push(job_ptr) ;
 
-    job_ptr = new Trick::JobData(0, 2 , "class_100", NULL, 1.0 , "job_2") ; 
+    job_ptr = new Trick::JobData(0, 2 , "class_100", NULL, 1.0 , "job_2") ;
     job_ptr->sim_object_id = 1 ;
     job_ptr->job_class = 100 ;
     sjq.push(job_ptr) ;
 
-    job_ptr = new Trick::JobData(0, 2 , "class_100", NULL, 1.0 , "job_3") ; 
+    job_ptr = new Trick::JobData(0, 2 , "class_100", NULL, 1.0 , "job_3") ;
     job_ptr->sim_object_id = 1 ;
     job_ptr->job_class = 100 ;
     sjq.push(job_ptr) ;
 
-    job_ptr = new Trick::JobData(0, 2 , "class_100", NULL, 1.0 , "job_4") ; 
+    job_ptr = new Trick::JobData(0, 2 , "class_100", NULL, 1.0 , "job_4") ;
     job_ptr->sim_object_id = 1 ;
     job_ptr->job_class = 100 ;
     sjq.push(job_ptr) ;
@@ -290,28 +290,28 @@ TEST_F( ScheduledJobQueueTest , FindNextJob ) {
     Trick::JobData * job_ptr ;
     long long curr_time ;
 
-    job_ptr = new Trick::JobData(0, 2 , "class_100", NULL, 1.0 , "job_1") ; 
+    job_ptr = new Trick::JobData(0, 2 , "class_100", NULL, 1.0 , "job_1") ;
     job_ptr->sim_object_id = 1 ;
     job_ptr->job_class = 100 ;
     job_ptr->cycle_tics = (long long)(job_ptr->cycle * 1000000) ;
     job_ptr->stop_tics = 1000000000 ;
     sjq.push(job_ptr) ;
 
-    job_ptr = new Trick::JobData(0, 2 , "class_100", NULL, 2.0 , "job_2") ; 
+    job_ptr = new Trick::JobData(0, 2 , "class_100", NULL, 2.0 , "job_2") ;
     job_ptr->sim_object_id = 1 ;
     job_ptr->job_class = 100 ;
     job_ptr->cycle_tics = (long long)(job_ptr->cycle * 1000000) ;
     job_ptr->stop_tics = 1000000000 ;
     sjq.push(job_ptr) ;
 
-    job_ptr = new Trick::JobData(0, 2 , "class_100", NULL, 4.0 , "job_3") ; 
+    job_ptr = new Trick::JobData(0, 2 , "class_100", NULL, 4.0 , "job_3") ;
     job_ptr->sim_object_id = 1 ;
     job_ptr->job_class = 100 ;
     job_ptr->cycle_tics = (long long)(job_ptr->cycle * 1000000) ;
     job_ptr->stop_tics = 1000000000 ;
     sjq.push(job_ptr) ;
 
-    // Time = 0.0 
+    // Time = 0.0
     curr_time = 0 ;
     sjq.reset_curr_index() ;
     sjq.set_next_job_call_time(1000000000) ;
@@ -328,7 +328,7 @@ TEST_F( ScheduledJobQueueTest , FindNextJob ) {
     job_ptr = sjq.find_next_job(curr_time) ;
     EXPECT_TRUE( job_ptr == NULL ) ;
 
-    // Time = 1.0 
+    // Time = 1.0
     curr_time = sjq.get_next_job_call_time() ;
     EXPECT_EQ( curr_time , 1000000 ) ;
     sjq.reset_curr_index() ;
@@ -340,7 +340,7 @@ TEST_F( ScheduledJobQueueTest , FindNextJob ) {
     job_ptr = sjq.find_next_job(curr_time) ;
     EXPECT_TRUE( job_ptr == NULL ) ;
 
-    // Time = 2.0 
+    // Time = 2.0
     curr_time = sjq.get_next_job_call_time() ;
     EXPECT_EQ( curr_time , 2000000 ) ;
     sjq.reset_curr_index() ;
@@ -355,7 +355,7 @@ TEST_F( ScheduledJobQueueTest , FindNextJob ) {
     job_ptr = sjq.find_next_job(curr_time) ;
     EXPECT_TRUE( job_ptr == NULL ) ;
 
-    // Time = 3.0 
+    // Time = 3.0
     curr_time = sjq.get_next_job_call_time() ;
     EXPECT_EQ( curr_time , 3000000 ) ;
     sjq.reset_curr_index() ;
@@ -367,7 +367,7 @@ TEST_F( ScheduledJobQueueTest , FindNextJob ) {
     job_ptr = sjq.find_next_job(curr_time) ;
     EXPECT_TRUE( job_ptr == NULL ) ;
 
-    // Time = 4.0 
+    // Time = 4.0
     curr_time = sjq.get_next_job_call_time() ;
     EXPECT_EQ( curr_time , 4000000 ) ;
     sjq.reset_curr_index() ;
@@ -385,7 +385,7 @@ TEST_F( ScheduledJobQueueTest , FindNextJob ) {
     job_ptr = sjq.find_next_job(curr_time) ;
     EXPECT_TRUE( job_ptr == NULL ) ;
 
-    // Time = 5.0 
+    // Time = 5.0
     curr_time = sjq.get_next_job_call_time() ;
     EXPECT_EQ( curr_time , 5000000 ) ;
     sjq.reset_curr_index() ;
@@ -399,12 +399,12 @@ TEST_F( ScheduledJobQueueTest , FindNextJob ) {
 }
 
 TEST_F( ScheduledJobQueueTest , TestNextJob ) {
-	//req.add_requirement("1758653947 3664773300");	
+	//req.add_requirement("1758653947 3664773300");
 
     Trick::JobData * job_ptr ;
     long long curr_time ;
 
-    job_ptr = new Trick::JobData(0, 2 , "class_100", NULL, 3.0 , "job_1") ; 
+    job_ptr = new Trick::JobData(0, 2 , "class_100", NULL, 3.0 , "job_1") ;
     job_ptr->sim_object_id = 1 ;
     job_ptr->job_class = 100 ;
     job_ptr->cycle_tics = (long long)(job_ptr->cycle * 1000000) ;
@@ -412,7 +412,7 @@ TEST_F( ScheduledJobQueueTest , TestNextJob ) {
     job_ptr->system_job_class = true ;
     sjq.push(job_ptr) ;
 
-    job_ptr = new Trick::JobData(0, 2 , "class_100", NULL, 1.0 , "job_2") ; 
+    job_ptr = new Trick::JobData(0, 2 , "class_100", NULL, 1.0 , "job_2") ;
     job_ptr->sim_object_id = 1 ;
     job_ptr->job_class = 100 ;
     job_ptr->cycle_tics = (long long)(job_ptr->cycle * 1000000) ;
@@ -420,7 +420,7 @@ TEST_F( ScheduledJobQueueTest , TestNextJob ) {
     job_ptr->system_job_class = true ;
     sjq.push(job_ptr) ;
 
-    job_ptr = new Trick::JobData(0, 2 , "class_100", NULL, 2.0 , "job_3") ; 
+    job_ptr = new Trick::JobData(0, 2 , "class_100", NULL, 2.0 , "job_3") ;
     job_ptr->sim_object_id = 1 ;
     job_ptr->job_class = 100 ;
     job_ptr->cycle_tics = (long long)(job_ptr->cycle * 1000000) ;
@@ -428,7 +428,7 @@ TEST_F( ScheduledJobQueueTest , TestNextJob ) {
     job_ptr->system_job_class = true ;
     sjq.push(job_ptr) ;
 
-    // Time = 0.0 
+    // Time = 0.0
     curr_time = 0 ;
     sjq.reset_curr_index() ;
     sjq.set_next_job_call_time(1000000000) ;
@@ -458,7 +458,7 @@ TEST_F( ScheduledJobQueueTest , TestNextJob ) {
     sjq.set_next_job_call_time(1000000000) ;
     EXPECT_EQ( sjq.get_next_job_call_time() , 1000000 ) ;
 
-    // Time = 1.0 
+    // Time = 1.0
     curr_time = sjq.get_next_job_call_time() ;
     EXPECT_EQ( curr_time , 1000000 ) ;
     sjq.reset_curr_index() ;
@@ -473,7 +473,7 @@ TEST_F( ScheduledJobQueueTest , TestNextJob ) {
     job_ptr = sjq.find_next_job(curr_time) ;
     EXPECT_TRUE( job_ptr == NULL ) ;
 
-    // Time = 2.0 
+    // Time = 2.0
     curr_time = sjq.get_next_job_call_time() ;
     EXPECT_EQ( curr_time , 2000000 ) ;
     sjq.reset_curr_index() ;
@@ -494,7 +494,7 @@ TEST_F( ScheduledJobQueueTest , TestNextJob ) {
     job_ptr = sjq.find_next_job(curr_time) ;
     EXPECT_TRUE( job_ptr == NULL ) ;
 
-    // Time = 3.0 
+    // Time = 3.0
     sjq.reset_curr_index() ;
     sjq.set_next_job_call_time(1000000000) ;
     curr_time = sjq.get_next_job_call_time() ;
@@ -521,27 +521,27 @@ TEST_F( ScheduledJobQueueTest , InstrumentBeforeAll ) {
 
     Trick::JobData * job_ptr ;
 
-    job_ptr = new Trick::JobData(0, 2 , "class_100", NULL, 1.0 , "job_1") ; 
+    job_ptr = new Trick::JobData(0, 2 , "class_100", NULL, 1.0 , "job_1") ;
     job_ptr->sim_object_id = 1 ;
     job_ptr->job_class = 100 ;
     sjq.push(job_ptr) ;
 
-    job_ptr = new Trick::JobData(0, 2 , "class_100", NULL, 1.0 , "job_2") ; 
+    job_ptr = new Trick::JobData(0, 2 , "class_100", NULL, 1.0 , "job_2") ;
     job_ptr->sim_object_id = 1 ;
     job_ptr->job_class = 100 ;
     sjq.push(job_ptr) ;
 
-    job_ptr = new Trick::JobData(0, 2 , "class_100", NULL, 1.0 , "job_3") ; 
+    job_ptr = new Trick::JobData(0, 2 , "class_100", NULL, 1.0 , "job_3") ;
     job_ptr->sim_object_id = 1 ;
     job_ptr->job_class = 100 ;
     sjq.push(job_ptr) ;
 
-    job_ptr = new Trick::JobData(0, 2 , "class_100", NULL, 1.0 , "job_4") ; 
+    job_ptr = new Trick::JobData(0, 2 , "class_100", NULL, 1.0 , "job_4") ;
     job_ptr->sim_object_id = 1 ;
     job_ptr->job_class = 100 ;
     sjq.push(job_ptr) ;
 
-    job_ptr = new Trick::JobData(0, 2 , "instrumentation", NULL, 1.0 , "instrument_1") ; 
+    job_ptr = new Trick::JobData(0, 2 , "instrumentation", NULL, 1.0 , "instrument_1") ;
     sjq.instrument_before( job_ptr ) ;
 
 }
diff --git a/trick_source/sim_services/SimTime/SimTime.cpp b/trick_source/sim_services/SimTime/SimTime.cpp
index 4c515e27..fb439c5a 100644
--- a/trick_source/sim_services/SimTime/SimTime.cpp
+++ b/trick_source/sim_services/SimTime/SimTime.cpp
@@ -49,39 +49,39 @@ int Trick::SimTime::init_times() {
 }
 
 double Trick::SimTime::get_rettime() {
-    
+
     return(exec_get_sim_time());
 
 }
 
 double Trick::SimTime::get_gmttime() {
-    
+
     return(exec_get_sim_time() + gmt_sec_ref);
 
 }
 
 double Trick::SimTime::get_mettime() {
-    
+
     return(exec_get_sim_time() + met_sec_ref);
 
 }
 
 TIME_OFFSET * Trick::SimTime::get_rettime_struct() {
-    
+
     GET_TIME(ret_time, 0.0);
 
     return(&ret_time) ;
 }
 
 TIME_OFFSET * Trick::SimTime::get_gmttime_struct() {
-    
+
     GET_TIME(gmt_time, gmt_sec_ref);
 
     return(&gmt_time) ;
 }
 
 TIME_OFFSET * Trick::SimTime::get_mettime_struct() {
-    
+
     GET_TIME(met_time, met_sec_ref);
 
     return(&met_time) ;
diff --git a/trick_source/sim_services/ThreadBase/ThreadBase.cpp b/trick_source/sim_services/ThreadBase/ThreadBase.cpp
index db0d7845..0873f770 100644
--- a/trick_source/sim_services/ThreadBase/ThreadBase.cpp
+++ b/trick_source/sim_services/ThreadBase/ThreadBase.cpp
@@ -168,7 +168,7 @@ int Trick::ThreadBase::execute_priority() {
             min_priority = sched_get_priority_min(SCHED_FIFO);
 
             /* Since Trick's max priority starts at 1 and moves to lower priorties as the number goes up and Linux's
-               priorities goes up as the number goes up and maxes out at "max_priority", we need to offset as follows: 
+               priorities goes up as the number goes up and maxes out at "max_priority", we need to offset as follows:
              */
             proc_priority = max_priority - (rt_priority - 1);
 
@@ -236,7 +236,7 @@ int Trick::ThreadBase::execute_priority() {
         if (proc_priority < min_priority) {
 
             message_publish(MSG_WARNING, "Warning: Trick CPU priority at %d is too low.\n", rt_priority);
-            message_publish(MSG_WARNING, "This corresponds to a Darwin thread priority of %d.\n", proc_priority); 
+            message_publish(MSG_WARNING, "This corresponds to a Darwin thread priority of %d.\n", proc_priority);
             message_publish(MSG_WARNING, "The Darwin thread priority range is %d:%d (min:max).\n", min_priority, max_priority);
             message_publish(MSG_WARNING, "The corresponding minimum Trick priority is %d.\n", (max_priority - min_priority) + 1);
             message_publish(MSG_WARNING, "Setting Trick priority to minimum!\n");
@@ -245,7 +245,7 @@ int Trick::ThreadBase::execute_priority() {
         } else if (proc_priority > max_priority) {
 
             message_publish(MSG_WARNING, "Warning: Trick CPU priority at %d is too high.\n", rt_priority);
-            message_publish(MSG_WARNING, "This corresponds to a Darwin thread priority of %d.\n", proc_priority); 
+            message_publish(MSG_WARNING, "This corresponds to a Darwin thread priority of %d.\n", proc_priority);
             message_publish(MSG_WARNING, "The Darwin thread priority range is %d:%d (min:max).\n", min_priority, max_priority);
             message_publish(MSG_WARNING, "The maximum Trick priority is 1. Setting to maximum!\n");
             proc_priority = max_priority;
diff --git a/trick_source/sim_services/Timer/test/ITimer_test.cpp b/trick_source/sim_services/Timer/test/ITimer_test.cpp
index cab4fb59..cccb5df2 100644
--- a/trick_source/sim_services/Timer/test/ITimer_test.cpp
+++ b/trick_source/sim_services/Timer/test/ITimer_test.cpp
@@ -86,7 +86,7 @@ TEST_F(ITimerTest, TimerNotEnabled) {
 TEST_F(ITimerTest, TimerStartSuccess) {
     //req.add_requirement("timer");
 	//"The ITimer shall sleep when commanded, thereby releasing the processor for a specified amount of time.");
-	
+
 	sec = 0.05;
 
 	Trick::ITimer *iTim;
@@ -94,7 +94,7 @@ TEST_F(ITimerTest, TimerStartSuccess) {
 
 	iTim->init();
 	iTim->enable();
-	
+
 	tim_st = dClk.wall_clock_time();
 
 	iTim->start(sec);
@@ -103,7 +103,7 @@ TEST_F(ITimerTest, TimerStartSuccess) {
 	/* Cause simulation to wait until "sec" seconds have passed */
 	iTim->pause();
 
-	tim_elap = dClk.wall_clock_time() - tim_st;	
+	tim_elap = dClk.wall_clock_time() - tim_st;
 	EXPECT_NEAR((tim_elap+2000), sec*1e6, TOL);
 
 	delete iTim;
@@ -140,12 +140,12 @@ TEST_F(ITimerTest, TimerStartReset) {
 TEST_F(ITimerTest, TimerStartStop) {
     //req.add_requirement("timer");
 	//"The ITimer shall stop when commanded if the time until alarm has not yet expired.");
- 
+
     sec = 0.05;
- 
+
     Trick::ITimer *iTim;
     iTim = new Trick::ITimer;
- 
+
     iTim->init();
     iTim->enable();
 
@@ -164,8 +164,8 @@ TEST_F(ITimerTest, TimerStartStop) {
     tim_elap = dClk.wall_clock_time() - tim_st;
 
 	EXPECT_NEAR(tim_elap, 0, TOL);
-	
-    
+
+
     delete iTim;
 }
 
@@ -173,12 +173,12 @@ TEST_F(ITimerTest, TimerStartStop) {
 TEST_F(ITimerTest, TimerStartFailure) {
     //req.add_requirement("timer");
 	//"The ITimer shall not initiate with start times that are negative or less than 10 ms");
-	
+
 	sec = 0.05;
 
     Trick::ITimer *iTim;
     iTim = new Trick::ITimer;
- 
+
     iTim->init();
     iTim->enable();
 
diff --git a/trick_source/sim_services/VariableServer/VariableServerThread_write_data.cpp b/trick_source/sim_services/VariableServer/VariableServerThread_write_data.cpp
index 4de30101..6ebf9726 100644
--- a/trick_source/sim_services/VariableServer/VariableServerThread_write_data.cpp
+++ b/trick_source/sim_services/VariableServer/VariableServerThread_write_data.cpp
@@ -126,7 +126,7 @@ int Trick::VariableServerThread::write_binary_data( int Start, char *buf1, int P
                         // TRICK_NUMBER_OF_TYPES is an error case
                         temp_i = 0 ;
                         memcpy(&buf1[offset] , &temp_i , (size_t)size) ;
-                    break ; 
+                    break ;
                     default:
                         memcpy(&buf1[offset] , address , (size_t)size) ;
                     break ;
diff --git a/trick_source/trick_swig/swig_global_vars.cpp b/trick_source/trick_swig/swig_global_vars.cpp
index da23ed61..8e732ad5 100644
--- a/trick_source/trick_swig/swig_global_vars.cpp
+++ b/trick_source/trick_swig/swig_global_vars.cpp
@@ -2,14 +2,14 @@
 #ifndef SWIGUNUSED
 # if defined(__GNUC__)
 #   if !(defined(__cplusplus)) || (__GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 4))
-#     define SWIGUNUSED __attribute__ ((__unused__)) 
+#     define SWIGUNUSED __attribute__ ((__unused__))
 #   else
 #     define SWIGUNUSED
 #   endif
 # elif defined(__ICC)
-#   define SWIGUNUSED __attribute__ ((__unused__)) 
+#   define SWIGUNUSED __attribute__ ((__unused__))
 # else
-#   define SWIGUNUSED 
+#   define SWIGUNUSED
 # endif
 #endif
 
@@ -17,7 +17,7 @@
 # ifdef __cplusplus
 #   define SWIGUNUSEDPARM(p)
 # else
-#   define SWIGUNUSEDPARM(p) p SWIGUNUSED 
+#   define SWIGUNUSEDPARM(p) p SWIGUNUSED
 # endif
 #endif
 
@@ -50,7 +50,7 @@ SWIG_Python_str_AsChar(PyObject *str)
 #if PY_VERSION_HEX >= 0x03000000
 #  define SWIG_Python_str_DelForPy3(x) free( (void*) (x) )
 #else
-#  define SWIG_Python_str_DelForPy3(x) 
+#  define SWIG_Python_str_DelForPy3(x)
 #endif
 
 extern "C" {
@@ -197,7 +197,7 @@ extern "C" {
         (char *)"swigvarlink",              /* Type name (tp_name) */
         sizeof(swig_varlinkobject),         /* Basic size (tp_basicsize) */
         0,                                  /* Itemsize (tp_itemsize) */
-        (destructor) swig_varlink_dealloc,  /* Deallocator (tp_dealloc) */ 
+        (destructor) swig_varlink_dealloc,  /* Deallocator (tp_dealloc) */
         (printfunc) swig_varlink_print,     /* Print (tp_print) */
         (getattrfunc) swig_varlink_getattr, /* get attr (tp_getattr) */
         (setattrfunc) swig_varlink_setattr, /* Set attr (tp_setattr) */
diff --git a/trick_source/trick_utils/comm/src/tc_accept.c b/trick_source/trick_utils/comm/src/tc_accept.c
index a66c9309..4541f716 100644
--- a/trick_source/trick_utils/comm/src/tc_accept.c
+++ b/trick_source/trick_utils/comm/src/tc_accept.c
@@ -86,8 +86,8 @@ int tc_accept_(TCDevice * listen_device, TCDevice * device, const char *file, in
         }
     }
 
-    /* 
-     *  After accept, initialize device & Shake hands with client  
+    /*
+     *  After accept, initialize device & Shake hands with client
      */
 
     /* Save the address of the new connection */
diff --git a/trick_source/trick_utils/comm/src/tc_clock_init.c b/trick_source/trick_utils/comm/src/tc_clock_init.c
index 5dab8a1f..834d30dd 100644
--- a/trick_source/trick_utils/comm/src/tc_clock_init.c
+++ b/trick_source/trick_utils/comm/src/tc_clock_init.c
@@ -1,5 +1,5 @@
 
-/* 
+/*
  *  Get system clock reference time
  */
 
diff --git a/trick_source/trick_utils/comm/src/tc_connect.c b/trick_source/trick_utils/comm/src/tc_connect.c
index ff00eaff..c066af4d 100644
--- a/trick_source/trick_utils/comm/src/tc_connect.c
+++ b/trick_source/trick_utils/comm/src/tc_connect.c
@@ -37,8 +37,8 @@ int tc_connect_(TCDevice * device, const char *file, int line)
 #endif
 
 
-    /* 
-     * Connection disabled? 
+    /*
+     * Connection disabled?
      */
     if (!device) {
         TrickErrorHndlr *temp_error_hndlr = NULL;
@@ -57,8 +57,8 @@ int tc_connect_(TCDevice * device, const char *file, int line)
         return (TC_CONN_DISABLED);
     }
 
-    /* 
-     * Set up error handling 
+    /*
+     * Set up error handling
      */
     if (device->client_tag[0] == '\0') {
         strcpy(device->client_tag, "<empty>");
@@ -79,8 +79,8 @@ int tc_connect_(TCDevice * device, const char *file, int line)
     }
 #endif
 
-   /* 
-    * Open socket 
+   /*
+    * Open socket
     */
 
     the_socket = socket( TRICKCOMM_SOCKET_FAMILY, SOCK_STREAM, TRICKCOMM_SOCKET_PROTO );
@@ -97,8 +97,8 @@ int tc_connect_(TCDevice * device, const char *file, int line)
     setsockopt(the_socket, IPPROTO_TCP, TCP_NODELAY, (const char *) &on, (socklen_t) sizeof(on));
 
 
-    /* 
-     * Initialize socket address struct 
+    /*
+     * Initialize socket address struct
      */
     memset((void *) &sockin, 0, (size_t) sizeof(sockin));
     sockin.sin_family = TRICKCOMM_SOCKET_FAMILY;
@@ -115,7 +115,7 @@ int tc_connect_(TCDevice * device, const char *file, int line)
     memcpy((void *) &(sockin.sin_addr.s_addr), (const void *) ip_host->h_addr, (size_t) ip_host->h_length);
 
 
-    /* 
+    /*
      *  Establish the connection to the selected server
      */
 #if _DMTCP
@@ -147,7 +147,7 @@ int tc_connect_(TCDevice * device, const char *file, int line)
     }
 
 
-    /* 
+    /*
      * Shake hands with server (fill device struct)
      */
 
diff --git a/trick_source/trick_utils/comm/src/tc_dev_copy.c b/trick_source/trick_utils/comm/src/tc_dev_copy.c
index b914e3fb..8e9fd5d9 100644
--- a/trick_source/trick_utils/comm/src/tc_dev_copy.c
+++ b/trick_source/trick_utils/comm/src/tc_dev_copy.c
@@ -5,7 +5,7 @@
 
 int tc_dev_copy(TCDevice * dest, TCDevice * src)
 {
-    /* 
+    /*
      * If no destination memory or src memory
      */
     if (dest == NULL || src == NULL) {
diff --git a/trick_source/trick_utils/comm/src/tc_init_mcast_client.c b/trick_source/trick_utils/comm/src/tc_init_mcast_client.c
index 32ce9562..d87bf951 100644
--- a/trick_source/trick_utils/comm/src/tc_init_mcast_client.c
+++ b/trick_source/trick_utils/comm/src/tc_init_mcast_client.c
@@ -49,12 +49,12 @@ int tc_init_mcast_client(TCDevice * mcast_client_device)
     mcast_client_device->client_id = 0;
     strcpy(mcast_client_device->client_tag, "<empty>");
 
-    /* 
+    /*
        As the values of the TTL field increase, routers will expand the number of hops they will forward a multicast
        packet. To provide meaningful scope control, multicast routers enforce the following "thresholds" on
        forwarding based on the TTL field:
 
-       0 restricted to the same host 1 restricted to the same subnet 32 restricted to the same site 64 restricted to 
+       0 restricted to the same host 1 restricted to the same subnet 32 restricted to the same site 64 restricted to
        the same region 128 restricted to the same continent 255 unrestricted */
     if (setsockopt(mcast_client_device->socket, IPPROTO_IP, IP_MULTICAST_TTL,
                    &mcast_client_device->ttl, (socklen_t) sizeof(mcast_client_device->ttl)) < 0) {
diff --git a/trick_source/trick_utils/comm/src/tc_isValid.c b/trick_source/trick_utils/comm/src/tc_isValid.c
index e0c9421e..67d3622e 100644
--- a/trick_source/trick_utils/comm/src/tc_isValid.c
+++ b/trick_source/trick_utils/comm/src/tc_isValid.c
@@ -28,7 +28,7 @@ int tc_isValid(TCDevice * device)
         if ((nread <= 0) && (tc_errno != TRICKCOMM_EAGAIN)) {
 
             ret = 0; /* The socket is not valid */
-        } 
+        }
         else {
 
             ret = 1; /* The socket is valid */
diff --git a/trick_source/trick_utils/comm/src/tc_multiconnect.c b/trick_source/trick_utils/comm/src/tc_multiconnect.c
index 0e355546..b5e1cf08 100644
--- a/trick_source/trick_utils/comm/src/tc_multiconnect.c
+++ b/trick_source/trick_utils/comm/src/tc_multiconnect.c
@@ -77,7 +77,7 @@ int tc_multiconnect(TCDevice * dev_ptr, char *my_tag, char *other_tag, TrickErro
         return (status);
     }
 
-    /* 
+    /*
      * Initialize Broadcast Info Structure
      */
     gethostname(name, (size_t) 80);
@@ -123,8 +123,8 @@ int tc_multiconnect(TCDevice * dev_ptr, char *my_tag, char *other_tag, TrickErro
     bc_info.addr.sin_addr.s_addr = inet_addr(TC_MULT_GROUP);
     bc_info.addr.sin_port = htons(TC_MULT_PORT);
 
-    /* 
-     * Create socket to listen for connections 
+    /*
+     * Create socket to listen for connections
      */
     if ((fd = socket(AF_INET, SOCK_DGRAM, 0)) < 0) {
         perror("tc_multiconnect socket");
@@ -187,20 +187,20 @@ int tc_multiconnect(TCDevice * dev_ptr, char *my_tag, char *other_tag, TrickErro
 
         if (nbytes == sizeof(read_me)) {
 
-            /* 
+            /*
              * Read information from peer
              */
             read_me.port = ntohl((uint32_t) read_me.port);
             read_me.pid = ntohl((uint32_t) read_me.pid);
             read_me.conn_initiated = ntohl((uint32_t) read_me.conn_initiated);
 
-            /* May I connect with this peer? Rules: Don't connect to myself! Don't connect to someone with same tag as 
+            /* May I connect with this peer? Rules: Don't connect to myself! Don't connect to someone with same tag as
                myself Do connect to someone with same "other tag" */
             if (curr_pid != read_me.pid &&
                 strcmp(bc_info.send_me.my_tag, read_me.my_tag) &&
                 !strcmp(bc_info.send_me.other_tag, read_me.other_tag)) {
 
-                /* Decide who will function as client Whoever has smaller pid will be the client If same pid, decide by 
+                /* Decide who will function as client Whoever has smaller pid will be the client If same pid, decide by
                    a string compare */
                 if (curr_pid < read_me.pid) {
                     i_am_client = 1;
@@ -208,8 +208,8 @@ int tc_multiconnect(TCDevice * dev_ptr, char *my_tag, char *other_tag, TrickErro
                     i_am_client = (strcmp(name, read_me.addr) > 0) ? 1 : 0;
                 }
 
-                /* 
-                 * Client Peer initiates the connection 
+                /*
+                 * Client Peer initiates the connection
                  */
                 if (i_am_client == 1) {
 
@@ -264,7 +264,7 @@ int tc_multiconnect(TCDevice * dev_ptr, char *my_tag, char *other_tag, TrickErro
         }
     } else {
 
-        /* 
+        /*
          * Server accepts
          */
         status = 1;
diff --git a/trick_source/trick_utils/comm/src/tc_read.c b/trick_source/trick_utils/comm/src/tc_read.c
index 3a27fc3b..33a9e009 100644
--- a/trick_source/trick_utils/comm/src/tc_read.c
+++ b/trick_source/trick_utils/comm/src/tc_read.c
@@ -56,21 +56,21 @@ int tc_read_(TCDevice * device, char *buffer, int size, const char *file, int li
         ref_time = tc_clock_init();
     }
 
-    /* 
-     * Spin until all requested data is 
-     * available, an error is returned from recv, or a timeout 
-     * limit has been reached. This code is needed for the 
+    /*
+     * Spin until all requested data is
+     * available, an error is returned from recv, or a timeout
+     * limit has been reached. This code is needed for the
      * socket because sockets can return less
-     * data than what was requested when data packets 
-     * cross block boundries.  
+     * data than what was requested when data packets
+     * cross block boundries.
      */
     while (nbytes != size) {
 
-        /* 
-         * recvfrom will return -1 with tc_errno set to TC_EWOULDBLOCK 
-         * if this is a non-blocking socket (blockio = NOBLOCKIO) 
-         * and no data is available.  recvfrom will usually return 0 
-         * for a broken connection. 
+        /*
+         * recvfrom will return -1 with tc_errno set to TC_EWOULDBLOCK
+         * if this is a non-blocking socket (blockio = NOBLOCKIO)
+         * and no data is available.  recvfrom will usually return 0
+         * for a broken connection.
          */
         while ((tmp_nbytes = recvfrom(device->socket, data, (size_t) tmp_size,
                                       TC_NOSIGNAL, (struct sockaddr *) &device->cliAddr, &cliLen)) < 0
diff --git a/trick_source/trick_utils/comm/src/tc_read_byteswap.c b/trick_source/trick_utils/comm/src/tc_read_byteswap.c
index 5023f61e..0a6f0612 100644
--- a/trick_source/trick_utils/comm/src/tc_read_byteswap.c
+++ b/trick_source/trick_utils/comm/src/tc_read_byteswap.c
@@ -36,7 +36,7 @@ int tc_read_byteswap(TCDevice * device, char *buffer, int size, ATTRIBUTES * att
         pthread_setspecific(key, swap_buffer) ;
     }
     if ( (unsigned int)size > swap_buffer->size ) {
-        unsigned int new_size = (unsigned int)size ; 
+        unsigned int new_size = (unsigned int)size ;
         if ( new_size % 4 ) {
             new_size = new_size - ( new_size % 4 ) + 4 ;
         }
diff --git a/trick_source/trick_utils/comm/src/tc_write.c b/trick_source/trick_utils/comm/src/tc_write.c
index eca1aafe..51058c93 100644
--- a/trick_source/trick_utils/comm/src/tc_write.c
+++ b/trick_source/trick_utils/comm/src/tc_write.c
@@ -116,8 +116,8 @@ int tc_write_(TCDevice * device, char *buffer, int size, const char *file, int l
         }
     }
 
-    /* 
-     * If write didn't write all bytes, handle it 
+    /*
+     * If write didn't write all bytes, handle it
      */
     switch (error) {
         case TC_READWRITE_TIMEOUT:
diff --git a/trick_source/trick_utils/comm/src/tc_write_byteswap.c b/trick_source/trick_utils/comm/src/tc_write_byteswap.c
index 56869fe7..14c32269 100644
--- a/trick_source/trick_utils/comm/src/tc_write_byteswap.c
+++ b/trick_source/trick_utils/comm/src/tc_write_byteswap.c
@@ -36,7 +36,7 @@ int tc_write_byteswap(TCDevice * device, char *buffer, int size, ATTRIBUTES * at
         pthread_setspecific(key, swap_buffer) ;
     }
     if ( (unsigned int)size > swap_buffer->size ) {
-        unsigned int new_size = (unsigned int)size ; 
+        unsigned int new_size = (unsigned int)size ;
         if ( new_size % 4 ) {
             new_size = new_size - ( new_size % 4 ) + 4 ;
         }
diff --git a/trick_source/trick_utils/comm/src/trick_byteswap.c b/trick_source/trick_utils/comm/src/trick_byteswap.c
index 82c96c42..42b4cb2f 100644
--- a/trick_source/trick_utils/comm/src/trick_byteswap.c
+++ b/trick_source/trick_utils/comm/src/trick_byteswap.c
@@ -1,6 +1,6 @@
 
-/* 
-   PURPOSE: (Routines for swapping byte order.  Borrowed from ISP.) 
+/*
+   PURPOSE: (Routines for swapping byte order.  Borrowed from ISP.)
 
    REFERENCE: ((None))
 
diff --git a/trick_source/trick_utils/comm/src/trick_error_hndlr.c b/trick_source/trick_utils/comm/src/trick_error_hndlr.c
index a95d1659..531202b6 100644
--- a/trick_source/trick_utils/comm/src/trick_error_hndlr.c
+++ b/trick_source/trick_utils/comm/src/trick_error_hndlr.c
@@ -1,4 +1,4 @@
-/* 
+/*
    PURPOSE: (Check for data which is configured in the input files but was not mapped to any imports or exports from
    the S_define file.)
 
@@ -616,7 +616,7 @@ void trick_error_report(TrickErrorHndlr * error_hndlr,  /* In: Error object */
     vsprintf(message, format, args);
     va_end(args);
 
-    /* 
+    /*
      * Call error handling function only if error level of this error
      * message is greater than the reporting level for this error handler.
      */
diff --git a/trick_source/trick_utils/comm/test/TCBlockioTest.cpp b/trick_source/trick_utils/comm/test/TCBlockioTest.cpp
index 8be0d946..ff725f09 100644
--- a/trick_source/trick_utils/comm/test/TCBlockioTest.cpp
+++ b/trick_source/trick_utils/comm/test/TCBlockioTest.cpp
@@ -21,7 +21,7 @@ class TCBlockioTest : public testing::Test {
       }
 
       void TearDown(){
-   
+
          free(device);
       }
 };
@@ -32,29 +32,29 @@ TEST_F( TCBlockioTest, testNullDevice ) {
    int blockio_status = tc_blockio( NULL, TC_COMM_ALL_OR_NOTHING );
 
    EXPECT_EQ( TC_EWOULDBLOCK, blockio_status );
-} 
+}
 
 TEST_F( TCBlockioTest, testTC_COMM_BLOCKIO ) {
 
    (void) tc_blockio( device, TC_COMM_BLOCKIO );
    EXPECT_EQ( TC_COMM_BLOCKIO, device->blockio_type);
-} 
+}
 
 TEST_F( TCBlockioTest, testTC_COMM_NOBLOCKIO ) {
 
    (void) tc_blockio( device, TC_COMM_NOBLOCKIO );
    EXPECT_EQ( TC_COMM_NOBLOCKIO, device->blockio_type);
-} 
+}
 
 TEST_F( TCBlockioTest, testTC_COMM_TIMED_BLOCKIO ) {
 
    (void) tc_blockio( device, TC_COMM_TIMED_BLOCKIO );
    EXPECT_EQ( TC_COMM_TIMED_BLOCKIO, device->blockio_type );
-} 
+}
 
 TEST_F( TCBlockioTest, testTC_COMM_ALL_OR_NOTHING ) {
 
    (void) tc_blockio( device, TC_COMM_ALL_OR_NOTHING );
    EXPECT_EQ( TC_COMM_ALL_OR_NOTHING, device->blockio_type );
-} 
+}
 #endif
diff --git a/trick_source/trick_utils/comm/test/TCConnectTest.cpp b/trick_source/trick_utils/comm/test/TCConnectTest.cpp
index d936c534..d05e9719 100644
--- a/trick_source/trick_utils/comm/test/TCConnectTest.cpp
+++ b/trick_source/trick_utils/comm/test/TCConnectTest.cpp
@@ -28,7 +28,7 @@ class TCConnectTest : public testing::Test {
       }
 
       void TearDown(){
-   
+
          free(device);
       }
 };
@@ -51,7 +51,7 @@ TEST_F( TCConnectTest, testDisabledDevice ) {
 
 }
 
-TEST_F( TCConnectTest, testNullHostname ) { 
+TEST_F( TCConnectTest, testNullHostname ) {
 
    device->hostname = NULL;
 
diff --git a/trick_source/trick_utils/comm/test/TCDevCopyTest.cpp b/trick_source/trick_utils/comm/test/TCDevCopyTest.cpp
index e6473242..db001b28 100644
--- a/trick_source/trick_utils/comm/test/TCDevCopyTest.cpp
+++ b/trick_source/trick_utils/comm/test/TCDevCopyTest.cpp
@@ -27,7 +27,7 @@ class TCDevCopyTest : public testing::Test {
       }
 
       void TearDown(){
-   
+
          free(src_device);
          free(dest_device);
       }
@@ -38,18 +38,18 @@ TEST_F( TCDevCopyTest, testNullSrcDest ) {
    int tcdev_status = tc_dev_copy( NULL, NULL );
 
    EXPECT_EQ( tcdev_status, -1 );
-} 
+}
 
 TEST_F( TCDevCopyTest, testNullSrc ) {
 
    int tcdev_status = tc_dev_copy( dest_device, NULL );
 
    EXPECT_EQ( tcdev_status, -1 );
-} 
+}
 
 TEST_F( TCDevCopyTest, testNullDest ) {
 
    int tcdev_status = tc_dev_copy( NULL, src_device );
 
    EXPECT_EQ( tcdev_status, -1 );
-} 
+}
diff --git a/trick_source/trick_utils/comm/test/TCDisconnectTest.cpp b/trick_source/trick_utils/comm/test/TCDisconnectTest.cpp
index 0b9bedb3..70d7475a 100644
--- a/trick_source/trick_utils/comm/test/TCDisconnectTest.cpp
+++ b/trick_source/trick_utils/comm/test/TCDisconnectTest.cpp
@@ -23,7 +23,7 @@ class TCDisconnectTest : public testing::Test {
       }
 
       void TearDown(){
-   
+
          free(device);
       }
 };
@@ -33,11 +33,11 @@ TEST_F( TCDisconnectTest, testNoDevice ) {
    int disconnect_status = tc_disconnect( NULL );
 
    EXPECT_EQ( disconnect_status, TC_DRIVER_ALREADY_DISCONNECTED );
-} 
+}
 
 TEST_F( TCDisconnectTest, testSuccess ) {
 
    int disconnect_status = tc_disconnect( device );
 
    EXPECT_EQ( disconnect_status, TC_SUCCESS );
-} 
+}
diff --git a/trick_source/trick_utils/comm/test/TCErrorTest.cpp b/trick_source/trick_utils/comm/test/TCErrorTest.cpp
index 39f14143..977d4476 100644
--- a/trick_source/trick_utils/comm/test/TCErrorTest.cpp
+++ b/trick_source/trick_utils/comm/test/TCErrorTest.cpp
@@ -22,7 +22,7 @@ class TCErrorTest : public testing::Test {
       }
 
       void TearDown(){
-   
+
          free(device);
       }
 };
@@ -32,7 +32,7 @@ TEST_F( TCErrorTest, testNoDevice ) {
    int error_status = tc_error( NULL, 0 );
 
    EXPECT_EQ( error_status, -1 );
-} 
+}
 
 TEST_F( TCErrorTest, testNoErrorHandler ) {
 
@@ -41,7 +41,7 @@ TEST_F( TCErrorTest, testNoErrorHandler ) {
    int error_status = tc_error( device, 0 );
 
    EXPECT_EQ( error_status, 0 );
-} 
+}
 
 TEST_F( TCErrorTest, testOn ) {
 
@@ -49,7 +49,7 @@ TEST_F( TCErrorTest, testOn ) {
 
    EXPECT_EQ( device->error_handler->report_level, TRICK_ERROR_ALL );
    EXPECT_EQ( error_status, 0 );
-} 
+}
 
 TEST_F( TCErrorTest, testOff ) {
 
@@ -57,5 +57,5 @@ TEST_F( TCErrorTest, testOff ) {
 
    EXPECT_EQ( device->error_handler->report_level, TRICK_ERROR_SILENT );
    EXPECT_EQ( error_status, 0 );
-} 
+}
 
diff --git a/trick_source/trick_utils/comm/test/TCIsValidTest.cpp b/trick_source/trick_utils/comm/test/TCIsValidTest.cpp
index 73522aa1..7f8d2705 100644
--- a/trick_source/trick_utils/comm/test/TCIsValidTest.cpp
+++ b/trick_source/trick_utils/comm/test/TCIsValidTest.cpp
@@ -24,7 +24,7 @@ class TCIsValidTest : public testing::Test {
       }
 
       void TearDown(){
-   
+
          free(device);
       }
 };
@@ -34,7 +34,7 @@ TEST_F( TCIsValidTest, testNullDevice ) {
    int tcisvalid_status = tc_isValid( NULL );
 
    EXPECT_EQ( tcisvalid_status, 0 );
-} 
+}
 
 TEST_F( TCIsValidTest, testInvalidSocket ) {
 
@@ -43,12 +43,12 @@ TEST_F( TCIsValidTest, testInvalidSocket ) {
    int tcisvalid_status = tc_isValid( device );
 
    EXPECT_EQ( tcisvalid_status, 0 );
-} 
+}
 
 TEST_F( TCIsValidTest, testValidSocket ) {
 
    int tcisvalid_status = tc_isValid( device );
 
    EXPECT_EQ( tcisvalid_status, 0 );
-} 
+}
 
diff --git a/trick_source/trick_utils/comm/test/TCPendingTest.cpp b/trick_source/trick_utils/comm/test/TCPendingTest.cpp
index 6e860e16..dae5f40b 100644
--- a/trick_source/trick_utils/comm/test/TCPendingTest.cpp
+++ b/trick_source/trick_utils/comm/test/TCPendingTest.cpp
@@ -24,7 +24,7 @@ class TCPendingTest : public testing::Test {
       }
 
       void TearDown(){
-   
+
          free(device);
       }
 };
@@ -34,7 +34,7 @@ TEST_F( TCPendingTest, testNullDevice ) {
    int tcpending_status = tc_pending( NULL );
 
    EXPECT_EQ( tcpending_status, -1 );
-} 
+}
 
 /*
 TEST_F( TCPendingTest, testInvalidSocket ) {
@@ -44,5 +44,5 @@ TEST_F( TCPendingTest, testInvalidSocket ) {
    int tcpending_status = tc_pending( device );
 
    EXPECT_EQ( tcpending_status, 0 );
-} 
+}
 */
diff --git a/trick_source/trick_utils/comm/test/TCReadByteSwapTest.cpp b/trick_source/trick_utils/comm/test/TCReadByteSwapTest.cpp
index 40a340a6..0d900609 100644
--- a/trick_source/trick_utils/comm/test/TCReadByteSwapTest.cpp
+++ b/trick_source/trick_utils/comm/test/TCReadByteSwapTest.cpp
@@ -23,7 +23,7 @@ class TCReadByteSwapTest : public testing::Test {
       }
 
       void TearDown(){
-   
+
          free(device);
       }
 };
diff --git a/trick_source/trick_utils/comm/test/TCSetBlockIOTest.cpp b/trick_source/trick_utils/comm/test/TCSetBlockIOTest.cpp
index 03b23462..9c826f72 100644
--- a/trick_source/trick_utils/comm/test/TCSetBlockIOTest.cpp
+++ b/trick_source/trick_utils/comm/test/TCSetBlockIOTest.cpp
@@ -22,7 +22,7 @@ class TCSetBlockIOTest : public testing::Test {
       }
 
       void TearDown(){
-   
+
          free(device);
       }
 };
@@ -32,7 +32,7 @@ TEST_F( TCSetBlockIOTest, testNoDevice ) {
    int set_blockio_status = tc_set_blockio_timeout_limit( NULL, 0 );
 
    EXPECT_EQ( set_blockio_status, -1 );
-} 
+}
 
 TEST_F( TCSetBlockIOTest, testSuccess ) {
 
@@ -40,4 +40,4 @@ TEST_F( TCSetBlockIOTest, testSuccess ) {
 
    EXPECT_EQ( set_blockio_status, 0 );
    EXPECT_EQ( device->blockio_limit, 5 );
-} 
+}
diff --git a/trick_source/trick_utils/comm/test_programs/dr_client.c b/trick_source/trick_utils/comm/test_programs/dr_client.c
index b8f78067..ff686b29 100644
--- a/trick_source/trick_utils/comm/test_programs/dr_client.c
+++ b/trick_source/trick_utils/comm/test_programs/dr_client.c
@@ -2,14 +2,14 @@
  * Usage: dr_client <host> <port>
  *
  * Description: This is a client to Trick sim's data record server.
- *              The matching write from the server side is called "dr_comm_send" 
- *              and can be found in the 
- *              $TRICK_HOME/trick_source/sim_services/exec directory.  
+ *              The matching write from the server side is called "dr_comm_send"
+ *              and can be found in the
+ *              $TRICK_HOME/trick_source/sim_services/exec directory.
  *
- *              The data packet coming from the server contains a file to write to, 
+ *              The data packet coming from the server contains a file to write to,
  *              and a packet of data (checkpoint, s_job_execution or data recording
  *              files). So dr_client reads the data, and dumps it to the file
- *              specified by the server. 
+ *              specified by the server.
  *
  * Example: dr_client wave 7777
  *
@@ -27,7 +27,7 @@ typedef struct {
 } DataFiles ;
 
 int  dr_comm_receive( TCDevice* connection, char** file_name, char** msg ) ;
-void dump_data (  DataFiles* df, 
+void dump_data (  DataFiles* df,
                  TCDevice* connection, char** file_name, char** msg ) ;
 
 
@@ -77,10 +77,10 @@ int dr_comm_receive( TCDevice* connection, char** file_name, char** msg ) {
   int size_filename ;
   int size_msg ;
 
-  tc_read(connection, (char*) &size_filename, 4); 
-  tc_read(connection, (char*) &size_msg, 4); 
-  tc_read(connection, *file_name, size_filename); 
-  tc_read(connection, *msg, size_msg); 
+  tc_read(connection, (char*) &size_filename, 4);
+  tc_read(connection, (char*) &size_msg, 4);
+  tc_read(connection, *file_name, size_filename);
+  tc_read(connection, *msg, size_msg);
 
   return( size_msg ) ;
 }
@@ -93,7 +93,7 @@ void dump_data ( DataFiles* df,
    int found ;
    FILE* fp ;
 
-   while ( 1 ) { 
+   while ( 1 ) {
 
       /* Get data from dr server */
       size_msg = dr_comm_receive( connection, file_name, msg ) ;
@@ -106,7 +106,7 @@ void dump_data ( DataFiles* df,
       /* Which file to write to? */
       found = 0 ;
       for ( ii = 0 ; ii < df->n_files ; ii++ ) {
-         if ( ! strcmp( df->file_name[ii], *file_name ) ) { 
+         if ( ! strcmp( df->file_name[ii], *file_name ) ) {
             found = 1 ;
             break ;
          }
@@ -126,7 +126,7 @@ void dump_data ( DataFiles* df,
 
       /* Write record to the file */
       if ( fp != NULL ) {
-         fwrite( *msg, size_msg, 1, fp ) ; 
+         fwrite( *msg, size_msg, 1, fp ) ;
       } else {
          fprintf(stderr, "ERROR: Can't open \"%s\"\n", *file_name);
          exit(-1);
diff --git a/trick_source/trick_utils/comm/test_programs/tc_client.c b/trick_source/trick_utils/comm/test_programs/tc_client.c
index 28ab0e8b..54104c66 100644
--- a/trick_source/trick_utils/comm/test_programs/tc_client.c
+++ b/trick_source/trick_utils/comm/test_programs/tc_client.c
@@ -13,7 +13,7 @@ int main( int narg, char** args ) {
   /* Parse args */
   verbose = 0 ;
   if ( narg < 4 || narg > 5  ) {
-    fprintf(stderr, 
+    fprintf(stderr,
        "USAGE: tc_client <host> <num_packets> <packet_size> [-v]\n");
     exit(-1);
   }
@@ -23,7 +23,7 @@ int main( int narg, char** args ) {
   num_packets = atoi(args[2]) ;
   msg_len     = atoi(args[3]) ;
   if ( msg_len < 1 || num_packets < 1 ) {
-    fprintf(stderr, 
+    fprintf(stderr,
        "USAGE: tc_client <host> <num_packets> <packet_size> [-v]\n");
   }
 
@@ -54,6 +54,6 @@ int main( int narg, char** args ) {
     tc_write(&connection, msg, msg_len);
     tc_read(&connection, msg, msg_len);
   }
-  
+
   return 0 ;
 }
diff --git a/trick_source/trick_utils/comm/test_programs/tc_multi_client_example.c b/trick_source/trick_utils/comm/test_programs/tc_multi_client_example.c
index 5184023a..a6a1b0af 100644
--- a/trick_source/trick_utils/comm/test_programs/tc_multi_client_example.c
+++ b/trick_source/trick_utils/comm/test_programs/tc_multi_client_example.c
@@ -46,7 +46,7 @@ int main( int argc, char *argv[] ) {
 
    if (argc >= 2) {
       if (!strcmp(argv[1] , "-h")) {
-         fprintf(stderr,"usage: %s [tag_name]\n",argv[0]);  
+         fprintf(stderr,"usage: %s [tag_name]\n",argv[0]);
          exit(0) ;
       }
       else {
@@ -78,11 +78,11 @@ int main( int argc, char *argv[] ) {
                     (TrickErrorDataPtr)NULL,
                     TRICK_ERROR_TRIVIAL);
 
-   /* It is possible for multiple multiconnects to try and 
-      initiate simultaneously causing some of the connects 
-      to fail.  This happens if all of the clients have the 
+   /* It is possible for multiple multiconnects to try and
+      initiate simultaneously causing some of the connects
+      to fail.  This happens if all of the clients have the
       same tag and are connecting to the same server.  This is
-      the V.R. scenario.  Continue trying to connect 
+      the V.R. scenario.  Continue trying to connect
       until successful.
     */
    do {
@@ -130,8 +130,8 @@ int main( int argc, char *argv[] ) {
 
 #if (__sun)
 /* This bogus handler is in here because the Sun machines
-   sometimes generate a bogus SIGALRM from usleeps that 
-   cause the program to exit.  This handler just catches 
+   sometimes generate a bogus SIGALRM from usleeps that
+   cause the program to exit.  This handler just catches
    that signal and continues processing
  */
 
@@ -143,12 +143,12 @@ void stupid( int sig ) {
 /* Interupt signal handler. */
 void sigint_hndlr( int sig )
 {
- 
+
    fprintf(stderr,"client: disconnected...\n" );
 
    if (tc_isValid(device))
       tc_disconnect(device);
- 
+
    /* Exit the application. */
    exit( 1 );
 }
diff --git a/trick_source/trick_utils/comm/test_programs/tc_multi_serv_example.c b/trick_source/trick_utils/comm/test_programs/tc_multi_serv_example.c
index 54f9795b..10b81545 100644
--- a/trick_source/trick_utils/comm/test_programs/tc_multi_serv_example.c
+++ b/trick_source/trick_utils/comm/test_programs/tc_multi_serv_example.c
@@ -154,7 +154,7 @@ fprintf(stderr,"Starting continuous_connect %d\n", pthread_self());
 
    return((void *)NULL) ;
 }
-   
+
 int main( int argc, char *argv[] ) {
 
    int       ctr;
@@ -168,10 +168,10 @@ int main( int argc, char *argv[] ) {
 
    if (argc >= 2) {
       if (!strcmp(argv[1] , "-h")) {
-         fprintf(stderr,"usage: %s [tag_name]\n",argv[0]);  
+         fprintf(stderr,"usage: %s [tag_name]\n",argv[0]);
          exit(0) ;
       }
-      else 
+      else
          strcpy(other_tag , argv[1]) ;
    }
 
@@ -261,8 +261,8 @@ int main( int argc, char *argv[] ) {
 
 #if (__sun)
 /* This bogus handler is in here because the Sun machines
-   sometimes generate a bogus SIGALRM from usleeps that 
-   cause the program to exit.  This handler just catches 
+   sometimes generate a bogus SIGALRM from usleeps that
+   cause the program to exit.  This handler just catches
    that signal and continues processing
  */
 
@@ -276,7 +276,7 @@ void stupid( int sig ) {
 void sigint_hndlr( int sig )
 {
    int i ;
- 
+
    if (pthread_equal(pthread_self() , thread_id)) {
       fprintf(stderr,"Disconnecting devices...\n" );
 
@@ -290,6 +290,6 @@ void sigint_hndlr( int sig )
 
    /* Exit the application. */
    exit(0);
-    
+
 }
 
diff --git a/trick_source/trick_utils/comm/test_programs/tc_server.c b/trick_source/trick_utils/comm/test_programs/tc_server.c
index 98687ec9..ba96cbaa 100644
--- a/trick_source/trick_utils/comm/test_programs/tc_server.c
+++ b/trick_source/trick_utils/comm/test_programs/tc_server.c
@@ -9,7 +9,7 @@
 
 int main( int narg, char** args ) {
 
-  TCDevice listen_device ;  
+  TCDevice listen_device ;
   TCDevice connection ;
 
   int verbose ;
@@ -102,7 +102,7 @@ int main( int narg, char** args ) {
   sum_time = (double)(total.QuadPart * 0.0000001 ) ;
 #endif
 
-  fprintf(stderr, "Avg packet round trip : %lf \n", 
+  fprintf(stderr, "Avg packet round trip : %lf \n",
                   sum_time/(double)num_packets );
 
   return 0 ;
diff --git a/trick_source/trick_utils/math/Unittest/euler_quat_test.cpp b/trick_source/trick_utils/math/Unittest/euler_quat_test.cpp
index 85b0da26..4d97275b 100644
--- a/trick_source/trick_utils/math/Unittest/euler_quat_test.cpp
+++ b/trick_source/trick_utils/math/Unittest/euler_quat_test.cpp
@@ -1,29 +1,29 @@
 #include <iostream>
 #include <stdlib.h>
-#include <time.h>       
+#include <time.h>
 #include "euler_quat_test.hh"
 int main()
 {
    EulerQuatTest  test;
    int ii;
-   
+
    // =========  Testing deuler_*_quat.c ========================
    // There are 2 capabilities for every deuler_*_quat.c function:
    // 1. Convert form euler to left handed quaternion
    // 2. Convert from left handed quaternion to euler: (2 methods)
    //      - Make angles from quaternion
    //      - Make angles from quaternion but use previous values to
-   //        prevent singularities         
+   //        prevent singularities
    // ============================================================
-   
+
    srand(time(NULL));
    for (ii=0; ii<test.num_tests; ii++){
-      
+
       // Randomly input euler angles:
       test.init_data.euler_angles[0] = (rand()%test.num_tests) * (2*M_PI/test.num_tests);
       test.init_data.euler_angles[1] = (rand()%test.num_tests) * (2*M_PI/test.num_tests);
       test.init_data.euler_angles[2] = (rand()%test.num_tests) * (2*M_PI/test.num_tests);
-  
+
       // Testing deuler_123_quat.c:
       test.init_data.euler_sequence = Roll_Pitch_Yaw;
       euler_matrix(test.init_data.euler_angles, test.mat, 0 , test.init_data.euler_sequence);
@@ -31,7 +31,7 @@ int main()
       test.test_euler_to_quat();
       test.test_quat_to_euler(1);
       test.test_quat_to_euler(2);   // Tesing singularities
-  
+
       // Testing deuler_132_quat.c:
       test.init_data.euler_sequence = Roll_Yaw_Pitch;
       euler_matrix(test.init_data.euler_angles, test.mat, 0 , test.init_data.euler_sequence);
@@ -39,7 +39,7 @@ int main()
       test.test_euler_to_quat();
       test.test_quat_to_euler(1);
       test.test_quat_to_euler(2);
-  
+
       // Testing deuler_231_quat.c:
       test.init_data.euler_sequence = Pitch_Yaw_Roll;
       euler_matrix(test.init_data.euler_angles, test.mat, 0 , test.init_data.euler_sequence);
@@ -47,7 +47,7 @@ int main()
       test.test_euler_to_quat();
       test.test_quat_to_euler(1);
       test.test_quat_to_euler(2);
-  
+
       // Testing deuler_213_quat.c:
       test.init_data.euler_sequence = Pitch_Roll_Yaw;
       euler_matrix(test.init_data.euler_angles, test.mat, 0 , test.init_data.euler_sequence);
@@ -55,7 +55,7 @@ int main()
       test.test_euler_to_quat();
       test.test_quat_to_euler(1);
       test.test_quat_to_euler(2);
-  
+
       // Testing deuler_312_quat.c:
       test.init_data.euler_sequence = Yaw_Roll_Pitch;
       euler_matrix(test.init_data.euler_angles, test.mat, 0 , test.init_data.euler_sequence);
@@ -63,7 +63,7 @@ int main()
       test.test_euler_to_quat();
       test.test_quat_to_euler(1);
       test.test_quat_to_euler(2);
-  
+
       // Testing deuler_321_quat.c:
       test.init_data.euler_sequence = Yaw_Pitch_Roll;
       euler_matrix(test.init_data.euler_angles, test.mat, 0 , test.init_data.euler_sequence);
@@ -71,12 +71,12 @@ int main()
       test.test_euler_to_quat();
       test.test_quat_to_euler(1);
       test.test_quat_to_euler(2);
-     
+
       test.num_pass ++;
    }
    if (test.num_pass == test.num_tests){
        printf(" \e[1;34m Tested all %d sets of Euler angles and they were all PASSED \n\e",  test.num_tests);
        printf("%c[%dm", 0x1B, 0);
-   } 
+   }
    return(0);
 }
diff --git a/trick_source/trick_utils/math/Unittest/euler_quat_test.hh b/trick_source/trick_utils/math/Unittest/euler_quat_test.hh
index 19f0d0ee..4307dc54 100644
--- a/trick_source/trick_utils/math/Unittest/euler_quat_test.hh
+++ b/trick_source/trick_utils/math/Unittest/euler_quat_test.hh
@@ -4,7 +4,7 @@
 using namespace std;
 
 class EulerQuatTest {
-   
+
    public:
 
       TRANSFORM init_data;
@@ -50,7 +50,7 @@ class EulerQuatTest {
           double eul_error[3];
 
           M_IDENT(mat_error);
-          V_INIT(eul_error);          
+          V_INIT(eul_error);
           QxQt(Q_error, Q, quat);
           quat_to_mat(mat_error, Q_error);
           euler_matrix(eul_error, mat_error, 0 , this->init_data.euler_sequence);
@@ -64,7 +64,7 @@ class EulerQuatTest {
       void test_euler_to_quat(){
           double Q[4];
           euler_quat(this->init_data.euler_angles, Q, 0,  this->init_data.euler_sequence);
-          compare_quat( Q ); 
+          compare_quat( Q );
           return;
       }
       void test_quat_to_euler(int test){
@@ -73,7 +73,7 @@ class EulerQuatTest {
           if(this->method == 1){
               euler_quat(eul, this->quat, this->method, this->init_data.euler_sequence);
           }
-          else { 
+          else {
              switch (this->init_data.euler_sequence) {
                  case Roll_Pitch_Yaw:
                      euler123_quat( eul, this->quat, 2, this->init_data.euler_angles );
diff --git a/trick_source/trick_utils/math/src/LUD_inv.c b/trick_source/trick_utils/math/src/LUD_inv.c
index 04df93c1..eb89d75c 100644
--- a/trick_source/trick_utils/math/src/LUD_inv.c
+++ b/trick_source/trick_utils/math/src/LUD_inv.c
@@ -24,7 +24,7 @@ int LUD_inv(                    /* RETURN: -- Zero */
     double *mdata;
 
     // Duplicate the input matrix because LU_dcmp alters
-    // the matrix passed to it. 
+    // the matrix passed to it.
     work_matrix = malloc(n * sizeof(double *));
     mdata = (double *) malloc(n * n * sizeof(double));
     for (i = 0; i < n; i++) {
diff --git a/trick_source/trick_utils/math/src/dLU_solver.c b/trick_source/trick_utils/math/src/dLU_solver.c
index ef4fd225..07798415 100644
--- a/trick_source/trick_utils/math/src/dLU_solver.c
+++ b/trick_source/trick_utils/math/src/dLU_solver.c
@@ -10,7 +10,7 @@
 
    REFERENCE: (((Cholesksy) (The cholesky book) (book) (Publisher) (Date) (Pages)))
 
-   ASSUMPTIONS AND LIMITATIONS: (([A] is a square matrix) ([A] is symmetric) ([A] is positive definite) (Only the lower 
+   ASSUMPTIONS AND LIMITATIONS: (([A] is a square matrix) ([A] is symmetric) ([A] is positive definite) (Only the lower
    triangular of [A] needs to be loaded.))
 
    PROGRAMMERS: (((Robert W. Bailey) (LinCom Corp) (2/1/91) (Trick-CR-00000) (Initial Release))) */
diff --git a/trick_source/trick_utils/math/src/dS_function.c b/trick_source/trick_utils/math/src/dS_function.c
index d293d5ff..49167bc9 100644
--- a/trick_source/trick_utils/math/src/dS_function.c
+++ b/trick_source/trick_utils/math/src/dS_function.c
@@ -13,7 +13,7 @@ double dS_function(             /* Return: -- 0.0 <= value <= 1.0 */
                       double mid_point, /* In: 'x' value where 's' function returns 0.5 */
                       double one_point, /* In: 'x' value where 's' function returns 1.0 */
                       double sign)
-{                                      /* In: 'x' axis sign evaluation flag: -1 = evaluate -'X' axis, 1 = evaluate +'X' 
+{                                      /* In: 'x' axis sign evaluation flag: -1 = evaluate -'X' axis, 1 = evaluate +'X'
                                           axis */
 
     double temp, temp1;
diff --git a/trick_source/trick_utils/math/src/deuler_123.c b/trick_source/trick_utils/math/src/deuler_123.c
index b2d8c4e7..92e9e12d 100644
--- a/trick_source/trick_utils/math/src/deuler_123.c
+++ b/trick_source/trick_utils/math/src/deuler_123.c
@@ -23,7 +23,7 @@ PROGRAMMERS:
 
 int euler123(
         double angle[3],    /* In:  r  Method=0, 0=ROLL , 1=PITCH , 2=YAW */
-        double mat[3][3],   /* Out: r  method=0, 
+        double mat[3][3],   /* Out: r  method=0,
                                        Coordinate tranformation matrix   */
         int method, /* In: 0 = Make matrix from angles,
                            1 = Make angles from matrix,
@@ -96,7 +96,7 @@ int euler123(
                                 angle[2] = atan2(-mat[1][0], mat[0][0]);
                         }
                 }
-                /* Out of normal range for asin function, 
+                /* Out of normal range for asin function,
                    but within tolerance */
                 else if (1.0 < mat[2][0] && mat[2][0] <= (1.0 + TOLERANCE)) {
                         angle[0] = atan2(mat[0][1], mat[1][1]);
@@ -117,7 +117,7 @@ int euler123(
                             error_flag[3]=1;
                         }
                 }
-                /* Error: Out of normal range and beyond tolerance 
+                /* Error: Out of normal range and beyond tolerance
                    for asin function */
                 else {
                         double zero = 0.0;
diff --git a/trick_source/trick_utils/math/src/deuler_123_quat.c b/trick_source/trick_utils/math/src/deuler_123_quat.c
index a8dd9abb..b83ed6b0 100644
--- a/trick_source/trick_utils/math/src/deuler_123_quat.c
+++ b/trick_source/trick_utils/math/src/deuler_123_quat.c
@@ -13,14 +13,14 @@ int euler123_quat(
     double angle[3],	/* Inout: r  Method=1, 0=ROLL, 1=PITCH, 2=YAW. */
     double quat[4],	/* Inout: r  Method=0, left handed quaternion matrix. */
     int method, 	/*    In: -- 0 = Make quaternion from angles,
-    			             1 = Make angles from quaternion 
+    			             1 = Make angles from quaternion
     			             2 = Make angles from quaternion but use previous
     				     values to prevent singularities. */
     double *prev)	/*   In: r  Previous values of euler angles. */
 {
 
    double haft_angle[3];
-   double mat00, mat01, mat10, mat11, mat20, mat21, mat22; 
+   double mat00, mat01, mat10, mat11, mat20, mat21, mat22;
    double s1;
    double c1;
    double s2;
@@ -32,7 +32,7 @@ int euler123_quat(
    static unsigned short error_flag[5] = {0, 0, 0, 0, 0}; /* Send errors only once */
 
    if (method == 0){
-   
+
        /* Compute sines and cosines of 0.5*eulers */
        V_SCALE(haft_angle, angle, 0.5);
        s1 = sin(haft_angle[0]);
@@ -40,9 +40,9 @@ int euler123_quat(
        s2 = sin(haft_angle[1]);
        c2 = cos(haft_angle[1]);
        s3 = sin(haft_angle[2]);
-       c3 = cos(haft_angle[2]); 
-       
-       quat[0] =  c1*c2*c3 - s1*s2*s3; 
+       c3 = cos(haft_angle[2]);
+
+       quat[0] =  c1*c2*c3 - s1*s2*s3;
        quat[1] = -c1*s2*s3 - s1*c2*c3;
        quat[2] = -c1*s2*c3 + s1*c2*s3;
        quat[3] = -c1*c2*s3 - s1*s2*c3;
@@ -52,7 +52,7 @@ int euler123_quat(
 #define TOLERANCE 1.0e-15
 
        mat20 = 2. * (quat[1] * quat[3] - quat[0] * quat[2]);
-       
+
        /* Within normal range for asin function */
        if (-1.0 <= mat20 && mat20 <= 1.0) {
                angle[1] = asin(mat20);
@@ -79,7 +79,7 @@ int euler123_quat(
         		   error_flag[1]=1;
         	       }
                } else {
-	       
+
                        mat00 = 1. - 2. * (quat[2] * quat[2] + quat[3] * quat[3]);
                        mat10 = 2. * (quat[1] * quat[2] + quat[0] * quat[3]);
                        mat21 = 2. * (quat[2] * quat[3] + quat[0] * quat[1]);
@@ -88,7 +88,7 @@ int euler123_quat(
         	       angle[2] = atan2(-mat10, mat00);
                }
        }
-       /* Out of normal range for asin function, 
+       /* Out of normal range for asin function,
           but within tolerance */
        else if (1.0 < mat20 && mat20 <= (1.0 + TOLERANCE)) {
                mat01 = 2. * (quat[1] * quat[2] - quat[0] * quat[3]);
@@ -113,7 +113,7 @@ int euler123_quat(
         	   error_flag[3]=1;
                }
        }
-       /* Error: Out of normal range and beyond tolerance 
+       /* Error: Out of normal range and beyond tolerance
           for asin function */
        else {
                double zero = 0.0;
diff --git a/trick_source/trick_utils/math/src/deuler_132.c b/trick_source/trick_utils/math/src/deuler_132.c
index 12f36d94..3dc75844 100644
--- a/trick_source/trick_utils/math/src/deuler_132.c
+++ b/trick_source/trick_utils/math/src/deuler_132.c
@@ -36,7 +36,7 @@ PROGRAMMERS:
 
 int euler132(
         double angle[3],    /* In: r   method=0, 0=ROLL , 1=YAW , 2=PITCH */
-        double mat[3][3],   /* Out: r  method=0, 
+        double mat[3][3],   /* Out: r  method=0,
                                     Coordinate tranformation matrix   */
         int method,         /* In: 0 = Make matrix from angles,
                                    1 = Make angles from matrix,
@@ -110,8 +110,8 @@ int euler132(
                                 angle[2] = atan2(mat[2][0], mat[0][0]);
                         }
                 }
-                /* Out of normal range for asin function, 
-                 * but within tolerance 
+                /* Out of normal range for asin function,
+                 * but within tolerance
                  */
                 else if (1.0 < -mat[1][0] && -mat[1][0] <= (1.0 + TOLERANCE)) {
                         angle[1] = M_PI_2;
@@ -133,8 +133,8 @@ int euler132(
                             error_flag[3]=1;
                         }
                 }
-                /* Error: Out of normal range and beyond tolerance 
-                 * for asin function 
+                /* Error: Out of normal range and beyond tolerance
+                 * for asin function
                  */
                 else {
                         double zero = 0.0;
diff --git a/trick_source/trick_utils/math/src/deuler_132_quat.c b/trick_source/trick_utils/math/src/deuler_132_quat.c
index 4c7415aa..efcac9c0 100644
--- a/trick_source/trick_utils/math/src/deuler_132_quat.c
+++ b/trick_source/trick_utils/math/src/deuler_132_quat.c
@@ -21,7 +21,7 @@ int euler132_quat(
 {
 
    double haft_angle[3];
-   double mat00, mat01, mat02, mat10, mat11, mat12, mat20; 
+   double mat00, mat01, mat02, mat10, mat11, mat12, mat20;
    double s1;
    double c1;
    double s2;
@@ -40,9 +40,9 @@ int euler132_quat(
        s2 = sin(haft_angle[1]);
        c2 = cos(haft_angle[1]);
        s3 = sin(haft_angle[2]);
-       c3 = cos(haft_angle[2]); 
-       
-       quat[0] =  c1*c2*c3 + s1*s2*s3; 
+       c3 = cos(haft_angle[2]);
+
+       quat[0] =  c1*c2*c3 + s1*s2*s3;
        quat[1] = -s1*c2*c3 + c1*s2*s3;
        quat[2] = -c1*c2*s3 + s1*s2*c3;
        quat[3] = -c1*s2*c3 - s1*c2*s3;
@@ -52,7 +52,7 @@ int euler132_quat(
 #define TOLERANCE 1.0e-15
 
        mat10 = 2. * (quat[1] * quat[2] + quat[0] * quat[3]);
-       
+
        /* Within normal range for asin function */
        if (-1.0 <= -mat10 && -mat10 <= 1.0) {
                angle[1] = asin(-mat10);
@@ -87,8 +87,8 @@ int euler132_quat(
         	       angle[2] = atan2(mat20, mat00);
                }
        }
-       /* Out of normal range for asin function, 
-        * but within tolerance 
+       /* Out of normal range for asin function,
+        * but within tolerance
         */
        else if (1.0 < -mat10 && -mat10 <= (1.0 + TOLERANCE)) {
                mat01 = 2. * (quat[1] * quat[2] - quat[0] * quat[3]);
@@ -113,8 +113,8 @@ int euler132_quat(
         	   error_flag[3]=1;
                }
        }
-       /* Error: Out of normal range and beyond tolerance 
-        * for asin function 
+       /* Error: Out of normal range and beyond tolerance
+        * for asin function
         */
        else {
                double zero = 0.0;
diff --git a/trick_source/trick_utils/math/src/deuler_213.c b/trick_source/trick_utils/math/src/deuler_213.c
index de3446b3..174cbb75 100644
--- a/trick_source/trick_utils/math/src/deuler_213.c
+++ b/trick_source/trick_utils/math/src/deuler_213.c
@@ -23,14 +23,14 @@ PROGRAMMERS:
 #include "trick/trick_math.h"
 
 int euler213(double angle[3],   /* In:  r  Method=0, 0=PITCH , 1=ROLL , 2=YAW */
-             double mat[3][3],  /* Out: r  Method=0, 
+             double mat[3][3],  /* Out: r  Method=0,
                                            Coordinate tranformation matrix   */
              int method,        /* In: 0 = Make matrix from angles,
                                        1 = Make angles from matrix,
-                                       2 = Make angles from matrix but use 
-                                           previous values to prevent 
+                                       2 = Make angles from matrix but use
+                                           previous values to prevent
                                            singularities */
-             double *prev,      /* In: r   prev[3], Previous values of 
+             double *prev,      /* In: r   prev[3], Previous values of
                                            euler angles */
              char *file,        /* In: file_name of caller of this function */
              int lineno)
@@ -121,7 +121,7 @@ int euler213(double angle[3],   /* In:  r  Method=0, 0=PITCH , 1=ROLL , 2=YAW */
                             error_flag[3]=1;
                         }
                 }
-                /* Error: Out of normal range & beyond tolerance 
+                /* Error: Out of normal range & beyond tolerance
                    for asin func */
                 else {
                         double zero = 0.0;
diff --git a/trick_source/trick_utils/math/src/deuler_213_quat.c b/trick_source/trick_utils/math/src/deuler_213_quat.c
index ebcf05fa..79e66b24 100644
--- a/trick_source/trick_utils/math/src/deuler_213_quat.c
+++ b/trick_source/trick_utils/math/src/deuler_213_quat.c
@@ -1,6 +1,6 @@
 /*
 PURPOSE:
-	(Generate a LELF_HANDED quaternion using an Euler PITCH_ROLL_YAW sequence 
+	(Generate a LELF_HANDED quaternion using an Euler PITCH_ROLL_YAW sequence
          OR generate an Euler  PITCH_ROLL_YAW sequence using a quaternion.)
 
 PROGRAMMERS:
@@ -20,7 +20,7 @@ int euler213_quat(
 {
 
    double haft_angle[3];
-   double mat00, mat01, mat10, mat11, mat20, mat21, mat22; 
+   double mat00, mat01, mat10, mat11, mat20, mat21, mat22;
    double s1;
    double c1;
    double s2;
@@ -39,25 +39,25 @@ int euler213_quat(
        s2 = sin(haft_angle[1]);
        c2 = cos(haft_angle[1]);
        s3 = sin(haft_angle[2]);
-       c3 = cos(haft_angle[2]); 
-       
+       c3 = cos(haft_angle[2]);
+
        quat[0] =  c1*c2*c3 + s1*s2*s3;
        quat[1] = -c1*s2*c3 - s1*c2*s3;
        quat[2] = -s1*c2*c3 + c1*s2*s3;
        quat[3] = -c1*c2*s3 + s1*s2*c3;
 
-      
+
    }
    else if (method == 1){
 #define TOLERANCE 1.0e-15
        /* Within normal range for asin function */
        mat21 = 2. * (quat[2] * quat[3] + quat[0] * quat[1]);
-       
+
        if (-1.0 <= -mat21 && -mat21 <= 1.0) {
                angle[1] = asin(-mat21);
                if (M_ABS(angle[1] - M_PI_2) < 1.0e-6) {
                        mat10 = 2. * (quat[1] * quat[2] + quat[0] * quat[3]);
-                       mat00 = 1. - 2. * (quat[2] * quat[2] + quat[3] * quat[3]);	       
+                       mat00 = 1. - 2. * (quat[2] * quat[2] + quat[3] * quat[3]);
         	       angle[0] = atan2(mat10, mat00);
         	       angle[1] = M_PI_2;
         	       angle[2] = 0.0;
@@ -68,7 +68,7 @@ int euler213_quat(
         	       }
                } else if (M_ABS(angle[1] + M_PI_2) < 1.0e-6) {
                        mat10 = 2. * (quat[1] * quat[2] + quat[0] * quat[3]);
-                       mat00 = 1. - 2. * (quat[2] * quat[2] + quat[3] * quat[3]);	       
+                       mat00 = 1. - 2. * (quat[2] * quat[2] + quat[3] * quat[3]);
         	       angle[0] = atan2(-mat10, mat00);
         	       angle[1] = -M_PI_2;
         	       angle[2] = 0.0;
@@ -90,7 +90,7 @@ int euler213_quat(
        /* Out of normal range for asin func, but within tolerance */
         else if (1.0 < -mat21 && -mat21 <= (1.0 + TOLERANCE)) {
                 mat10 = 2. * (quat[1] * quat[2] + quat[0] * quat[3]);
-                mat00 = 1. - 2. * (quat[2] * quat[2] + quat[3] * quat[3]);		
+                mat00 = 1. - 2. * (quat[2] * quat[2] + quat[3] * quat[3]);
                 angle[0] = atan2(mat10, mat00);
                 angle[1] = M_PI_2;
                 angle[2] = 0.0;
@@ -101,7 +101,7 @@ int euler213_quat(
                 }
         } else if ((-1.0 - TOLERANCE) <= -mat21 && -mat21 < -1.0) {
                 mat10 = 2. * (quat[1] * quat[2] + quat[0] * quat[3]);
-                mat00 = 1. - 2. * (quat[2] * quat[2] + quat[3] * quat[3]);		
+                mat00 = 1. - 2. * (quat[2] * quat[2] + quat[3] * quat[3]);
                 angle[0] = atan2(-mat10, mat00);
                 angle[1] = -M_PI_2;
                 angle[2] = 0.0;
@@ -111,7 +111,7 @@ int euler213_quat(
                     error_flag[3]=1;
                 }
         }
-        /* Error: Out of normal range & beyond tolerance 
+        /* Error: Out of normal range & beyond tolerance
            for asin func */
         else {
                 double zero = 0.0;
@@ -131,7 +131,7 @@ int euler213_quat(
         /* Compute euler angles from tranformation */
         if (M_ABS(mat21 + 1.0) < 1.0e-6) {
                 mat10 = 2. * (quat[1] * quat[2] + quat[0] * quat[3]);
-                mat00 = 1. - 2. * (quat[2] * quat[2] + quat[3] * quat[3]);		
+                mat00 = 1. - 2. * (quat[2] * quat[2] + quat[3] * quat[3]);
                 angle[0] = atan2(mat10, mat00) + prev[2];
                 angle[1] = M_PI_2;
                 angle[2] = prev[2];
@@ -143,7 +143,7 @@ int euler213_quat(
 
         } else if (M_ABS(mat21 - 1.0) < 1.0e-6) {
                 mat10 = 2. * (quat[1] * quat[2] + quat[0] * quat[3]);
-                mat00 = 1. - 2. * (quat[2] * quat[2] + quat[3] * quat[3]);		
+                mat00 = 1. - 2. * (quat[2] * quat[2] + quat[3] * quat[3]);
                 angle[0] = atan2(-mat10, mat00) - prev[2];
                 angle[1] = -M_PI_2;
                 angle[2] = prev[2];
diff --git a/trick_source/trick_utils/math/src/deuler_231.c b/trick_source/trick_utils/math/src/deuler_231.c
index 1c0cdfb7..39bbd9da 100644
--- a/trick_source/trick_utils/math/src/deuler_231.c
+++ b/trick_source/trick_utils/math/src/deuler_231.c
@@ -24,14 +24,14 @@ PROGRAMMERS:
 
 int euler231( /* Return: --   None. */
         double angle[3],    /* In: r  Method=0, 0=PITCH, 1=YAW, 2=ROLL */
-        double mat[3][3],   /* Out: r  Method=0, 
+        double mat[3][3],   /* Out: r  Method=0,
                                        Coordinate tranformation matrix   */
         int method,         /* In: 0 = Make matrix from angles,
                                    1 = Make angles from matrix,
-                                   2 = Make angles from matrix but 
-                                       use previous values to 
+                                   2 = Make angles from matrix but
+                                       use previous values to
                                        prevent singularities */
-        double *prev,       /* In: r   prev[3], Previous values of 
+        double *prev,       /* In: r   prev[3], Previous values of
                                        euler angles */
         char *file,         /* In: File_name of caller of this function */
         int lineno)         /* In: line # of call to this function in fname */
diff --git a/trick_source/trick_utils/math/src/deuler_231_quat.c b/trick_source/trick_utils/math/src/deuler_231_quat.c
index f0b62ee4..7925139b 100644
--- a/trick_source/trick_utils/math/src/deuler_231_quat.c
+++ b/trick_source/trick_utils/math/src/deuler_231_quat.c
@@ -20,7 +20,7 @@ int euler231_quat(
 {
 
    double haft_angle[3];
-   double mat00, mat01, mat02, mat11, mat20, mat21, mat22; 
+   double mat00, mat01, mat02, mat11, mat20, mat21, mat22;
    double s1;
    double c1;
    double s2;
@@ -30,7 +30,7 @@ int euler231_quat(
    double tmp;
    int ret = 0;
    static unsigned short error_flag[5] = {0, 0, 0, 0, 0}; /* Send errors only once */
-   
+
    if (method == 0){
        /* Compute sines and cosines of 0.5*eulers */
        V_SCALE(haft_angle, angle, 0.5);
@@ -39,13 +39,13 @@ int euler231_quat(
        s2 = sin(haft_angle[1]);
        c2 = cos(haft_angle[1]);
        s3 = sin(haft_angle[2]);
-       c3 = cos(haft_angle[2]); 
+       c3 = cos(haft_angle[2]);
 
        quat[0] =  c1*c2*c3 - s1*s2*s3;
        quat[1] = -c1*c2*s3 - s1*s2*c3;
        quat[2] = -c1*s2*s3 - s1*c2*c3;
        quat[3] = -c1*s2*c3 + s1*c2*s3;
-      
+
    }
    else if (method == 1){
 #define TOLERANCE 1.0e-15
diff --git a/trick_source/trick_utils/math/src/deuler_312.c b/trick_source/trick_utils/math/src/deuler_312.c
index ae736d7f..444629b2 100644
--- a/trick_source/trick_utils/math/src/deuler_312.c
+++ b/trick_source/trick_utils/math/src/deuler_312.c
@@ -24,13 +24,13 @@ PROGRAMMERS:
 
 int euler312(
         double angle[3],    /* In: r   Method=0, 0=YAW, 1=ROLL, 2=PITCH */
-        double mat[3][3],   /* Out: r  Method=0, 
+        double mat[3][3],   /* Out: r  Method=0,
                                        Coordinate tranformation matrix */
         int method,         /* In: 0 = Make matrix from angles,
                                    1 = Make angles from matrix,
                                    2 = Make angles from matrix but use previous
                                        values to prevent singularities */
-        double *prev,       /* In: r   prev[3], Previous values of 
+        double *prev,       /* In: r   prev[3], Previous values of
                                        euler angles */
         char *file,         /* In: file_name of caller of this function */
         int lineno)         /* In: line # of call to this function in fname */
diff --git a/trick_source/trick_utils/math/src/deuler_312_quat.c b/trick_source/trick_utils/math/src/deuler_312_quat.c
index c5279a04..68072674 100644
--- a/trick_source/trick_utils/math/src/deuler_312_quat.c
+++ b/trick_source/trick_utils/math/src/deuler_312_quat.c
@@ -1,6 +1,6 @@
 /*
 PURPOSE:
-	(Generate a LELF_HANDED quaternion using an Euler YAW_ROLL_PITCH sequence 
+	(Generate a LELF_HANDED quaternion using an Euler YAW_ROLL_PITCH sequence
          OR generate an Euler YAW_ROLL_PITCH sequence using a quaternion.)
 
 PROGRAMMERS:
@@ -20,19 +20,19 @@ int euler312_quat(
 {
 
    double haft_angle[3];
-   double mat00, mat01, mat02, mat10, mat11, mat12,  mat22; 
-   double s1;		   
-   double c1;		   
-   double s2;		   
-   double c2;		   
-   double s3;		   
-   double c3;		   
+   double mat00, mat01, mat02, mat10, mat11, mat12,  mat22;
+   double s1;
+   double c1;
+   double s2;
+   double c2;
+   double s3;
+   double c3;
    double tmp;
    int ret = 0;
    static unsigned short error_flag[5] = {0, 0, 0, 0, 0}; /* Send errors only once */
 
    if (method == 0){
-   
+
        /* Compute sines and cosines of 0.5*eulers */
        V_SCALE(haft_angle, angle, 0.5);
        s1 = sin(haft_angle[0]);
@@ -40,18 +40,18 @@ int euler312_quat(
        s2 = sin(haft_angle[1]);
        c2 = cos(haft_angle[1]);
        s3 = sin(haft_angle[2]);
-       c3 = cos(haft_angle[2]); 
-       
-       quat[0] =  c1*c2*c3 - s1*s2*s3; 
+       c3 = cos(haft_angle[2]);
+
+       quat[0] =  c1*c2*c3 - s1*s2*s3;
        quat[1] = -c1*s2*c3 + s1*c2*s3;
        quat[2] = -c1*c2*s3 - s1*s2*c3;
        quat[3] = -c1*s2*s3 - s1*c2*c3;
-            
+
    } else if (method == 1) {
 #define TOLERANCE 1.0e-15
 
        mat12 =  2.*(quat[2]*quat[3] - quat[0]*quat[1]);
-       
+
        /* Within normal range for asin function */
        if (-1.0 <= mat12 && mat12 <= 1.0) {
                angle[1] = asin(mat12);
diff --git a/trick_source/trick_utils/math/src/deuler_321.c b/trick_source/trick_utils/math/src/deuler_321.c
index 6ef565b0..bcf5cad9 100644
--- a/trick_source/trick_utils/math/src/deuler_321.c
+++ b/trick_source/trick_utils/math/src/deuler_321.c
@@ -24,13 +24,13 @@ PROGRAMMERS:
 
 int euler321(
         double angle[3],    /* In:  r   method=0, 0=YAW, 1=PITCH, 2=ROLL */
-        double mat[3][3],   /* Out: r   Method=0, 
+        double mat[3][3],   /* Out: r   Method=0,
                                         Coordinate tranformation matrix   */
         int method,         /* In: 0 = Make matrix from angles,
                                    1 = Make angles from matrix,
                                    2 = Make angles from matrix but use previous
                                        values to prevent singularities */
-        double *prev,       /* In: r   prev[3], Previous values of euler 
+        double *prev,       /* In: r   prev[3], Previous values of euler
                                        angles */
         char *file,         /* In: file_name of caller of this function */
         int lineno)         /* In: line # of call to this function in fname */
diff --git a/trick_source/trick_utils/math/src/deuler_321_quat.c b/trick_source/trick_utils/math/src/deuler_321_quat.c
index 9b7b2585..82ccba2a 100644
--- a/trick_source/trick_utils/math/src/deuler_321_quat.c
+++ b/trick_source/trick_utils/math/src/deuler_321_quat.c
@@ -1,6 +1,6 @@
 /*
 PURPOSE:
-	(Generate a LELF_HANDED quaternion using an Euler YAW_PITCH_ROLL sequence 
+	(Generate a LELF_HANDED quaternion using an Euler YAW_PITCH_ROLL sequence
          OR generate an Euler YAW_PITCH_ROLL sequence using a quaternion.)
 
 PROGRAMMERS:
@@ -13,14 +13,14 @@ int euler321_quat(
     double angle[3],	/* Inout: r  Method=1, 0=YAW, 1=PITCH, 2=ROLL. */
     double quat[4],	/* Inout: r  Method=0, left handed quaternion matrix. */
     int method, 	/*    In: -- 0 = Make quaternion from angles,
-    			             1 = Make angles from quaternion 
+    			             1 = Make angles from quaternion
     			             2 = Make angles from quaternion but use previous
     				     values to prevent singularities. */
     double *prev)	/*   In: r  Previous values of euler angles. */
 {
 
    double haft_angle[3];
-   double mat00, mat01, mat02, mat12, mat20, mat21, mat22; 
+   double mat00, mat01, mat02, mat12, mat20, mat21, mat22;
    double s1;
    double c1;
    double s2;
@@ -29,8 +29,8 @@ int euler321_quat(
    double c3;
    double tmp;
    int ret = 0;
-   static unsigned short error_flag[5] = {0, 0, 0, 0, 0}; /* Send errors only once */  
-   
+   static unsigned short error_flag[5] = {0, 0, 0, 0, 0}; /* Send errors only once */
+
    if (method == 0){
 
        /* Compute sines and cosines of 0.5*yaw, .5*pitch, and .5*roll */
@@ -40,13 +40,13 @@ int euler321_quat(
        s2 = sin(haft_angle[1]);
        c2 = cos(haft_angle[1]);
        s3 = sin(haft_angle[2]);
-       c3 = cos(haft_angle[2]); 
-       
+       c3 = cos(haft_angle[2]);
+
        quat[0] =  c3*c2*c1 + s3*s2*s1;
        quat[1] = -s3*c2*c1 + c3*s2*s1;
        quat[2] = -c3*s2*c1 - s3*c2*s1;
        quat[3] = -c3*c2*s1 + s3*s2*c1;
-      
+
    }else if (method == 1){
 #define TOLERANCE 1.0e-15
 
@@ -57,7 +57,7 @@ int euler321_quat(
            angle[1] = asin(-mat02);
            if (M_ABS(angle[1] - M_PI_2) < 1.0e-6) {
            	   mat20 = 2.*(quat[1]*quat[3] + quat[2]*quat[0]);
-           	   mat21 = 2.*(quat[2]*quat[3] - quat[1]*quat[0]);	   
+           	   mat21 = 2.*(quat[2]*quat[3] - quat[1]*quat[0]);
             	   angle[0] = atan2(mat21, mat20);
             	   angle[1] = M_PI_2;
             	   angle[2] = 0.0;
@@ -68,7 +68,7 @@ int euler321_quat(
             	   }
            } else if (M_ABS(angle[1] + M_PI_2) < 1.0e-6) {
            	   mat20 = 2.*(quat[1]*quat[3] + quat[2]*quat[0]);
-           	   mat21 = 2.*(quat[2]*quat[3] - quat[1]*quat[0]);	   
+           	   mat21 = 2.*(quat[2]*quat[3] - quat[1]*quat[0]);
             	   angle[0] = atan2(-mat21, -mat20);
             	   angle[1] = -M_PI_2;
             	   angle[2] = 0.0;
@@ -89,7 +89,7 @@ int euler321_quat(
        /* Out of normal range for asin func, but within tolerance */
        else if (1.0 < -mat02 && -mat02 <= (1.0 + TOLERANCE)) {
            mat20 = 2.*(quat[1]*quat[3] + quat[2]*quat[0]);
-           mat21 = 2.*(quat[2]*quat[3] - quat[1]*quat[0]);	   
+           mat21 = 2.*(quat[2]*quat[3] - quat[1]*quat[0]);
            angle[0] = atan2(mat21, mat20);
            angle[1] = M_PI_2;
            angle[2] = 0.0;
@@ -100,7 +100,7 @@ int euler321_quat(
            }
        } else if ((-1.0 - TOLERANCE) <= -mat02 && -mat02 < -1.0) {
            mat20 = 2.*(quat[1]*quat[3] + quat[2]*quat[0]);
-           mat21 = 2.*(quat[2]*quat[3] - quat[1]*quat[0]);	 
+           mat21 = 2.*(quat[2]*quat[3] - quat[1]*quat[0]);
            angle[0] = atan2(-mat21, -mat20);
            angle[1] = -M_PI_2;
            angle[2] = 0.0;
@@ -129,7 +129,7 @@ int euler321_quat(
         /* Compute euler angles from tranformation */
         if (M_ABS(mat02 + 1.0) < 1.0e-6) {
             mat20 = 2.*(quat[1]*quat[3] + quat[2]*quat[0]);
-            mat21 = 2.*(quat[2]*quat[3] - quat[1]*quat[0]);	  
+            mat21 = 2.*(quat[2]*quat[3] - quat[1]*quat[0]);
             angle[0] = atan2(mat21, mat20) + prev[2];
             angle[1] = M_PI_2;
             angle[2] = prev[2];
@@ -141,7 +141,7 @@ int euler321_quat(
 
         } else if (M_ABS(mat02 - 1.0) < 1.0e-6) {
             mat20 = 2.*(quat[1]*quat[3] + quat[2]*quat[0]);
-            mat21 = 2.*(quat[2]*quat[3] - quat[1]*quat[0]);	  
+            mat21 = 2.*(quat[2]*quat[3] - quat[1]*quat[0]);
             angle[0] = atan2(-mat21, -mat20) + prev[2];
             angle[1] = -M_PI_2;
             angle[2] = prev[2];
@@ -154,7 +154,7 @@ int euler321_quat(
             mat00 = 1. - 2.*(quat[2]*quat[2] + quat[3]*quat[3]);
             mat01 =	 2.*(quat[1]*quat[2] - quat[0]*quat[3]);
             mat12 =	 2.*(quat[2]*quat[3] + quat[1]*quat[0]);
-            mat22 = 1. - 2.*(quat[1]*quat[1] + quat[2]*quat[2]);		    
+            mat22 = 1. - 2.*(quat[1]*quat[1] + quat[2]*quat[2]);
             angle[0] = atan2(mat01, mat00);
             angle[1] = asin(-mat02);
             angle[2] = atan2(mat12, mat22);
diff --git a/trick_source/trick_utils/math/src/dmtxm.c b/trick_source/trick_utils/math/src/dmtxm.c
index da126145..5755d01a 100644
--- a/trick_source/trick_utils/math/src/dmtxm.c
+++ b/trick_source/trick_utils/math/src/dmtxm.c
@@ -1,4 +1,4 @@
-/* 
+/*
    PURPOSE: (Matrix transpose times matrix)
 
    ASSUMPTIONS AND LIMITATIONS: ((3x3 Matrix implementation))
diff --git a/trick_source/trick_utils/math/src/dmxm.c b/trick_source/trick_utils/math/src/dmxm.c
index 6a0d42a0..f71a5c1e 100644
--- a/trick_source/trick_utils/math/src/dmxm.c
+++ b/trick_source/trick_utils/math/src/dmxm.c
@@ -1,4 +1,4 @@
-/* 
+/*
    PURPOSE: (Matrix multiplication)
 
    ASSUMPTIONS AND LIMITATIONS: ((3x3 Matrix implementation))
diff --git a/trick_source/trick_utils/math/src/gauss_rnd_bell.c b/trick_source/trick_utils/math/src/gauss_rnd_bell.c
index 26f4b752..4301d765 100644
--- a/trick_source/trick_utils/math/src/gauss_rnd_bell.c
+++ b/trick_source/trick_utils/math/src/gauss_rnd_bell.c
@@ -11,7 +11,7 @@
 
    LIBRARY DEPENDENCY: ((gauss_rnd_bell.o) (uniform_rnd_1.o) (uniform_rnd_triple.o))
 
-   PROGRAMMERS: (((Ray Li) (LMES/DUAL) (96 Nov) (1.0) (ICDS random number generator)) ((Robert Gay) (LinCom) (May 1998) 
+   PROGRAMMERS: (((Ray Li) (LMES/DUAL) (96 Nov) (1.0) (ICDS random number generator)) ((Robert Gay) (LinCom) (May 1998)
    (--) (Trick format)) ((Robert Gay) (Titan-LinCom) (Aug 2001) (--) (Updates to put routines into trick math))) */
 
 #include "trick/rand_generator.h"
diff --git a/trick_source/trick_utils/math/src/gauss_rnd_pseudo.c b/trick_source/trick_utils/math/src/gauss_rnd_pseudo.c
index 2c73dda9..a46f46ac 100644
--- a/trick_source/trick_utils/math/src/gauss_rnd_pseudo.c
+++ b/trick_source/trick_utils/math/src/gauss_rnd_pseudo.c
@@ -10,7 +10,7 @@
 
    LIBRARY DEPENDENCY: ((gauss_rnd_pseudo.o) (uniform_rnd_1.o) (uniform_rnd_triple.o))
 
-   PROGRAMMERS: (((Ray Li) (LMES/DUAL) (96 Nov) (1.0) (ICDS random number generator)) ((Robert Gay) (LinCom) (May 1998) 
+   PROGRAMMERS: (((Ray Li) (LMES/DUAL) (96 Nov) (1.0) (ICDS random number generator)) ((Robert Gay) (LinCom) (May 1998)
    (--) (Trick format)) ((Robert Gay) (Titan-LinCom) (Aug 2001) (--) (Updates to put routines into trick math))) */
 
 #include "trick/rand_generator.h"
diff --git a/trick_source/trick_utils/math/src/rand_num.c b/trick_source/trick_utils/math/src/rand_num.c
index 65dcc838..e0c8390d 100644
--- a/trick_source/trick_utils/math/src/rand_num.c
+++ b/trick_source/trick_utils/math/src/rand_num.c
@@ -1,7 +1,7 @@
 /*
    PURPOSE: (Switching logic for selected random number sequence generator)
 
-   ASSUMPTIONS AND LIMITATIONS: ((Option 0: Uniform - Single Linear Congruential Generator) (Option 1: Uniform - Triple 
+   ASSUMPTIONS AND LIMITATIONS: ((Option 0: Uniform - Single Linear Congruential Generator) (Option 1: Uniform - Triple
    Linear Congruential Generator) (Option 2: Normalized Gaussian - Pseudo) (Option 3: Normalized Gaussian - Box Muller
    - Bell shaped) (Note: Options 2 and 3 can use either the single LCG or the triple LCG))
 
diff --git a/trick_source/trick_utils/math/src/uniform_rnd_1.c b/trick_source/trick_utils/math/src/uniform_rnd_1.c
index c01354a3..33e950e4 100644
--- a/trick_source/trick_utils/math/src/uniform_rnd_1.c
+++ b/trick_source/trick_utils/math/src/uniform_rnd_1.c
@@ -44,7 +44,7 @@ double uniform_rnd_1(RAND_GENERATOR * G)
     static long m = 2147483647; /* Value of m based on F. Clark note, 4/22/92 */
     double new_random_number;
 
-    /* 
+    /*
      *  NOTE:  This function behaves slightly different from
      *  ICDS's g_rnd().
      *   ICDS g_rnd():
diff --git a/trick_source/trick_utils/math/test/UnitTestEulerQuat.cpp b/trick_source/trick_utils/math/test/UnitTestEulerQuat.cpp
index 3d0d534b..a1886c90 100644
--- a/trick_source/trick_utils/math/test/UnitTestEulerQuat.cpp
+++ b/trick_source/trick_utils/math/test/UnitTestEulerQuat.cpp
@@ -4,7 +4,7 @@
 using namespace std;
 
 class EulerQuatTest : public ::testing::Test {
-   
+
    public:
 
       TRANSFORM init_data;
@@ -52,7 +52,7 @@ class EulerQuatTest : public ::testing::Test {
           double eul_error[3];
 
           M_IDENT(mat_error);
-          V_INIT(eul_error);          
+          V_INIT(eul_error);
           QxQt(Q_error, Q, quat);
           quat_to_mat(mat_error, Q_error);
           euler_matrix(eul_error, mat_error, 0 , this->init_data.euler_sequence);
@@ -70,7 +70,7 @@ class EulerQuatTest : public ::testing::Test {
       void test_euler_to_quat(){
           double Q[4];
           euler_quat(this->init_data.euler_angles, Q, 0,  this->init_data.euler_sequence);
-          compare_quat( Q ); 
+          compare_quat( Q );
           return;
       }
       void test_quat_to_euler(int test){
@@ -79,7 +79,7 @@ class EulerQuatTest : public ::testing::Test {
           if(this->method == 1){
               euler_quat(eul, this->quat, this->method, this->init_data.euler_sequence);
           }
-          else { 
+          else {
              switch (this->init_data.euler_sequence) {
                  case Roll_Pitch_Yaw:
                      euler123_quat( eul, this->quat, 2, this->init_data.euler_angles );
@@ -119,7 +119,7 @@ TEST_F(EulerQuatTest, euler123_to_quat)
       euler_matrix(init_data.euler_angles, mat, 0 , init_data.euler_sequence);
       mat_to_quat(quat, mat);
       test_euler_to_quat();
-  }  
+  }
   EXPECT_EQ(num_pass, num_tests);
 }
 
@@ -135,7 +135,7 @@ TEST_F(EulerQuatTest, euler132_to_quat)
       euler_matrix(init_data.euler_angles, mat, 0 , init_data.euler_sequence);
       mat_to_quat(quat, mat);
       test_euler_to_quat();
-  }  
+  }
   EXPECT_EQ(num_pass, num_tests);
 }
 
@@ -151,7 +151,7 @@ TEST_F(EulerQuatTest, euler231_to_quat)
       euler_matrix(init_data.euler_angles, mat, 0 , init_data.euler_sequence);
       mat_to_quat(quat, mat);
       test_euler_to_quat();
-  }  
+  }
   EXPECT_EQ(num_pass, num_tests);
 }
 
@@ -167,7 +167,7 @@ TEST_F(EulerQuatTest, euler213_to_quat)
       euler_matrix(init_data.euler_angles, mat, 0 , init_data.euler_sequence);
       mat_to_quat(quat, mat);
       test_euler_to_quat();
-  }  
+  }
   EXPECT_EQ(num_pass, num_tests);
 }
 
@@ -183,7 +183,7 @@ TEST_F(EulerQuatTest, euler312_to_quat)
       euler_matrix(init_data.euler_angles, mat, 0 , init_data.euler_sequence);
       mat_to_quat(quat, mat);
       test_euler_to_quat();
-  }  
+  }
   EXPECT_EQ(num_pass, num_tests);
 }
 
@@ -199,7 +199,7 @@ TEST_F(EulerQuatTest, euler321_to_quat)
       euler_matrix(init_data.euler_angles, mat, 0 , init_data.euler_sequence);
       mat_to_quat(quat, mat);
       test_euler_to_quat();
-  }  
+  }
   EXPECT_EQ(num_pass, num_tests);
 }
 
@@ -216,7 +216,7 @@ TEST_F(EulerQuatTest, quat_to_euler123_method1)
       euler_matrix(init_data.euler_angles, mat, 0 , init_data.euler_sequence);
       mat_to_quat(quat, mat);
       test_quat_to_euler(1);
-  }  
+  }
   EXPECT_EQ(num_pass, num_tests);
 }
 
@@ -232,7 +232,7 @@ TEST_F(EulerQuatTest, quat_to_euler123_method2)
       euler_matrix(init_data.euler_angles, mat, 0 , init_data.euler_sequence);
       mat_to_quat(quat, mat);
       test_quat_to_euler(2);
-  }  
+  }
   EXPECT_EQ(num_pass, num_tests);
 }
 
@@ -248,7 +248,7 @@ TEST_F(EulerQuatTest, quat_to_euler132_method1)
       euler_matrix(init_data.euler_angles, mat, 0 , init_data.euler_sequence);
       mat_to_quat(quat, mat);
       test_quat_to_euler(1);
-  }  
+  }
   EXPECT_EQ(num_pass, num_tests);
 }
 
@@ -264,7 +264,7 @@ TEST_F(EulerQuatTest, quat_to_euler132_method2)
       euler_matrix(init_data.euler_angles, mat, 0 , init_data.euler_sequence);
       mat_to_quat(quat, mat);
       test_quat_to_euler(2);
-  }  
+  }
   EXPECT_EQ(num_pass, num_tests);
 }
 
@@ -280,7 +280,7 @@ TEST_F(EulerQuatTest, quat_to_euler231_method1)
       euler_matrix(init_data.euler_angles, mat, 0 , init_data.euler_sequence);
       mat_to_quat(quat, mat);
       test_quat_to_euler(1);
-  }  
+  }
   EXPECT_EQ(num_pass, num_tests);
 }
 
@@ -296,7 +296,7 @@ TEST_F(EulerQuatTest, quat_to_euler231_method2)
       euler_matrix(init_data.euler_angles, mat, 0 , init_data.euler_sequence);
       mat_to_quat(quat, mat);
       test_quat_to_euler(2);
-  }  
+  }
   EXPECT_EQ(num_pass, num_tests);
 }
 
@@ -312,7 +312,7 @@ TEST_F(EulerQuatTest, quat_to_euler213_method1)
       euler_matrix(init_data.euler_angles, mat, 0 , init_data.euler_sequence);
       mat_to_quat(quat, mat);
       test_quat_to_euler(1);
-  }  
+  }
   EXPECT_EQ(num_pass, num_tests);
 }
 
@@ -328,7 +328,7 @@ TEST_F(EulerQuatTest, quat_to_euler213_method2)
       euler_matrix(init_data.euler_angles, mat, 0 , init_data.euler_sequence);
       mat_to_quat(quat, mat);
       test_quat_to_euler(2);
-  }  
+  }
   EXPECT_EQ(num_pass, num_tests);
 }
 
@@ -344,7 +344,7 @@ TEST_F(EulerQuatTest, quat_to_euler312_method1)
       euler_matrix(init_data.euler_angles, mat, 0 , init_data.euler_sequence);
       mat_to_quat(quat, mat);
       test_quat_to_euler(1);
-  }  
+  }
   EXPECT_EQ(num_pass, num_tests);
 }
 
@@ -360,7 +360,7 @@ TEST_F(EulerQuatTest, quat_to_euler312_method2)
       euler_matrix(init_data.euler_angles, mat, 0 , init_data.euler_sequence);
       mat_to_quat(quat, mat);
       test_quat_to_euler(2);
-  }  
+  }
   EXPECT_EQ(num_pass, num_tests);
 }
 
@@ -376,7 +376,7 @@ TEST_F(EulerQuatTest, quat_to_euler321_method1)
       euler_matrix(init_data.euler_angles, mat, 0 , init_data.euler_sequence);
       mat_to_quat(quat, mat);
       test_quat_to_euler(1);
-  }  
+  }
   EXPECT_EQ(num_pass, num_tests);
 }
 
@@ -392,7 +392,7 @@ TEST_F(EulerQuatTest, quat_to_euler321_method2)
       euler_matrix(init_data.euler_angles, mat, 0 , init_data.euler_sequence);
       mat_to_quat(quat, mat);
       test_quat_to_euler(2);
-  }  
+  }
   EXPECT_EQ(num_pass, num_tests);
 }
 
diff --git a/trick_source/trick_utils/shm/src/tsm_init.c b/trick_source/trick_utils/shm/src/tsm_init.c
index 01f0b937..40ffc374 100644
--- a/trick_source/trick_utils/shm/src/tsm_init.c
+++ b/trick_source/trick_utils/shm/src/tsm_init.c
@@ -24,7 +24,7 @@ key_t my_ftok(const char* path, int proj_id) {
     // where p= proj_id, d=device, i=inode
     //return ((key_t)( (proj_id<<24) + (long)(st.st_dev<<16) + (long)(st.st_ino & 0xFFFF) ));
     // however, the device (st_dev) is not necessarily the same from machine to machine
-    // which means if you run a checkpointed sim on a different machine, the shared memory 
+    // which means if you run a checkpointed sim on a different machine, the shared memory
     // keys would be different and therefore would not work.
     // So we will do our own key generation using st_size instead of st_dev:
     size_8bit = st.st_size;
@@ -97,7 +97,7 @@ int tsm_init(TSMDevice * shm_device)
         // initialize the lock
         pthread_rwlock_init(shm_device->rwlock_addr, &shm_device->rwlattr);
     }
-    
+
     fprintf(stderr, "Trick shared memory %d init Successful (shmid=%d)\n", proj_id, shm_device->shmid);
 
     proj_id++;
diff --git a/trick_source/trick_utils/trick_adt/test_program/test.c b/trick_source/trick_utils/trick_adt/test_program/test.c
index 5542f2fe..8bc3b4ba 100644
--- a/trick_source/trick_utils/trick_adt/test_program/test.c
+++ b/trick_source/trick_utils/trick_adt/test_program/test.c
@@ -43,7 +43,7 @@ void main()
       fflush(stdin);
       switch(ch)
       {
-         case '1':    
+         case '1':
            newitem=(ITEM*)malloc(sizeof(ITEM));
            printf("\nEnter a string\n");
            scanf("%s",buffer);
@@ -56,7 +56,7 @@ void main()
            break;
          case '2':
            printf("Enter key\n");
-     
+
            scanf("%d",&newnum);
            printf("Looking for %d\n",newnum);
            tempitem.key=newnum;
@@ -68,13 +68,13 @@ void main()
            }
            else
            {
-              printf("Item not found\n"); 
+              printf("Item not found\n");
            }
            break;
          case '3':
            printf("Enter key\n");
            scanf("%d",&newnum);
-           tempitem.key=newnum; 
+           tempitem.key=newnum;
            node=bstFind(&tempitem,&bst);
            if(node != NULL)
            {
@@ -84,7 +84,7 @@ void main()
            }
            else
            {
-              printf("Item not found\n"); 
+              printf("Item not found\n");
            }
            break;
          default:done=1;
diff --git a/trick_source/trick_utils/units/Unittest/unit_cpp_test.cpp b/trick_source/trick_utils/units/Unittest/unit_cpp_test.cpp
index db527c53..120aa4ec 100644
--- a/trick_source/trick_utils/units/Unittest/unit_cpp_test.cpp
+++ b/trick_source/trick_utils/units/Unittest/unit_cpp_test.cpp
@@ -16,7 +16,7 @@ int pretty_close (double a, double b) {
 
      if ( fabs(a + b) > TOLERANCE ) {
 	  if ( ( ( 2.0 * fabs(a-b)) / fabs(a+b)) > TOLERANCE )  {
-	       return 0;    
+	       return 0;
 	  }
      }
      return close;
@@ -25,7 +25,7 @@ int pretty_close (double a, double b) {
 
 void validate_conv_fn (Unit *u1, Unit *u2, double c1, double c0) {
      UCFn *cf;
-     
+
      test_number ++;
      cout << "TEST " << test_number << ":" << endl;
      cout << "expecting {" << c1 << "," << c0 << "}" << endl;
@@ -46,11 +46,11 @@ void validate_conv_fn (Unit *u1, Unit *u2, double c1, double c0) {
 
 void test_conversion ( Unit *u1, Unit *u2) {
      UCFn *cf;
-     
+
      test_number ++;
      try {
 	  cout << "TEST " << test_number << ":" << endl;
-	  cout << "Try " << u1 << " to " << u2 << endl; 
+	  cout << "Try " << u1 << " to " << u2 << endl;
 	  cf  = u1->Conversion_to(u2);
 	  cout << "Conversion function: " << cf << endl;
 	  delete cf;
@@ -63,11 +63,11 @@ void test_conversion ( Unit *u1, Unit *u2) {
 
 void test_conversion_exception ( Unit *u1, Unit *u2) {
      UCFn *cf;
-     
+
      test_number ++;
      try {
 	  cout << "TEST " << test_number << ":" << endl;
-	  cout << "Try " << u1 << " to " << u2 << " (We expect an exception)" << endl; 
+	  cout << "Try " << u1 << " to " << u2 << " (We expect an exception)" << endl;
 	  cf  = u1->Conversion_to(u2);
 	  cout << "Conversion function: " << cf << endl;
 	  delete cf;
@@ -75,7 +75,7 @@ void test_conversion_exception ( Unit *u1, Unit *u2) {
          n_failures++ ;
      } catch (Unit::CONVERSION_ERROR) {
 	  cout << "RESULT: PASS." << endl << endl;
-     }     
+     }
 }
 
 void test_unit_creation (const char *u_str) {
@@ -92,7 +92,7 @@ void test_unit_creation (const char *u_str) {
      } catch (Unit::CONVERSION_ERROR) {
 	  cout << "RESULT: FAIL." << endl << endl;
          n_failures++ ;
-     }     
+     }
 }
 
 void test_unit_exception (const char *u_str) {
@@ -109,7 +109,7 @@ void test_unit_exception (const char *u_str) {
          n_failures++ ;
      } catch (Unit::CONVERSION_ERROR) {
 	  cout << "RESULT: PASS." << endl << endl;
-     }     
+     }
 }
 
 
@@ -127,7 +127,7 @@ cout << "=======================================================================
 	  Unit *Day     = new Unit("day");
 
 	  validate_conv_fn (Second ,Second,                            1.0, 0.0 );
-	  validate_conv_fn (Second ,Minute,                     (1.0/60.0), 0.0 );       
+	  validate_conv_fn (Second ,Minute,                     (1.0/60.0), 0.0 );
 	  validate_conv_fn (Second ,Hour,                (1.0/(60.0*60.0)), 0.0 );
 	  validate_conv_fn (Second ,Day,            (1.0/(60.0*60.0*24.0)), 0.0 );
 
@@ -148,7 +148,7 @@ cout << "=======================================================================
 	  Unit *Mile           = new Unit("mi");
 	  Unit *Nautical_Mile  = new Unit("n.m.");
 	  Unit *Kilofoot       = new Unit("kft");
-     
+
 	  validate_conv_fn (Meter ,Meter,                                1.0, 0.0 );
 	  validate_conv_fn (Meter ,Foot,                             3.28084, 0.0 );
 	  validate_conv_fn (Meter ,Inch,                             39.3701, 0.0 );
@@ -164,7 +164,7 @@ cout << "=======================================================================
 	  validate_conv_fn (Yard ,Foot,                                   3.0, 0.0);
 	  validate_conv_fn (Yard ,Inch,                                  36.0, 0.0);
 	  validate_conv_fn (Mile ,Foot,                                5280.0, 0.0);
-	  validate_conv_fn (Nautical_Mile ,Foot,                   6076.11549, 0.0);     
+	  validate_conv_fn (Nautical_Mile ,Foot,                   6076.11549, 0.0);
 	  validate_conv_fn (Kilofoot ,Foot,                            1000.0, 0.0);
 
      }
@@ -200,7 +200,7 @@ cout << "=======================================================================
 	  Unit *PoundMass     = new Unit("lbm");
 	  Unit *Gram          = new Unit("g");
 	  Unit *MetricTon     = new Unit("mt");
-	
+
 	  validate_conv_fn (Kilogram, Kilogram,                           1.0, 0.0);
 	  validate_conv_fn (Kilogram, Slug,                   (1.0/14.593902), 0.0);
 	  validate_conv_fn (Kilogram, PoundMass,                   2.20462262, 0.0);
@@ -279,7 +279,7 @@ cout << "=======================================================================
 	  cout << "new Unit = " << Deg_Fahrenheit << endl;
 	  Unit *Deg_Rankine    = new Unit("R");
 	  cout << "new Unit = " << Deg_Rankine << endl << endl;
-	  
+
 	  test_conversion (Deg_Celsius ,Deg_Kelvin );
 	  test_conversion (Deg_Celsius ,Deg_Fahrenheit );
 	  test_conversion (Deg_Celsius ,Deg_Rankine );
@@ -289,7 +289,7 @@ cout << "=======================================================================
 	  test_conversion (Deg_Rankine ,Deg_Celsius );
 	  test_conversion (Deg_Rankine ,Deg_Kelvin );
 	  test_conversion (Deg_Rankine ,Deg_Fahrenheit );
-	  
+
 	  cout << "TEST " << test_number << ":  0 Celsius" << endl;
 	  test_number ++;
 	  C_val = 0.0;
@@ -337,7 +337,7 @@ cout << "=======================================================================
 	  R_val = Deg_Celsius->Convert_to(C_val, "R");
 	  cout << C_val << "C = " << F_val << "F = " << K_val << "K = " << R_val << "R" << endl;
 	  cout << endl;
-	  
+
 	  cout << "TEST " << test_number << ": 310.0 Kelvin" << endl;
 	  test_number ++;
 	  K_val = 310.0;
@@ -364,42 +364,42 @@ cout << "=======================================================================
 	  F_val = Deg_Rankine->Convert_to(R_val, "F");
 	  cout << C_val << "C = " << F_val << "F = " << K_val << "K = " << R_val << "R" << endl;
 	  cout << endl;
-	    
+
 	  delete Deg_Celsius;
 	  delete Deg_Kelvin;
 	  delete Deg_Fahrenheit;
 	  delete Deg_Rankine;
      }
-     
+
      cout << endl << "INVERSES:" << endl;
      {
 	  Unit *Seconds = new Unit ("1/s");
 	  cout << "new Unit = " << Seconds << endl;
 	  Unit *Minutes = new Unit ("1/min");
 	  cout << "new Unit = " << Minutes << endl << endl;
-	  
+
 	  test_conversion (Seconds ,Minutes );
 	  test_conversion (Minutes ,Seconds );
-	  
+
 	  delete Seconds;
 	  delete Minutes;
      }
-     
+
      cout << endl << "PRODUCTS CONTAINING A TEMPERATURE PRIMITIVE:" << endl;
      {
 	  Unit *Celsius_seconds = new Unit ("C*s");
 	  cout << "new Unit = " << Celsius_seconds << endl;
 	  Unit *Fahrenheit_minutes = new Unit ("F*min");
 	  cout << "new Unit = " << Fahrenheit_minutes << endl << endl;
-	  
+
 	  test_conversion (Celsius_seconds ,Fahrenheit_minutes );
 	  test_conversion (Fahrenheit_minutes ,Celsius_seconds );
-	  
+
 	  delete Celsius_seconds;
 	  delete Fahrenheit_minutes;
      }
-     
-     
+
+
      cout << endl << "PRODUCTS of TEMPERATURE PRIMITIVE:" << endl;
      {
 	  Unit *Celsius_squared = new Unit ("C2");
@@ -408,28 +408,28 @@ cout << "=======================================================================
 	  cout << "new Unit = " << Fahrenheit_squared << endl;
 	  Unit *Celsius_Fahrenheit = new Unit ("C*F");
 	  cout << "new Unit = " << Celsius_Fahrenheit << endl << endl;
-	  
+
 	  test_conversion_exception (Celsius_squared ,Fahrenheit_squared );
 	  test_conversion_exception (Fahrenheit_squared ,Celsius_squared );
 
 	  test_conversion (Fahrenheit_squared ,Fahrenheit_squared );
 	  test_conversion (Celsius_Fahrenheit ,Celsius_Fahrenheit);
-	  
+
 	  delete Celsius_squared;
 	  delete Fahrenheit_squared;
      }
-     
+
 
      cout << endl << "RATIOS CONTAINING A TEMPERATURE PRIMITIVE:" << endl;
-     {    
+     {
 	  Unit *Deg_Celsius_per_second= new Unit ("C/s");
 	  cout << "new Unit = " << Deg_Celsius_per_second << endl;
 	  Unit *Deg_Fahrenheit_per_second= new Unit ("F/s");
 	  cout << "new Unit = " << Deg_Fahrenheit_per_second << endl << endl;
-	  
+
 	  test_conversion (Deg_Celsius_per_second ,Deg_Fahrenheit_per_second );
 	  test_conversion (Deg_Fahrenheit_per_second ,Deg_Celsius_per_second );
-	  
+
 	  delete Deg_Celsius_per_second;
 	  delete Deg_Fahrenheit_per_second;
      }
@@ -441,10 +441,10 @@ cout << "=======================================================================
 	  cout << "new Unit = " << Newton << endl;
 	  Unit *Poundal = new Unit("lbm*ft/s2");
 	  cout << "new Unit = " << Poundal << endl << endl;
-	  
+
 	  test_conversion (Newton ,Poundal );
 	  test_conversion (Poundal, Newton);
-	  
+
 	  delete Newton;
 	  delete Poundal;
      }
@@ -458,10 +458,10 @@ cout << "=======================================================================
 	  cout << "new Unit = " << CNewton << endl;
 	  Unit *CPoundal = new Unit("lbm*ft/s*s");
 	  cout << "new Unit = " << CPoundal << endl << endl;
-	  
+
 	  test_conversion (CNewton ,CPoundal );
 	  test_conversion (CPoundal, CNewton);
-	  
+
 	  delete CNewton;
 	  delete CPoundal;
      }
@@ -474,14 +474,14 @@ cout << "=======================================================================
 	  cout << "new Unit = " << Meters_per_minute_squared_2 << endl;
 	  Unit *Meters_per_minute_squared_3 = new Unit ("m/s/s");
 	  cout << "new Unit = " << Meters_per_minute_squared_3 << endl << endl;
-	  
+
 	  test_conversion (Meters_per_minute_squared_1 ,Meters_per_minute_squared_2);
 	  test_conversion (Meters_per_minute_squared_1 ,Meters_per_minute_squared_3);
 	  test_conversion (Meters_per_minute_squared_2 ,Meters_per_minute_squared_1);
 	  test_conversion (Meters_per_minute_squared_2 ,Meters_per_minute_squared_3);
 	  test_conversion (Meters_per_minute_squared_3 ,Meters_per_minute_squared_1);
 	  test_conversion (Meters_per_minute_squared_3 ,Meters_per_minute_squared_2);
-	  
+
 	  delete Meters_per_minute_squared_1;
 	  delete Meters_per_minute_squared_2;
 	  delete Meters_per_minute_squared_3;
diff --git a/trick_source/trick_utils/units/Unittest/units_conv_c_test.c b/trick_source/trick_utils/units/Unittest/units_conv_c_test.c
index 9728e5bd..065506ee 100644
--- a/trick_source/trick_utils/units/Unittest/units_conv_c_test.c
+++ b/trick_source/trick_utils/units/Unittest/units_conv_c_test.c
@@ -51,7 +51,7 @@ int main (int argc, char * argv[] ) {
      }else {
         printf("FAIL\n\n"); n_failures++;
      }
-     
+
 
      printf("Test 3\n");
      printf("Create Units_t objects from units specifiers: \"kg*m/s2\" and \"lbm*ft/s2\".\n");
@@ -81,7 +81,7 @@ int main (int argc, char * argv[] ) {
      }else {
         printf("FAIL\n\n"); n_failures++;
      }
-     
+
      printf("Test 6\n");
      printf("We also expect them to be correct, i.e., we expect: 1 Newton = 7.23301 Poundals.\n");
 
@@ -92,7 +92,7 @@ int main (int argc, char * argv[] ) {
      }else {
         printf("FAIL\n\n"); n_failures++;
      }
-     
+
      printf("Test conversion of unit specifications from Pre-07 to 07.\n");
      printf("Test 7\n"); test_convert_spec("ft");
      printf("Test 8\n"); test_convert_spec("insl2");
diff --git a/trick_source/trick_utils/units/src/Unit.cpp b/trick_source/trick_utils/units/src/Unit.cpp
index 70caa1f7..7026bc3d 100644
--- a/trick_source/trick_utils/units/src/Unit.cpp
+++ b/trick_source/trick_utils/units/src/Unit.cpp
@@ -73,9 +73,9 @@ UCFn *Unit::Conversion_to (const char *in_units_name) {
     if ((other = new Unit(in_units_name))==NULL) {
         throw CONVERSION_ERROR();
     }
-     
+
     ucf = this->Conversion_to(other);
-     
+
     delete other;
     return ucf;
 }
diff --git a/trick_source/trick_utils/units/src/units_conv.c b/trick_source/trick_utils/units/src/units_conv.c
index ec8612b6..a5eafe7d 100644
--- a/trick_source/trick_utils/units/src/units_conv.c
+++ b/trick_source/trick_utils/units/src/units_conv.c
@@ -534,7 +534,7 @@ struct {
     { Temperature, "degF","C",    "degrees-fahrenheit",1,English, {{ -17.777777777777778, 0.55555555555555556   }} },
     { Temperature, "R",   "C",    "degrees-rankine",  1,English,  {{ -273.15            , 0.55555555555555556   }} },
     { Temperature, "degR","C",    "degrees-rankine",  1,English,  {{ -273.15            , 0.55555555555555556   }} },
-  
+
     { Sound,       "dB",  "dB",   "decibels",         1,Standard, {{ 0.0                , 1.0                   }} },
 
     {Energy,       "J",   "J",    "joule",            9,Metric,   {{ 0.0                , 1.0                   }} },
@@ -613,8 +613,8 @@ struct {
     { Unitless,    "cnt", "--",   "<Unitless>",       1,Standard, {{ 0.0                , 1.0                   }} },
     { Unitless,    "count", "--", "<Unitless>",       1,Standard, {{ 0.0                , 1.0                   }} },
     { Unitless,    "mol", "--",   "<Unitless>",       7,Standard, {{ 0.0                , 6.02214179e+23        }} },
-    { Unitless,    "one", "--",   "<Unitless>",       1,Standard, {{ 0.0                , 1.0                   }} }, 
-    
+    { Unitless,    "one", "--",   "<Unitless>",       1,Standard, {{ 0.0                , 1.0                   }} },
+
     {Frequency,     "Hz",  "Hz",   "hertz",           10,Metric,  {{ 0.0                , 1.0                   }} },
     {Frequency,    "pHz",  "Hz",   "pico-hertz",      10,Metric,  {{ 0.0                , 1.0 * PICO            }} },
     {Frequency,    "nHz",  "Hz",   "nano-hertz",      10,Metric,  {{ 0.0                , 1.0 * NANO            }} },
@@ -1145,8 +1145,8 @@ void list_units(void)
     }
 }
 
-/* 
- * 
+/*
+ *
  */
 int convert_units_spec(const char *old_units_spec, char *new_units_spec)
 {
diff --git a/trick_source/trick_utils/units/test/UnitConvTestSuite.cpp b/trick_source/trick_utils/units/test/UnitConvTestSuite.cpp
index 9b007b6c..8db70784 100644
--- a/trick_source/trick_utils/units/test/UnitConvTestSuite.cpp
+++ b/trick_source/trick_utils/units/test/UnitConvTestSuite.cpp
@@ -50,7 +50,7 @@ TEST(UnitsInterface, Newton_to_Pound)
   Units_t* Newton = (Units_t*) NULL;
   Units_t* Pound = (Units_t*) NULL;
   double pounds;
-  
+
   ASSERT_EQ(CONV_OK, conv_fn_s("kg*m/s2", "lbm*ft/s2", &Newton_to_Pound));
 
   Newton = new_units("kg*m/s2");