Merge branch 'master' of https://github.com/nasa/Trick

.gitignore

@@ -11,3 +11,4 @@ lib_Darwin_*
 *.swp
 *.dox
 Makefile_jsc_dirs
+.DS_Store

Makefile

@@ -11,8 +11,6 @@
 # 'doxygen' - Generate HTML User's Guide.
 # 'test'    - Run Unit-tests and Simulation Tests.
 
-# $Id: Makefile 3796 2015-02-11 19:53:36Z alin $
-
 export TRICK_HOME = $(CURDIR)
 
 # Include the build configuration information.

bin/C3PO

@@ -1,7 +1,5 @@
 #! /usr/bin/perl
 
-# $Id: CP 1740 2011-07-07 18:38:25Z lin $
-
 use File::Basename ;
 use Cwd ;
 use strict ;

bin/CP

@@ -4,12 +4,18 @@
 # so I converted CP back to perl. :)
 
 use File::Basename ;
+use Cwd ;
 use Cwd 'abs_path';
 
 $trick_bin = dirname(abs_path($0)) ;
 $trick_home = dirname($trick_bin) ;
 
 if ( -f "S_define" ) {
+    if ( not -w "." ) {
+        print getcwd() , " is not writable\n" ;
+        print "CP aborted\n" ;
+        exit 1 ;
+    }
     unlink "Makefile_sim", "makefile" ;
     $makefile_text = do { local $/; <main::DATA> } ;
     $makefile_text =~ s/SUB_TRICK_HOME/$trick_home/ ;

bin/ICG_10

@@ -1,39 +1,5 @@
 #!/usr/bin/perl
 
-#
-# $Id: ICG_10 3006 2013-06-07 21:10:59Z dstrauss $
-# Revision 7.3  2006-09-20 14:50:44-05  hua
-# Update ICG -u to include dual system units and prefix list
-#
-# Revision 7.2  2006-07-26 10:00:46-05  hua
-# ICG -u Measurement Units Summary Incomplete
-#
-# Revision 7.1  2006-06-22 14:15:34-05  lin
-# Bump version number for 07
-#
-# Revision 5.3  2006-03-29 16:09:54-06  lin
-# add -DTRICK_VER=x to ICG -help
-#
-# Revision 5.2  2005-11-08 14:53:28-06  vetter
-# 8 space indent bin directory
-#
-# Revision 5.1  2004-08-05 11:29:12-05  lin
-# Bump
-#
-# Revision 4.6  2004/03/09 22:36:44  lin
-# trick_version -v is messed up.
-#
-# Revision 4.5  2004/02/10 21:59:35  lin
-# make the CP, ICG, MIS help messages prettier
-#
-# Revision 4.4  2004/01/28 17:13:06  lin
-# Cut error message out of CP down to 1 line.
-#
-# Revision 4.3  2004/01/16 21:34:33  lin
-# Can't Compile 04 With g++3
-#
-#
-
 use FindBin qw($Bin);
 use strict ;
 use Getopt::Long;

bin/MIS

@@ -1,7 +1,5 @@
 #!/usr/bin/perl
 
-# $Id: MIS 385 2009-10-30 15:10:03Z lin $
-
 use strict ;
 use FindBin qw($Bin);
 use lib "$Bin/pm" ;

bin/Trick.cshrc

@@ -2,8 +2,6 @@
 # This provides the default Trick environment for Trick users.
 # Users may override any variable within their .Trick_user_cshrc
 
-# $Id: Trick.cshrc 1963 2011-10-06 21:22:03Z wwoodard $
-
 #################################################################
 # Is Trick installed where TRICK_HOME is?
 #################################################################

bin/Trick.profile

@@ -2,8 +2,6 @@
 # This provides the default Trick environment for Trick users.
 # Users may override any variable within their .Trick_user_profile
 
-# $Id: Trick.profile 1963 2011-10-06 21:22:03Z wwoodard $
-
 #################################################################
 # Is Trick installed where TRICK_HOME is?
 #################################################################

bin/condense_list.pl

@@ -1,26 +1,5 @@
 #!/usr/bin/perl
 
-#*****************************************************************************#
-#                                                                             #
-# Trick Simulation Environment Software                                       #
-#                                                                             #
-# Copyright (c) 1996,1997 LinCom Corporation, Houston, TX                     #
-# All rights reserved.                                                        #
-#                                                                             #
-# Copyrighted by LinCom Corporation and proprietary to it. Any unauthorized   #
-# use of Trick Software including source code, object code or executables is  #
-# strictly prohibited and LinCom assumes no liability for such actions or     #
-# results thereof.                                                            #
-#                                                                             #
-# Trick Software has been developed under NASA Government Contracts and       #
-# access to it may be granted for Government work by the following contact:   #
-#                                                                             #
-# Contact: Charles Gott, Branch Chief                                         #
-#          Simulation and Graphics Branch                                     #
-#          Automation, Robotics, & Simulation Division                        #
-#          NASA, Johnson Space Center, Houston, TX                            #
-#                                                                             #
-#*****************************************************************************#
 #********************************************************************
 # Program: condense_list.awk
 # 
@@ -33,8 +12,6 @@
 #    Date:    3/21/2001
 #********************************************************************
 
-# $Id: condense_list.pl 49 2009-02-02 22:37:59Z lin $
-
 #USAGE condense_list.pl [s=<char>] env vars or values
 
 #get separator character

bin/convert_swig

@@ -1,7 +1,5 @@
 #!/usr/bin/perl
 
-# $Id: convert_swig 3762 2014-12-04 19:48:35Z alin $
-
 use FindBin qw($Bin);
 use strict ;
 use Getopt::Long;

bin/default_data_convert

@@ -1,7 +1,5 @@
 #!/usr/bin/perl
 
-# $Id: default_data_convert 401 2009-11-13 20:21:13Z wwoodard $
-
 use File::Basename ;
 use strict ;
 use Cwd ;

bin/depend_cp

@@ -1,7 +1,5 @@
 #!/usr/bin/perl
 
-# $Id: depend_cp 495 2010-01-15 00:57:37Z wwoodard $
-
 use Cwd ;
 use File::Basename;
 use strict ;

bin/depend_objs

@@ -1,7 +1,5 @@
 #!/usr/bin/perl
 
-# $Id: depend_cp 495 2010-01-15 00:57:37Z wwoodard $
-
 use Cwd 'abs_path' ;
 use File::Basename;
 use strict ;

bin/gte

@@ -1,7 +1,5 @@
 #!/usr/bin/perl
 
-# $Id: gte 3590 2014-06-26 21:14:38Z alin $
-
 use FindBin qw($RealBin);
 use lib "$RealBin/pm" ;
 use gte ;

bin/install_user

@@ -1,7 +1,6 @@
 #! /usr/bin/perl
 # install_user tells users to add Trick's bin to their path.
 
-# $Id: install_user 3792 2015-02-03 21:51:57Z alin $
 use File::Basename ;
 use Cwd 'abs_path';
 

bin/kill_sim

@@ -1,8 +1,5 @@
 #!/bin/sh
 
-#
-# $Id: kill_sim 2477 2012-06-27 17:50:59Z wwoodard $
-
 if  [ `uname -s` = "SunOS" ]
     then MY_UID=`/usr/xpg4/bin/id -u`
 else

bin/make_build

@@ -1,25 +1,5 @@
 #! /usr/bin/perl
 
-################################################################################
-#                                                                              
-# Trick Simulation Environment Software
-#
-# Copyright (c) 1996,1997 LinCom Corporation, Houston, TX
-# All rights reserved.
-#
-# Copyrighted by LinCom Corporation and proprietary to it. Any unauthorized
-# use of Trick Software including source code, object code or executables is
-# strictly prohibited and LinCom assumes no liability for such actions or
-# results thereof.
-#
-# Trick Software has been developed under NASA Government Contracts and
-# access to it may be granted for Government work by the following contact:
-#
-# Contact: Charles Gott, Branch Chief
-#          Flight Robotic Systems Branch
-#          Automation, Robotics, & Simulation Division
-#          NASA, Johnson Space Center, Houston, TX
-#                                               
 ################################################################################
 # Program: make_build
 #
@@ -30,8 +10,6 @@
 #
 #*******************************************************************
 
-# $Id: make_build 1302 2010-12-06 16:29:09Z lin $
-
 use lib $ENV{"TRICK_HOME"} . "/bin/pm" ;
 use Cwd ;
 use File::Basename ;

bin/mis_dep

@@ -9,8 +9,6 @@
 #              from the TRICK HEADERs in the source files.  TRICK_CFLAGS
 #              are used to actually find all files in the dependency tree.
 
-# $Id: mis_dep 49 2009-02-02 22:37:59Z lin $
-
 use lib $ENV{"TRICK_HOME"} . "/bin/pm" ;
 use Cwd ;
 use File::Basename ;

bin/pm/ICG.pm

@@ -1,7 +1,5 @@
 package ICG ;
 
-# $Id: ICG.pm 3641 2014-08-20 22:23:15Z alin $
-
 use Exporter ();
 @ISA = qw(Exporter);
 use vars qw($arg_lang);

bin/pm/MIS.pm

@@ -1,7 +1,5 @@
 package MIS ;
 
-# $Id: MIS.pm 2384 2012-05-14 20:58:18Z alin $
-
 use Exporter ();
 @ISA = qw(Exporter);
 @EXPORT = qw(mis_c mis_all_c process_args);

bin/pm/auto_doc.pm

@@ -1,7 +1,5 @@
 package auto_doc;
 
-# $Id: auto_doc.pm 1375 2011-02-01 23:32:36Z wwoodard $
-
 # Note:
 # Firefox 3 fails to process XSLT files if they are on the local hard drive plus
 # outside of the current XML file's path (or descendant paths). Users may need

bin/pm/default_data.pm

@@ -1,7 +1,5 @@
 package default_data ;
 
-# $Id: default_data.pm 2384 2012-05-14 20:58:18Z alin $
-
 use Exporter ();
 @ISA = qw(Exporter);
 @EXPORT = qw(make_default_data);
@@ -46,7 +44,7 @@ sub make_default_data($) {
 
     #---------------------------
     # Print version - date
-    printf S_DEF "\n// \$Id: default_data.pm 2384 2012-05-14 20:58:18Z alin $year/%02d/%02d %02d\:%02d\:%02d $login\n",
+    printf S_DEF "\n// Created $year/%02d/%02d %02d\:%02d\:%02d $login\n",
      $mon , $mday , $hour , $min , $sec ;
 
     print S_DEF "

bin/pm/edit.pm

@@ -1,7 +1,5 @@
 package edit ;
 
-# $Id: edit.pm 2014 2011-10-31 18:33:09Z lin $
-
 use Exporter ();
 @ISA = qw(Exporter);
 @EXPORT = qw(edit_only edit_and_exit);

bin/pm/find_module.pm

@@ -1,7 +1,5 @@
 package find_module ;
 
-# $Id: find_module.pm 2384 2012-05-14 20:58:18Z alin $
-
 use Exporter ();
 @ISA = qw(Exporter);
 @EXPORT = qw(find_header_file );

bin/pm/gte.pm

@@ -1,7 +1,5 @@
 package gte ;
 
-# $Id: gte.pm 3570 2014-06-24 21:30:38Z alin $
-
 use File::Basename ;
 use Cwd 'abs_path';
 use Exporter ();

bin/pm/html.pm

@@ -1,7 +1,5 @@
 package html ;
 
-# $Id: html.pm 3177 2013-08-22 14:39:36Z alin $
-
 use Exporter ();
 use File::Basename ;
 @ISA = qw(Exporter);

bin/pm/make_makefile.pm

@@ -1,7 +1,5 @@
 package make_makefile ;
 
-# $Id: make_makefile.pm 3778 2015-01-20 22:49:51Z alin $
-
 use Exporter ();
 @ISA = qw(Exporter);
 @EXPORT = qw(make_makefile);

bin/pm/make_no_swig_makefile.pm

@@ -1,7 +1,5 @@
 package make_no_swig_makefile ;
 
-# $Id: make_makefile.pm 591 2010-03-09 21:17:48Z lin $
-
 use Exporter ();
 @ISA = qw(Exporter);
 @EXPORT = qw(make_no_swig_makefile);

bin/pm/make_swig_makefile.pm

@@ -1,7 +1,5 @@
 package make_swig_makefile ;
 
-# $Id: make_makefile.pm 591 2010-03-09 21:17:48Z lin $
-
 use Exporter ();
 use trick_version ;
 use File::Path ;

bin/pm/mis_dep.pm

@@ -1,7 +1,5 @@
 package mis_dep ;
 
-# $Id: mis_dep.pm 3041 2013-06-19 15:55:06Z alin $
-
 use Exporter ();
 @ISA = qw(Exporter);
 @EXPORT = qw(mis_dep mis_catalog_dep traverse_tree);

bin/pm/parse_s_define.pm

@@ -1,7 +1,5 @@
 package parse_s_define ;
 
-# $Id: parse_s_define.pm 3676 2014-10-03 16:13:01Z dbankier $
-
 use Exporter ();
 @ISA = qw(Exporter);
 @EXPORT = qw(parse_s_define handle_sim_object handle_integ_loop handle_collects

bin/pm/s_source.pm

@@ -1,7 +1,5 @@
 package s_source ;
 
-# $Id: s_source.pm 3711 2014-10-28 19:43:54Z alin $
-
 use Exporter ();
 @ISA = qw(Exporter);
 @EXPORT = qw(s_source);
@@ -34,8 +32,7 @@ sub s_source($) {
 
     #---------------------------
     # Print version - date
-    my ($temp) = "Id:" ;
+    printf S_SOURCE "\n/* Created $year/%02d/%02d %02d\:%02d\:%02d $login \$ */\n",
-    printf S_SOURCE "\n/* \$$temp S_source.cpp auto $year/%02d/%02d %02d\:%02d\:%02d $login \$ */\n",
      $mon , $mday , $hour , $min , $sec ;
 
     #---------------------------

bin/pm/trick_print.pm

@@ -1,7 +1,5 @@
 package trick_print ;
 
-# $Id: trick_print.pm 49 2009-02-02 22:37:59Z lin $
-
 use Exporter ();
 @ISA = qw(Exporter);
 @EXPORT = qw(trick_print);

bin/pm/trick_units.pm

@@ -1,7 +1,5 @@
 package trick_units ;
 
-# $Id: trick_units.pm 3449 2014-02-25 22:07:15Z dstrauss $
-
 %units_info = (
 "s" => ["seconds", "Standard", "Time"],
 "ps" => ["pico-seconds", "Standard", "Time"],

bin/pm/trick_version.pm

@@ -1,7 +1,5 @@
 package trick_version ;
 
-# $Id: trick_version.pm 49 2009-02-02 22:37:59Z lin $
-
 use Exporter ();
 @ISA = qw(Exporter);
 @EXPORT = qw(get_trick_version);

bin/start_sim

@@ -16,8 +16,6 @@
 #
 #==============================================================================
 
-# $Id: start_sim 301 2009-08-20 13:37:27Z wwoodard $
-
 use lib $ENV{"TRICK_HOME"} . "/bin/pm" ;
 use gte ;
 #use strict ;

bin/trick_make_checksums

@@ -5,8 +5,6 @@
 # This script will run under 5.00x but the results
 # are not reliable.  Under perl 5.6.0 it works well.
 
-# $Id: trick_make_checksums 49 2009-02-02 22:37:59Z lin $
-
 use strict;
 use File::Find;
 use Cwd;

bin/trick_verify_checksums

@@ -1,7 +1,5 @@
 #!/usr/bin/perl -w
 
-# $Id: trick_verify_checksums 3231 2013-09-17 19:41:41Z alin $
-
 use strict;
 use File::Find;
 use Cwd;

bin/trick_version

@@ -1,8 +1,5 @@
 #!/usr/bin/perl
 
-#
-# $Id: trick_version 2716 2012-11-15 21:49:55Z alin $
-
 use File::Basename ;
 use Cwd 'abs_path';
 use strict;

bin/vc

@@ -17,7 +17,7 @@ if ( $^O eq "darwin" ) {
     $command = "java -classpath $ENV{TRICK_HOME}/bin/java/dist/*:$ENV{TRICK_HOME}/bin/java/lib/* \\
          -Xdock:name=\"Variable Counter\" \\
          -Xdock:icon=$ENV{TRICK_HOME}/bin/java/resources/trick_icon.png \\
-         trick.vc.VariableSounter " . join (" " , @ARGV) ;
+         trick.vc.VariableCounter " . join (" " , @ARGV) ;
 } else {
     $command = "java -cp $ENV{TRICK_HOME}/bin/java/dist/*:$ENV{TRICK_HOME}/bin/java/lib/* trick.vc.VariableCounter " . join (" " , @ARGV) ;
 }

configure

@@ -3,8 +3,6 @@
 # configure script for Trick
 # type configure --help for usage
 
-# $Id: configure 3785 2015-01-26 14:12:13Z alin $
-
 ver_out=""
 ver_min=""
 ver_url=""

docs/trick_module.xsl

@@ -4,26 +4,6 @@
 xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
 <xsl:output method="html"/>
 
-<!--
-   $Id: trick_module.xsl 1375 2011-02-01 23:32:36Z wwoodard $
-
-   Revision 7.2  2007-12-12 10:20:27-06  lin
-   Add a new "REQUIREMENT" field to the Trick header
-
-   Revision 7.1  2006-06-22 14:15:18-05  lin
-   Bump version number for 07
-
-   Revision 1.3  2006-05-15 09:32:29-05  lin
-   Xml documeentation has some bugs
-
-   Revision 1.2  2005-07-19 12:40:06-05  vetter
-   XML Autogen Polishing
-
-   Revision 1.1  2004-12-15 15:59:42-06  lin
-   Initial revision
-:
--->
-
 <xsl:template match="/">
 <style>
     td { border-style: inset; border-color: lightgray; border-width: 1px; }

docs/trick_module_tex.xsl

@@ -4,20 +4,6 @@
 xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
 <xsl:output method="text"/>
 
-<!--
-   $Id: trick_module_tex.xsl 1375 2011-02-01 23:32:36Z wwoodard $
-
-   Revision 7.2  2007-12-12 10:20:28-06  lin
-   Add a new "REQUIREMENT" field to the Trick header
-
-   Revision 7.1  2006-06-22 14:15:30-05  lin
-   Bump version number for 07
-
-   Revision 1.1  2005-10-07 10:15:15-05  lin
-   Initial revision
-
--->
-
 <xsl:template match="/file">
     <xsl:apply-templates select="file_name"/>
     <xsl:apply-templates select="trick_header"/>

docs/trick_s_define.xsl

@@ -3,17 +3,6 @@
 <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
 <xsl:output method="html"/>
 
-<!--
-   $Id: trick_s_define.xsl 1375 2011-02-01 23:32:36Z wwoodard $
-
-   Revision 1.2  2005-07-19 12:40:07-05  vetter
-   XML Autogen Polishing
-
-   Revision 1.1  2004-12-15 16:03:30-06  lin
-   Initial revision
-
--->
-
 <xsl:template match="/">
 <style>
     td { border-style: inset; border-color: lightgray; border-width: 1px; }

docs/trick_struct.xsl

@@ -4,23 +4,6 @@
 xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
 <xsl:output method="html"/>
 
-<!--
-   $Id: trick_struct.xsl 1375 2011-02-01 23:32:36Z wwoodard $
-
-   Revision 7.2  2008-04-14 14:04:28-05  hchen
-   The memeber columns are empty when the auto-generated header xml is viewed
-
-   Revision 7.1  2006-06-22 14:15:19-05  lin
-   Bump version number for 07
-
-   Revision 1.2  2005-07-19 12:40:07-05  vetter
-   XML Autogen Polishing
-
-   Revision 1.1  2004-12-15 16:03:30-06  lin
-   Initial revision
-
--->
-
 <xsl:template match="/">
 <style>
 td { border-style: inset; border-color: lightgray; border-width: 1px; }

docs/trick_struct_tex.xsl

@@ -4,17 +4,6 @@
 xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
 <xsl:output method="text"/>
 
-<!--
-   $Id: trick_struct_tex.xsl 1375 2011-02-01 23:32:36Z wwoodard $
-
-   Revision 1.2  2006-03-16 15:23:12-06  vetter
-   LaTex XSLT Converter Needs To Escape Underscores
-
-   Revision 1.1  2005-10-07 10:15:16-05  lin
-   Initial revision
-
--->
-
 <xsl:template match="/file">
     <xsl:apply-templates select="file_name"/>
     <xsl:apply-templates select="trick_header"/>

doxygen/design/build_sim.dox_in

@@ -1,6 +1,3 @@
-/*
- * $Id: build_sim.dox_in 1558 2011-04-28 22:46:09Z wwoodard $
- */
 
 /**
   @page LEVEL1 Building a Simulation

doxygen/design/data_products.dox_in

@@ -1,6 +1,3 @@
-/*
- * $Id: data_products.dox_in 1558 2011-04-28 22:46:09Z wwoodard $
- */
 
 /**
   @page LEVEL1 Data Products

doxygen/design/introduction.dox_in

@@ -1,7 +1,3 @@
-/*
- * $Id: introduction.dox_in 1558 2011-04-28 22:46:09Z wwoodard $
- */
-
 /**
 @page LEVEL1 Introduction
 

doxygen/design/main_page.dox_in

@@ -1,6 +1,3 @@
-/*
- * $Id: main_page.dox_in 3332 2013-12-12 18:09:43Z dcvillar $
- */
 
 /**
 @page design Trick Design

doxygen/design/run_sim.dox_in

@@ -1,6 +1,3 @@
-/*
- * $Id: run_sim.dox_in 1558 2011-04-28 22:46:09Z wwoodard $
- */
 
 /**
   @page LEVEL1 Running a Simulation

doxygen/makefile

@@ -1,4 +1,3 @@
-# $Id: makefile 3443 2014-02-21 14:49:26Z alin $
 
 export TRICK_DOCS = $(TRICK_HOME)/docs
 export TRICK_RELEASE = $(shell $(TRICK_HOME)/bin/trick_version -v)

doxygen/users_guide/appendix_a.dox_in

@@ -1,4 +1,3 @@
-<!-- $Id: appendix_a.dox_in 1889 2011-08-25 21:52:37Z dstrauss $ -->
 
 /**
 @page LEVEL1 Converting From Trick 7 To Trick 10

doxygen/users_guide/installing_trick.dox_in

@@ -1,4 +1,3 @@
-<!-- $Id: installing_trick.dox_in 3336 2013-12-12 21:11:50Z alin $ -->
 
 /**
 @page LEVEL1 Installing Trick

makefiles/Makefile.common

@@ -1,6 +1,4 @@
 
-# $Id: Makefile.common 3788 2015-02-02 20:24:00Z jpenn1 $
-
 ifeq ( $(shell test -e ${TRICK_HOME}/trick_source/er7_utils),0)
    $(info ER7 Utils Exists#########)
 endif

makefiles/Makefile.tricklib

@@ -1,6 +1,4 @@
 
-# $Id: Makefile.tricklib 3634 2014-08-14 14:41:45Z alin $
-
 ifeq ($(wildcard src),src)
 SRC_DIR := src/
 CD_CMD := cd ./src ;

trick_models/Ball++/L1/include/Ball.hh

@@ -28,13 +28,8 @@ PROGRAMMERS:
 @endverbatim
 *******************************************************************************/
 
-/*
+#ifndef BALL_HH
- * $Id: Ball.hh 2502 2012-07-25 20:36:40Z alin $
+#define BALL_HH
- */
-
-
-#ifndef _BALL_HH_
-#define _BALL_HH_
 
 // System include files.
 

trick_models/Ball++/L1/include/BallForce.hh

@@ -21,13 +21,8 @@ PROGRAMMERS:
      ((Edwin Z. Crues)(Titan Systems Corp.)(Jan 2002)(Crude C++ translation)))
 */
 
-/*
+#ifndef BALLFORCE_HH
- * $Id: BallForce.hh 2873 2013-03-27 20:59:08Z alin $
+#define BALLFORCE_HH
- */
-
-
-#ifndef _BALL_FORCE_HH_
-#define _BALL_FORCE_HH_
 
 /** @class BallForceInput
     @brief ball force input params

trick_models/Ball++/L1/include/BallState.hh

@@ -21,13 +21,8 @@ PROGRAMMERS:
      ((Edwin Z. Crues)(Titan Systems Corp.)(Jan 2002)(Crude C++ translation)))
 *******************************************************************************/
 
-/*
+#ifndef BALLSTATE_HH
- * $Id: BallState.hh 3383 2014-01-22 23:18:15Z alin $
+#define BALLSTATE_HH
- */
-
-
-#ifndef _BALL_STATE_HH_
-#define _BALL_STATE_HH_
 
 /** @class BallStateInput
     @brief ball state input parameters

trick_models/Ball++/L1/src/Ball.cpp

@@ -20,23 +20,6 @@ PROGRAMMERS:
      ((Edwin Z. Crues)(Titan Systems Corp.)(Jan 2002)(Crude C++ translation)))
 *******************************************************************************/
 
-/*
- * $Id: Ball.cpp 3383 2014-01-22 23:18:15Z alin $
- *
- * Revision 5.2  2006-05-02 10:13:31-05  lin
- * Remove deprecated C++ code in SIM_Ball++_L1 code
- *
- * Revision 5.1  2004-08-05 13:06:22-05  lin
- * Bump
- *
- * Revision 4.1  2003/10/21 21:49:40  lin
- * Bump version number for 04
- *
- * Revision 1.2  2002/10/07 15:15:55  lin
- * Add rcs version info to all trick_models files
- *
- */
-
 /* System include files. */
 #include <iostream>
 

trick_models/Ball++/L1/src/BallForceField.cpp

@@ -23,20 +23,6 @@ PROGRAMMERS:
      ((Edwin Z. Crues)(Titan Systems Corp.)(Jan 2002)(Crude C++ translation)))
 *******************************************************************************/
 
-/*
- * $Id: BallForceField.cpp 627 2010-03-30 16:21:13Z wwoodard $
- *
- * Revision 5.1  2004-08-05 13:06:22-05  lin
- * Bump
- *
- * Revision 4.1  2003/10/21 21:49:41  lin
- * Bump version number for 04
- *
- * Revision 1.2  2002/10/07 15:15:55  lin
- * Add rcs version info to all trick_models files
- *
- */
-
 /* System include files. */
 #include <math.h>
 

trick_models/Ball++/L1/src/BallForce_default_data.cpp

@@ -23,10 +23,6 @@ PROGRAMMERS:
      ((Edwin Z. Crues)(Titan Systems Corp.)(Jan 2002)(Crude C++ translation)))
 *******************************************************************************/
 
-/*
- * $Id: BallForce_default_data.cpp 3383 2014-01-22 23:18:15Z alin $
- */
-
 /* System include files. */
 #include <stdexcept>
 #include <math.h>

trick_models/Ball++/L1/src/BallShutdown.cpp

@@ -22,10 +22,6 @@ PROGRAMMERS:
      ((Edwin Z. Crues)(Titan Systems Corp.)(Jan 2002)(Crude C++ translation)))
 *******************************************************************************/
 
-/*
- * $Id:$
- */
-
 #include "sim_services/UnitTest/include/trick_tests.h"
 
 /* Model include files. */

trick_models/Ball++/L1/src/BallStateDeriv.cpp

@@ -23,23 +23,6 @@ PROGRAMMERS:
      ((Edwin Z. Crues)(Titan Systems Corp.)(Jan 2002)(Crude C++ translation)))
 *******************************************************************************/
 
-/*
- * $Id: BallStateDeriv.cpp 3383 2014-01-22 23:18:15Z alin $
- *
- * Revision 5.2  2006-05-02 10:13:31-05  lin
- * Remove deprecated C++ code in SIM_Ball++_L1 code
- *
- * Revision 5.1  2004-08-05 13:06:22-05  lin
- * Bump
- *
- * Revision 4.1  2003/10/21 21:49:41  lin
- * Bump version number for 04
- *
- * Revision 1.2  2002/10/07 15:15:56  lin
- * Add rcs version info to all trick_models files
- *
- */
-
 /* System include files. */
 #include <stdio.h>
 #include <iostream>

trick_models/Ball++/L1/src/BallStateInit.cpp

@@ -22,20 +22,6 @@ PROGRAMMERS:
      ((Edwin Z. Crues)(Titan Systems Corp.)(Jan 2002)(Crude C++ translation)))
 *******************************************************************************/
 
-/*
- * $Id: BallStateInit.cpp 627 2010-03-30 16:21:13Z wwoodard $
- *
- * Revision 5.1  2004-08-05 13:06:22-05  lin
- * Bump
- *
- * Revision 4.1  2003/10/21 21:49:41  lin
- * Bump version number for 04
- *
- * Revision 1.2  2002/10/07 15:15:56  lin
- * Add rcs version info to all trick_models files
- *
- */
-
 /* System include files. */
 #include <math.h>
 

trick_models/Ball++/L1/src/BallStateInteg.cpp

@@ -24,23 +24,6 @@ PROGRAMMERS:
      ((Edwin Z. Crues)(Titan Systems Corp.)(Jan 2002)(Crude C++ translation)))
 *******************************************************************************/
 
-/*
- * $Id: BallStateInteg.cpp 689 2010-05-18 19:23:06Z penn $
- *
- * Revision 5.2  2006-04-13 14:39:41-05  jkowing
- * Export functions to header files.
- *
- * Revision 5.1  2004-08-05 13:06:23-05  lin
- * Bump
- *
- * Revision 4.1  2003/10/21 21:49:42  lin
- * Bump version number for 04
- *
- * Revision 1.2  2002/10/07 15:15:57  lin
- * Add rcs version info to all trick_models files
- *
- */
-
 /* Model include files. */
 #include <stdio.h>
 

trick_models/Ball++/L1/src/BallStatePrint.cpp

@@ -22,20 +22,6 @@ PROGRAMMERS:
      ((Edwin Z. Crues)(Titan Systems Corp.)(Jan 2002)(Crude C++ translation)))
 *******************************************************************************/
 
-/*
-  * $Id: BallStatePrint.cpp 1633 2011-05-20 16:38:11Z lin $
- *
- * Revision 5.1  2004-08-05 13:06:22-05  lin
- * Bump
- *
- * Revision 4.1  2003/10/21 21:49:41  lin
- * Bump version number for 04
- *
- * Revision 1.2  2002/10/07 15:15:56  lin
- * Add rcs version info to all trick_models files
- *
- */
-
 /* System include files. */
 #include <math.h>
 #include <iostream>

trick_models/Ball++/L1/src/BallState_default_data.cpp

@@ -24,23 +24,6 @@ PROGRAMMERS:
      ((Edwin Z. Crues)(Titan Systems Corp.)(Jan 2002)(Crude C++ translation)))
 *******************************************************************************/
 
-/*
- * $Id: BallState_default_data.cpp 3383 2014-01-22 23:18:15Z alin $
- *
- * Revision 5.2  2006-04-13 14:39:41-05  jkowing
- * Export functions to header files.
- *
- * Revision 5.1  2004-08-05 13:06:23-05  lin
- * Bump
- *
- * Revision 4.1  2003/10/21 21:49:42  lin
- * Bump version number for 04
- *
- * Revision 1.2  2002/10/07 15:15:57  lin
- * Add rcs version info to all trick_models files
- *
- */
-
 #include <stdlib.h>
 
 /* Model include files. */

trick_models/InputProcessSimObject/include/InputProcessSimObject.hh

@@ -7,12 +7,8 @@ LIBRARY_DEPENDENCIES:
     ((../src/InputProcessSimObject.cpp))
 */
 
-/*
+#ifndef INPUTPROCESSSIMOBJECT_HH
- * $Id: IntegSimObject.hh 416 2009-11-18 22:32:12Z lin $
+#define INPUTPROCESSSIMOBJECT_HH
- */
-
-#ifndef _INPUTPROCESSSIMOBJECT_HH_
-#define _INPUTPROCESSSIMOBJECT_HH_
 
 #include <vector>
 #include <string>

trick_models/Leaker/Leaker.cpp

@@ -1,6 +1,3 @@
-/*
-  * $Id:$
- */
 #include <vector>
 #include <stdlib.h>
 #include <string.h>

trick_models/Satellite/graphics/Camera.hh

@@ -1,5 +1,5 @@
-#ifndef _CAMERA_H_
+#ifndef CAMERA_HH
-#define _CAMERA_H_
+#define CAMERA_HH
 class Camera {
 
 public:

trick_models/Satellite/graphics/GraphicsModels.h

@@ -1,5 +1,5 @@
-#ifndef _SATELLITE_MODEL_
+#ifndef GRAPHICS_MODELS_H
-#define _SATELLITE_MODEL_
+#define GRAPHICS_MODELS_H
 
 #ifdef __cplusplus
 extern "C" {

trick_models/Satellite/graphics/Scene.hh

@@ -1,3 +1,7 @@
+
+#ifndef SCENE_HH
+#define SCENE_HH
+
 #include "Camera.hh"
 #include "SceneElement.hh"
 #include <vector>
@@ -12,3 +16,4 @@ typedef struct {
 //    ElementState satellite2;
 } Comm_packet;
 
+#endif

trick_models/Satellite/graphics/SceneElement.hh

@@ -1,5 +1,5 @@
-#ifndef _DISPLAY_MODEL_
+#ifndef SCENEELEMENT_HH
-#define _DISPLAY_MODEL_
+#define SCENEELEMENT_HH
 
 class SceneElement {
 

trick_models/Satellite/include/Planet.hh

@@ -1,5 +1,5 @@
-#ifndef _PLANET_H_
+#ifndef PLANET_HH
-#define _PLANET_H_
+#define PLANET_HH
 /********************************* TRICK HEADER *******************************
 PURPOSE:
       ()

trick_models/Satellite/include/SatGraphicsComm.hh

@@ -1,5 +1,5 @@
-#ifndef _SAT_GRAPHICS_COMM_H_
+#ifndef SATGRAPHICSCOMM_HH
-#define _SAT_GRAPHICS_COMM_H_
+#define SATGRAPHICSCOMM_HH
 /********************************* TRICK HEADER *******************************
 PURPOSE:
       ()

trick_models/Satellite/include/Satellite.hh

@@ -1,5 +1,5 @@
-#ifndef _BODY_H_
+#ifndef SATELLITE_HH
-#define _BODY_H_
+#define SATELLITE_HH
 /********************************* TRICK HEADER *******************************
 PURPOSE:
       ()

trick_models/Satellite/include/Thruster.hh

@@ -1,5 +1,5 @@
-#ifndef _THRUSTER_H_
+#ifndef THRUSTER_HH
-#define _THRUSTER_H_
+#define THRUSTER_HH
 /********************************* TRICK HEADER *******************************
 PURPOSE:
       ()

trick_models/SegmentedExecutive/include/ExampleSegments.hh

@@ -6,8 +6,8 @@ LIBRARY_DEPENDENCIES:
     (SegmentedExecutive/src/ExampleSegments.cpp)
 */
 
-#ifndef _EXAMPLESEGMENTS_HH_
+#ifndef EXAMPLESEGMENTS_HH
-#define _EXAMPLESEGMENTS_HH_
+#define EXAMPLESEGMENTS_HH
 
 #include "SegmentedExecutive/include/Segment.hh"
 #include "sim_services/Integrator/include/IntegLoopScheduler.hh"

trick_models/SegmentedExecutive/include/Segment.hh

@@ -6,8 +6,8 @@ LIBRARY_DEPENDENCIES:
     (SegmentedExecutive/src/Segment.cpp)
 */
 
-#ifndef _SEGMENT_HH_
+#ifndef SEGMENT_HH
-#define _SEGMENT_HH_
+#define SEGMENT_HH
 
 #include <string>
 #include <map>

trick_models/SegmentedExecutive/include/SegmentedExecutive.hh

@@ -5,8 +5,8 @@ LIBRARY_DEPENDENCIES:
     (SegmentedExecutive/src/SegmentedExecutive.cpp)
 */
 
-#ifndef _SEGMENTEDEXECUTIVE_HH_
+#ifndef SEGMENTEDEXECUTIVE_HH
-#define _SEGMENTEDEXECUTIVE_HH_
+#define SEGMENTEDEXECUTIVE_HH
 
 #include <set>
 #include <map>

trick_models/TrickSTL/include/TrickSTLCheckpoint.hh

@@ -5,8 +5,8 @@
     )
 */
 
-#ifndef __STLCHECKPOINT_HH__
+#ifndef TRICKSTLCHECKPOINT_HH_
-#define __STLCHECKPOINT_HH__
+#define TRICKSTLCHECKPOINT_HH_
 
 #include <string>
 #include "sim_services/STL/include/trick_vector.hh"

trick_models/abstract_test/ball.hh

@@ -8,8 +8,8 @@ PURPOSE:
 @endverbatim
 *******************************************************************************/
 
-#ifndef _BALL_HH_
+#ifndef BALL_HH
-#define _BALL_HH_
+#define BALL_HH
 
 #include <iostream>
 #include <stdio.h>

trick_models/ball/L1/data/ball_force.d

@@ -13,19 +13,6 @@ PROGRAMMERS:
     (((Your Name) (Company Name) (Date) (Trick tutorial)))
 *******************************************************************************/
 
-/*
- * $Log: ball_force.d,v $
- * Revision 5.1  2004-08-05 13:06:24-05  lin
- * Bump
- *
- * Revision 4.1  2003/10/21 21:49:39  lin
- * Bump version number for 04
- *
- * Revision 3.2  2002/10/07 15:15:57  lin
- * Add rcs version info to all trick_models files
- *
- */
-
 BFORCE.input.origin {m} = {0.0, 2.0} ;
 BFORCE.input.force {N} = 8.0 ;
 

trick_models/ball/L1/data/ball_integ.d

@@ -12,25 +12,6 @@ PROGRAMMERS:
     (((Your Name) (Company Name) (Date) (Trick tutorial)))
 *******************************************************************************/
 
-/*
- * $Log: ball_integ.d,v $
- * Revision 7.2  2006-08-28 09:58:28-05  lin
- * Convert the old style allocation statements we have in included sims
- *
- * Revision 7.1  2006-06-22 14:15:03-05  lin
- * Bump version number for 07
- *
- * Revision 5.1  2004-08-05 13:06:24-05  lin
- * Bump
- *
- * Revision 4.1  2003/10/21 21:49:40  lin
- * Bump version number for 04
- *
- * Revision 3.2  2002/10/07 15:15:58  lin
- * Add rcs version info to all trick_models files
- *
- */
-
 #define NUM_STEP        12  /* use up to 12 intermediate steps:
                                8th order RK Fehlberg */
 #define NUM_VARIABLES   4   /* x,y position state and x,y velocity state */

trick_models/ball/L1/data/ball_state.d

@@ -13,19 +13,6 @@ PROGRAMMERS:
    (((Your Name) (Company Name) (Date) (Trick tutorial)))
 *******************************************************************************/
 
-/*
- * $Log: ball_state.d,v $
- * Revision 5.1  2004-08-05 13:06:24-05  lin
- * Bump
- *
- * Revision 4.1  2003/10/21 21:49:40  lin
- * Bump version number for 04
- *
- * Revision 3.2  2002/10/07 15:15:59  lin
- * Add rcs version info to all trick_models files
- *
- */
-
 BSTATE.input.mass {kg} = 10.0 ;
 BSTATE.input.speed {m/s} = 3.5 ;
 BSTATE.input.elevation {d} = 45.0 ;

trick_models/ball/L1/include/ball_force.h

@@ -1,6 +1,3 @@
-/*
- * $Id: ball_force.h 757 2010-06-22 18:40:57Z wwoodard $
- */
 
 /** TRICK HEADER **************************************************************
 @file
@@ -20,8 +17,8 @@ PROGRAMMERS:
 
 #include <pthread.h>
 
-#ifndef _BALL_FORCE_H_
+#ifndef BALL_FORCE_H
-#define _BALL_FORCE_H_
+#define BALL_FORCE_H
 
 /** @struct BFORCE_IN
     @brief ball force input parameters

trick_models/ball/L1/include/ball_proto.h

@@ -21,8 +21,8 @@ DEFAULT DATA:
     )
 *************************************************************/
 
-#ifndef _BALL_PROTO_H_
+#ifndef BALL_PROTO_H
-#define _BALL_PROTO_H_
+#define BALL_PROTO_H
 
 #include "ball/L1/include/ball_state.h"
 #include "ball/L1/include/ball_force.h"

trick_models/ball/L1/include/ball_state.h

@@ -1,6 +1,3 @@
-/*
- * $Id: ball_state.h 2665 2012-10-15 21:42:36Z alin $
- */
 
 /** TRICK HEADER **************************************************************
 @file
@@ -17,8 +14,8 @@ PROGRAMMERS:
 *******************************************************************************/
 
 
-#ifndef _BALL_STATE_H_
+#ifndef BALL_STATE_H
-#define _BALL_STATE_H_
+#define BALL_STATE_H
 
 /** @struct BSTATE_IN
     @brief ball state input parameters

trick_models/ball/L1/src/ball_force_default_data.c

@@ -5,10 +5,6 @@ PROGRAMMERS:
     (((Your Name) (Company Name) (Date) (Trick tutorial)))
 *******************************************************************************/
 
-/*
- * $Id: ball_force_default_data.c 931 2010-08-10 20:32:30Z lin $
- */
-
 #include <stdio.h>
 #include "ball/L1/include/ball_force.h"
 #include "ball/L1/include/ball_proto.h"

trick_models/ball/L1/src/ball_force_field.c

@@ -22,10 +22,6 @@ PROGRAMMERS:
     (((Your Name) (Company Name) (Date) (Trick tutorial)))
 *******************************************************************************/
 
-/*
- * $Id: ball_force_field.c 931 2010-08-10 20:32:30Z lin $
- */
-
      /* SYSTEM INCLUDE FILES */
 #include <math.h>
 

trick_models/ball/L1/src/ball_malf.c

@@ -7,10 +7,6 @@ PROGRAMMERS:
     (((Your Name) (Company Name) (Date) (Trick tutorial)))
 *******************************************************************************/
 
-/*
- * $Id: ball_malf.c 931 2010-08-10 20:32:30Z lin $
- */
-
      /* SYSTEM INCLUDE FILES */
 #include <math.h>
 

trick_models/ball/L1/src/ball_malf_trigger.c

@@ -7,10 +7,6 @@ PROGRAMMERS:
     (((Your Name) (Company Name) (Date) (Trick tutorial)))
 *******************************************************************************/
 
-/*
- * $Id: ball_malf_trigger.c 931 2010-08-10 20:32:30Z lin $
- */
-
      /* SYSTEM INCLUDE FILES */
 #include <math.h>
 

trick_models/ball/L1/src/ball_print.c

@@ -9,10 +9,6 @@ PROGRAMMERS:
     (((Your Name) (Company Name) (Date) (Trick tutorial)))
 *******************************************************************************/
 
-/*
- * $Id: ball_print.c 2665 2012-10-15 21:42:36Z alin $
- */
-
      /* GLOBAL DATA STRUCTURE DECLARATIONS */
 #include <stdio.h>
 #include "ball/L1/include/ball_state.h"

trick_models/ball/L1/src/ball_state_alt_integ.c

@@ -23,10 +23,6 @@ PROGRAMMERS:
     (((Your Name) (Company Name) (Date) (Trick tutorial)))
 *******************************************************************************/
 
-/*
- * $Id: ball_state_integ.c 931 2010-08-10 20:32:30Z lin $
- */
-
 #include <stdio.h>
 
 /* GLOBAL DATA STRUCTURE DECLARATIONS */

trick_models/ball/L1/src/ball_state_default_data.c

@@ -5,10 +5,6 @@ PROGRAMMERS:
    (((Your Name) (Company Name) (Date) (Trick tutorial)))
 *******************************************************************************/
 
-/*
- * $Id: ball_state_default_data.c 931 2010-08-10 20:32:30Z lin $
- */
-
 #include "trick_utils/units/include/constant.h"
 #include "ball/L1/include/ball_state.h"
 #include "ball/L1/include/ball_proto.h"

trick_models/ball/L1/src/ball_state_deriv.c

@@ -22,10 +22,6 @@ PROGRAMMERS:
     (((Your Name) (Company Name) (Date) (Trick tutorial)))
 *******************************************************************************/
 
-/*
- * $Id: ball_state_deriv.c 931 2010-08-10 20:32:30Z lin $
- */
-
      /* GLOBAL DATA STRUCTURE DECLARATIONS */
 #include "ball/L1/include/ball_state.h"
 #include "ball/L1/include/ball_proto.h"

trick_models/ball/L1/src/ball_state_init.c

@@ -21,10 +21,6 @@ PROGRAMMERS:
     (((Your Name) (Company Name) (Date) (Trick tutorial)))
 *******************************************************************************/
 
-/*
- * $Id: ball_state_init.c 931 2010-08-10 20:32:30Z lin $
- */
-
      /* SYSTEM INCLUDE FILES */
 #include <math.h>
 

trick_models/ball/L1/src/ball_state_integ.c

@@ -23,10 +23,6 @@ PROGRAMMERS:
     (((Your Name) (Company Name) (Date) (Trick tutorial)))
 *******************************************************************************/
 
-/*
- * $Id: ball_state_integ.c 931 2010-08-10 20:32:30Z lin $
- */
-
 #include <stdio.h>
 
 /* GLOBAL DATA STRUCTURE DECLARATIONS */

trick_models/ball/L2/include/ball_altimeter.d

@@ -13,19 +13,6 @@ PROGRAMMERS:
     (((Your Name) (Company Name) (Date) (Trick tutorial)))
 *******************************************************************************/
 
-/*
- * $Log: ball_altimeter.d,v $
- * Revision 5.1  2004-08-05 13:06:26-05  lin
- * Bump
- *
- * Revision 4.1  2003/10/21 21:49:35  lin
- * Bump version number for 04
- *
- * Revision 3.2  2002/10/07 15:16:01  lin
- * Add rcs version info to all trick_models files
- *
- */
-
 BALT.input.add_noise = Yes ;
 BALT.input.add_bias  = Yes ;
 BALT.input.noise {M} = 0.01 ;