apply consistent copyright

COPYRIGHT

+
+				  COPYRIGHT
+
+The following is a notice of limited availability of the code, and disclaimer
+which must be included in the prologue of the code and in all source listings
+of the code.
+
+Copyright Notice
+ + 2013 University of Chicago
+
+Permission is hereby granted to use, reproduce, prepare derivative works, and
+to redistribute to others.  This software was authored by:
+
+Mathematics and Computer Science Division
+Argonne National Laboratory, Argonne IL 60439
+
+(and)
+
+Computer Science Department
+Rensselaer Polytechnic Institute, Troy NY 12180
+
+			      GOVERNMENT LICENSE
+
+Portions of this material resulted from work developed under a U.S.
+Government Contract and are subject to the following license: the Government
+is granted for itself and others acting on its behalf a paid-up, nonexclusive,
+irrevocable worldwide license in this computer software to reproduce, prepare
+derivative works, and perform publicly and display publicly.
+
+				  DISCLAIMER
+
+This computer code material was prepared, in part, as an account of work
+sponsored by an agency of the United States Government.  Neither the United
+States, nor the University of Chicago, nor any of their employees, makes any
+warranty express or implied, or assumes any legal liability or responsibility
+for the accuracy, completeness, or usefulness of any information, apparatus,
+product, or process disclosed, or represents that its use would not infringe
+privately owned rights.

codes/dragonfly.h

 /*
- * * Copyright (C) 2011, University of Chicago
- * *
- * * See COPYRIGHT notice in top-level directory.
- * */
+ * Copyright (C) 2013 University of Chicago.
+ * See COPYRIGHT notice in top-level directory.
+ *
+ */
 
 #ifndef INC_dragonfly_h
 #define INC_dragonfly_h
@@ -221,3 +221,12 @@ static long long       total_hops = 0;
 static long long       N_finished_packets = 0;
 
 #endif
+
+/*
+ * Local variables:
+ *  c-indent-level: 4
+ *  c-basic-offset: 4
+ * End:
+ *
+ * vim: ts=8 sts=4 sw=4 expandtab
+ */

codes/model-net-method.h

 /*
- * Copyright (C) 2013, University of Chicago
- *
+ * Copyright (C) 2013 University of Chicago.
  * See COPYRIGHT notice in top-level directory.
+ *
  */
 
 #ifndef MODELNET_METHOD_H

codes/model-net.h

 /*
- * Copyright (C) 2013, University of Chicago
- *
+ * Copyright (C) 2013 University of Chicago.
  * See COPYRIGHT notice in top-level directory.
+ *
  */
 
 #ifndef MODELNET_H

codes/torus.h

 /*
- * * Copyright (C) 2011, University of Chicago
- * *
- * * See COPYRIGHT notice in top-level directory.
- * */
+ * Copyright (C) 2013 University of Chicago.
+ * See COPYRIGHT notice in top-level directory.
+ *
+ */
 
 #ifndef INC_torus_h
 #define INC_torus_h
@@ -181,3 +181,12 @@ static long long       total_hops = 0;
 int num_chunks;
 
 #endif
+
+/*
+ * Local variables:
+ *  c-indent-level: 4
+ *  c-basic-offset: 4
+ * End:
+ *
+ * vim: ts=8 sts=4 sw=4 expandtab
+ */

src/models/networks/model-net/dragonfly.c

+/*
+ * Copyright (C) 2013 University of Chicago.
+ * See COPYRIGHT notice in top-level directory.
+ *
+ */
+
 #include "codes/dragonfly.h"
 
 // Local router ID: 0 --- total_router-1
@@ -923,3 +929,12 @@ static const tw_lptype* dragonfly_get_router_lp_type(void)
 }          
 
 
+
+/*
+ * Local variables:
+ *  c-indent-level: 4
+ *  c-basic-offset: 4
+ * End:
+ *
+ * vim: ts=8 sts=4 sw=4 expandtab
+ */

src/models/networks/model-net/model-net.c

 /*
- * Copyright (C) 2013, University of Chicago
- *
+ * Copyright (C) 2013 University of Chicago.
  * See COPYRIGHT notice in top-level directory.
+ *
  */
+
 #include <string.h>
 #include <assert.h>
 

src/models/networks/model-net/simplenet-upd.c

 /*
- * Copyright (C) 2011, University of Chicago
- *
+ * Copyright (C) 2013 University of Chicago.
  * See COPYRIGHT notice in top-level directory.
+ *
  */
 
 #include <string.h>

src/models/networks/model-net/torus.c

+/*
+ * Copyright (C) 2013 University of Chicago.
+ * See COPYRIGHT notice in top-level directory.
+ *
+ */
+
 #include "codes/torus.h"
 
 /* setup the torus model, initialize global parameters */
@@ -591,3 +597,12 @@ static const tw_lptype* torus_get_lp_type(void)
    return(&torus_lp); 
 }
 
+
+/*
+ * Local variables:
+ *  c-indent-level: 4
+ *  c-basic-offset: 4
+ * End:
+ *
+ * vim: ts=8 sts=4 sw=4 expandtab
+ */

tests/modelnet-test.c

 /*
- * Copyright (C) 2011, University of Chicago
- *
+ * Copyright (C) 2013 University of Chicago.
  * See COPYRIGHT notice in top-level directory.
+ *
  */
 
 /* SUMMARY: