Changeset 3953 for branches/blt4

Timestamp:

Sep 24, 2013, 12:41:04 PM (11 years ago)

Author:

gah

Message:

sync with trunk

Location:

branches/blt4/src/core

Files:

• Makefile.in (modified) (3 diffs)
• RpBindingsDict.cc (modified) (1 diff)
• RpBindingsDict.h (modified) (1 diff)
• RpBuffer.cc (modified) (1 diff)
• RpBuffer.h (modified) (1 diff)
• RpBufferCHelper.h (modified) (1 diff)
• RpBufferCInterface.cc (modified) (1 diff)
• RpBufferCInterface.h (modified) (1 diff)
• RpDXWriter.cc (modified) (1 diff)
• RpDXWriter.h (modified) (1 diff)
• RpDXWriterFInterface.cc (modified) (1 diff)
• RpDXWriterFInterface.h (modified) (1 diff)
• RpDXWriterFStubs.c (modified) (1 diff)
• RpDXWriterFStubs.h (modified) (1 diff)
• RpDict.h (modified) (1 diff, 1 prop)
• RpEncode.cc (modified) (1 diff)
• RpEncode.h (modified) (1 diff)
• RpEntityRef.cc (modified) (1 diff)
• RpEntityRef.h (modified) (1 diff)
• RpFortranCommon.cc (modified) (1 diff)
• RpFortranCommon.h (modified) (1 diff)
• RpLibrary.cc (modified) (8 diffs)
• RpLibrary.h (modified) (1 diff)
• RpLibraryCInterface.cc (modified) (1 diff)
• RpLibraryCInterface.h (modified) (1 diff)
• RpLibraryFInterface.cc (modified) (2 diffs)
• RpLibraryFInterface.h (modified) (1 diff)
• RpLibraryFStubs.c (modified) (1 diff)
• RpLibraryFStubs.h (modified) (1 diff)
• RpOutcome.cc (modified) (1 diff)
• RpOutcome.h (modified) (1 diff)
• RpOutcomeCHelper.h (modified) (1 diff)
• RpOutcomeCInterface.cc (modified) (1 diff)
• RpOutcomeCInterface.h (modified) (1 diff)
• RpPtr.cc (modified) (1 diff)
• RpPtr.h (modified) (1 diff)
• RpResult.cc (modified) (1 diff)
• RpSimpleBuffer.h (modified) (5 diffs)
• RpUnits.cc (modified) (9 diffs)
• RpUnits.h (modified) (1 diff, 1 prop)
• RpUnitsCInterface.cc (modified) (1 diff)
• RpUnitsCInterface.h (modified) (1 diff)
• RpUnitsFInterface.cc (modified) (1 diff)
• RpUnitsFInterface.h (modified) (1 diff)
• RpUnitsFStubs.c (modified) (1 diff)
• RpUnitsFStubs.h (modified) (1 diff)
• RpUnitsStd.cc (modified) (1 diff)
• RpUnitsStd.h (modified) (1 diff)
• RpUtils.cc (modified) (1 diff)
• RpUtils.h (modified) (1 diff)
• RpUtilsCInterface.cc (modified) (1 diff)
• RpUtilsCInterface.h (modified) (1 diff)
• RpUtilsFInterface.cc (modified) (1 diff)
• RpUtilsFInterface.h (modified) (1 diff)
• RpUtilsFStubs.c (modified) (1 diff)
• RpUtilsFStubs.h (modified) (1 diff)
• config.h.in (modified) (6 diffs)
• rappture.h (modified) (1 diff)
• rappture_fortran.c (modified) (1 diff)
• scew/scew_extras.c (modified) (1 diff)
• scew/scew_extras.h (modified) (1 diff)
• scew_extras.c (modified) (1 diff)
• scew_extras.h (modified) (1 diff)

branches/blt4/src/core/Makefile.in

@@ -13 +13 @@
 INSTALL         = @INSTALL@
 MKDIR_P         = @MKDIR_P@
-
+SVN_VERSION     := $(shell svnversion $(srcdir))
+RAPPTURE_VERSION = @PACKAGE_VERSION@
 CXX             = @CXX@
 # This hack is because the tcl.m4 file generates the line
@@ -32 +33 @@
 DX_LIB_SPEC     = @DX_LIB_SPEC@
 DX_INC_SPEC     = @DX_INC_SPEC@
-
-CC_SWITCHES     = $(CFLAGS) $(CFLAGS_DEBUG) $(INCLUDES) $(DEFINES)
-CXX_SWITCHES    = $(CFLAGS) $(CFLAGS_DEBUG) $(INCLUDES) $(DEFINES)
+DEFINES         = -DSVN_VERSION=\"$(SVN_VERSION)\" \
+                  -DRAPPTURE_VERSION=\"$(RAPPTURE_VERSION)\"
+
+CC_SWITCHES     = $(CFLAGS) $(CFLAGS_DEBUG) $(INCLUDES) $(DEFINES) 
+CXX_SWITCHES    = $(CFLAGS) $(CFLAGS_DEBUG) $(INCLUDES) $(DEFINES) 
 
 INCLUDES        = \
@@ -196 +199 @@
 
 distclean: clean
-        $(RM) Makefile *~
+        $(RM) Makefile config.h *~

branches/blt4/src/core/RpBindingsDict.cc

@@ -5 +5 @@
  * ======================================================================
  *  AUTHOR:  Derrick S. Kearney, Purdue University
- *  Copyright (c) 2004-2008  Purdue Research Foundation
+ *  Copyright (c) 2004-2012  HUBzero Foundation, LLC
  *
  *  See the file "license.terms" for information on usage and

branches/blt4/src/core/RpBindingsDict.h

@@ -5 +5 @@
  * ======================================================================
  *  AUTHOR:  Derrick S. Kearney, Purdue University
- *  Copyright (c) 2004-2005  Purdue Research Foundation
+ *  Copyright (c) 2004-2012  HUBzero Foundation, LLC
  *
  *  See the file "license.terms" for information on usage and

branches/blt4/src/core/RpBuffer.cc

@@ -5 +5 @@
  *  AUTHOR:  Derrick Kearney, Purdue University
  *
- *  Copyright (c) 2004-2008  Purdue Research Foundation
+ *  Copyright (c) 2004-2012  HUBzero Foundation, LLC
  * ----------------------------------------------------------------------
  *  See the file "license.terms" for information on usage and

branches/blt4/src/core/RpBuffer.h

@@ -5 +5 @@
  *  AUTHOR:  Derrick Kearney, Purdue University
  *
- *  Copyright (c) 2004-2008  Purdue Research Foundation
+ *  Copyright (c) 2004-2012  HUBzero Foundation, LLC
  * ----------------------------------------------------------------------
  *  See the file "license.terms" for information on usage and

branches/blt4/src/core/RpBufferCHelper.h

@@ -5 +5 @@
  * ======================================================================
  *  AUTHOR:  Derrick Kearney, Purdue University
- *  Copyright (c) 2004-2007  Purdue Research Foundation
+ *  Copyright (c) 2004-2012  HUBzero Foundation, LLC
  *
  *  See the file "license.terms" for information on usage and

branches/blt4/src/core/RpBufferCInterface.cc

@@ -5 +5 @@
  * ======================================================================
  *  AUTHOR:  Derrick Kearney, Purdue University
- *  Copyright (c) 2004-2007  Purdue Research Foundation
+ *  Copyright (c) 2004-2012  HUBzero Foundation, LLC
  *
  *  See the file "license.terms" for information on usage and

branches/blt4/src/core/RpBufferCInterface.h

@@ -6 +6 @@
  * ======================================================================
  *  AUTHOR:  Derrick Kearney, Purdue University
- *  Copyright (c) 2004-2007  Purdue Research Foundation
+ *  Copyright (c) 2004-2012  HUBzero Foundation, LLC
  *
  *  See the file "license.terms" for information on usage and

branches/blt4/src/core/RpDXWriter.cc

@@ -7 +7 @@
  * ======================================================================
  *  AUTHOR:  Derrick S. Kearney, Purdue University
- *  Copyright (c) 2005-2008  Purdue Research Foundation
+ *  Copyright (c) 2004-2012  HUBzero Foundation, LLC
  *
  *  See the file "license.terms" for information on usage and

branches/blt4/src/core/RpDXWriter.h

@@ -8 +8 @@
  * ======================================================================
  *  AUTHOR:  Derrick S. Kearney, Purdue University
- *  Copyright (c) 2005-2008  Purdue Research Foundation
+ *  Copyright (c) 2004-2012  HUBzero Foundation, LLC
  *
  *  See the file "license.terms" for information on usage and

branches/blt4/src/core/RpDXWriterFInterface.cc

@@ -5 +5 @@
  * ======================================================================
  *  AUTHOR:  Derrick Kearney, Purdue University
- *  Copyright (c) 2005-2008  Purdue Research Foundation
+ *  Copyright (c) 2004-2012  HUBzero Foundation, LLC
  *
  *  See the file "license.terms" for information on usage and

branches/blt4/src/core/RpDXWriterFInterface.h

@@ -5 +5 @@
  * ======================================================================
  *  AUTHOR:  Derrick S. Kearney, Purdue University
- *  Copyright (c) 2005-2008  Purdue Research Foundation
+ *  Copyright (c) 2004-2012  HUBzero Foundation, LLC
  *
  *  See the file "license.terms" for information on usage and

branches/blt4/src/core/RpDXWriterFStubs.c

@@ -5 +5 @@
  * ======================================================================
  *  AUTHOR:  Derrick S. Kearney, Purdue University
- *  Copyright (c) 2005-2008  Purdue Research Foundation
+ *  Copyright (c) 2004-2012  HUBzero Foundation, LLC
  *
  *  See the file "license.terms" for information on usage and

branches/blt4/src/core/RpDXWriterFStubs.h

@@ -5 +5 @@
  * ======================================================================
  *  AUTHOR:  Derrick S. Kearney, Purdue University
- *  Copyright (c) 2005-2008  Purdue Research Foundation
+ *  Copyright (c) 2004-2012  HUBzero Foundation, LLC
  *
  *  See the file "license.terms" for information on usage and

branches/blt4/src/core/RpDict.h

@@ -4 +4 @@
  *
  *  AUTHOR:  Derrick Kearney, Purdue University
- *  Copyright (c) 2004-2008  Purdue Research Foundation
+ *  Copyright (c) 2004-2012  HUBzero Foundation, LLC
  *
  *  See the file "license.terms" for information on usage and

branches/blt4/src/core/RpEncode.cc

@@ -7 +7 @@
  * ======================================================================
  *  AUTHOR:  Derrick Kearney, Purdue University
- *  Copyright (c) 2004-2007  Purdue Research Foundation
+ *  Copyright (c) 2004-2012  HUBzero Foundation, LLC
  *
  *  See the file "license.terms" for information on usage and

branches/blt4/src/core/RpEncode.h

@@ -6 +6 @@
  *  AUTHOR:  Derrick Kearney, Purdue University
  *
- *  Copyright (c) 2004-2007  Purdue Research Foundation
+ *  Copyright (c) 2004-2012  HUBzero Foundation, LLC
  * ----------------------------------------------------------------------
  *  See the file "license.terms" for information on usage and

branches/blt4/src/core/RpEntityRef.cc

@@ -2 +2 @@
  * ======================================================================
  *  AUTHOR:  Derrick Kearney, Purdue University
- *  Copyright (c) 2004-2006  Purdue Research Foundation
+ *  Copyright (c) 2004-2012  HUBzero Foundation, LLC
  *
  *  See the file "license.terms" for information on usage and

branches/blt4/src/core/RpEntityRef.h

@@ -18 +18 @@
  * ======================================================================
  *  AUTHOR:  Derrick Kearney, Purdue University
- *  Copyright (c) 2004-2007  Purdue Research Foundation
+ *  Copyright (c) 2004-2012  HUBzero Foundation, LLC
  *
  *  See the file "license.terms" for information on usage and

branches/blt4/src/core/RpFortranCommon.cc

@@ -7 +7 @@
  * ======================================================================
  *  AUTHOR:  Derrick Kearney, Purdue University
- *  Copyright (c) 2004-2005  Purdue Research Foundation
+ *  Copyright (c) 2004-2012  HUBzero Foundation, LLC
  *
  *  See the file "license.terms" for information on usage and

branches/blt4/src/core/RpFortranCommon.h

@@ -7 +7 @@
  * ======================================================================
  *  AUTHOR:  Derrick Kearney, Purdue University
- *  Copyright (c) 2004-2005  Purdue Research Foundation
+ *  Copyright (c) 2004-2012  HUBzero Foundation, LLC
  *
  *  See the file "license.terms" for information on usage and

branches/blt4/src/core/RpLibrary.cc

@@ -5 +5 @@
  * ======================================================================
  *  AUTHOR:  Derrick S. Kearney, Purdue University
- *  Copyright (c) 2004-2007  Purdue Research Foundation
+ *  Copyright (c) 2004-2012  HUBzero Foundation, LLC
  *
  *  See the file "license.terms" for information on usage and
@@ -12 +12 @@
  */
 
+#include "config.h"
 #include "scew/scew.h"
 #include "scew_extras.h"
@@ -63 +64 @@
         parser = scew_parser_create();
 
-        // Don't trim whitespaces
-        scew_parser_ignore_whitespaces(parser, 0);
+        // Don't ignore whitespaces!
+        // Things like string inputs may have trailing newlines that
+        // matter to the underlying application.
+        scew_parser_ignore_whitespaces(parser, 1);
 
         /* Loads an XML file */
@@ -132 +135 @@
     // fill in the current RpLibrary's data with other's data
     parser = scew_parser_create();
-    // Don't trim whitespaces
-    scew_parser_ignore_whitespaces(parser, 0);
+    scew_parser_ignore_whitespaces(parser, 1);
 
     // Loads the XML from other
@@ -219 +221 @@
         // fill in the current RpLibrary's data with other's data
         parser = scew_parser_create();
-        // Don't trim whitespaces
-        scew_parser_ignore_whitespaces(parser, 0);
+        scew_parser_ignore_whitespaces(parser, 1);
 
         // Loads the XML from other
@@ -1873 +1874 @@
     scew_element *tmpNode   = NULL;
     const char *contents    = NULL;
-    int retVal              = 1;
     int deleteTmpNode       = 0;
 
@@ -1939 +1939 @@
                     // maybe we want to count the number of children
                     // that we have successfully added?
-                    retVal = 0;
                 }
                 else {
@@ -2222 +2221 @@
 RpLibrary::result(int exitStatus)
 {
-    std::stringstream outputFile;
     std::fstream file;
     std::string xmlText = "";
-    time_t t = 0;
-    struct tm* timeinfo = NULL;
-    std::string timestamp = "";
-    std::string username = "";
-    std::string hostname = "";
+    time_t t;
+    struct tm* timeinfo;
+    std::stringstream outputFile;
+    std::string timestamp;
+    std::string username;
+    std::string hostname;
     char *user = NULL;
 
-    if (this->root) {
-#ifdef _POSIX_SOURCE
-        // if the posix function gettimeofday is available,
-        // we can get more precision on the time and more
-        // unique filenames.
-        struct timeval tv;
-        gettimeofday(&tv,NULL);
-        outputFile << "run" << tv.tv_sec << tv.tv_usec << ".xml";
+    if (this->root == NULL) {
+        return;                         /* No tree available */
+    }
+
+    t = time(NULL);                     /* This is presumably the time the
+                                         * simulation finished. */
+#ifdef HAVE_GETTIMEOFDAY
+    /* If the posix function gettimeofday is available, use it to produce
+     * unique filenames. */
+    struct timeval tv;
+    gettimeofday(&tv,NULL);
+    outputFile << "run" << tv.tv_sec << tv.tv_usec << ".xml";
 #else
-        outputFile << "run" << (int)time(&t) << ".xml";
+    outputFile << "run" << (int)t << ".xml";
 #endif
-        file.open(outputFile.str().c_str(),std::ios::out);
-
-        put("tool.version.rappture.revision","$LastChangedRevision$");
-        put("tool.version.rappture.modified","$LastChangedDate$");
-        if ( "" == get("tool.version.rappture.language") ) {
-            put("tool.version.rappture.language","c++");
-        }
-
-        // generate a timestamp for the run file
-        timeinfo = localtime(&t);
-        timestamp = std::string(ctime(&t));
-        // erase the 24th character because it is a newline
-        timestamp.erase(24);
-        // concatinate the timezone
-        timestamp.append(" ");
+    file.open(outputFile.str().c_str(),std::ios::out);
+    
+    
+    put("tool.version.rappture.version", RAPPTURE_VERSION);
+    put("tool.version.rappture.revision", SVN_VERSION);
+    put("tool.version.rappture.modified",
+        "$LastChangedDate$");
+    if ( "" == get("tool.version.rappture.language") ) {
+        put("tool.version.rappture.language","c++");
+    }
+    // generate a timestamp for the run file
+    timeinfo = localtime(&t);
+    timestamp = std::string(ctime(&t));
+    // erase the 24th character because it is a newline
+    timestamp.erase(24);
+    // concatenate the timezone
+    timestamp.append(" ");
 #ifdef _WIN32
-        timestamp.append(_tzname[_daylight]);
-        // username is left blank for windows because i dont know
-        // how to retrieve username on win32 environment.
-        username = "";
-        hostname = "";
+    timestamp.append(_tzname[_daylight]);
+    username = "";
+    hostname = "";
+    user = getenv("USERNAME");
+    if (user != NULL) {
+        username = std::string(user);
+    } else {
+        user = getenv("LOGNAME");
+        if (user != NULL) {
+            username = std::string(user);
+        }
+    }
 #else
-        timestamp.append(timeinfo->tm_zone);
-        user = getenv("USER");
-        if (user != NULL) {
-            username = std::string(user);
-        } else {
-            user = getenv("LOGNAME");
-            if (user != NULL) {
-                username = std::string(user);
-            }
-        }
+    timestamp.append(timeinfo->tm_zone);
+    user = getenv("USER");
+    if (user != NULL) {
+        username = std::string(user);
+    } else {
+        user = getenv("LOGNAME");
+        if (user != NULL) {
+            username = std::string(user);
+        }
+    }
 #endif
 
-        // add the timestamp to the run file
-        put("output.time", timestamp);
-        put("output.status",exitStatus);
-        put("output.user",username);
-        put("output.host",hostname);
-
-        if ( file.is_open() ) {
-            xmlText = xml();
-            if (!xmlText.empty()) {
-                file << xmlText;
-            }
-            // check to make sure there were no
-            // errors while writing the run.xml file.
-            if (   (!file.good())
-                || ((long)xmlText.length() != ((long)file.tellp()-(long)1))
+    // add the timestamp to the run file
+    put("output.time", timestamp);
+    put("output.status",exitStatus);
+    put("output.user",username);
+    put("output.host",hostname);
+    
+    if ( file.is_open() ) {
+        xmlText = xml();
+        if (!xmlText.empty()) {
+            file << xmlText;
+        }
+        // check to make sure there were no
+        // errors while writing the run.xml file.
+        if (   (!file.good())
+               || ((long)xmlText.length() != ((long)file.tellp()-(long)1))
                ) {
-                 status.error("Error while writing run file");
-                 status.addContext("RpLibrary::result()");
-            }
-            file.close();
-        }
-        else {
-            status.error("Error while opening run file");
-            status.addContext("RpLibrary::result()");
-        }
-        std::cout << "=RAPPTURE-RUN=>" << outputFile.str() << std::endl;
-    }
+            status.error("Error while writing run file");
+            status.addContext("RpLibrary::result()");
+        }
+        file.close();
+    } else {
+        status.error("Error while opening run file");
+        status.addContext("RpLibrary::result()");
+    }
+    std::cout << "=RAPPTURE-RUN=>" << outputFile.str() << std::endl;
 }
 

branches/blt4/src/core/RpLibrary.h

@@ -5 +5 @@
  * ======================================================================
  *  AUTHOR:  Derrick S. Kearney, Purdue University
- *  Copyright (c) 2004-2007  Purdue Research Foundation
+ *  Copyright (c) 2004-2012  HUBzero Foundation, LLC
  *
  *  See the file "license.terms" for information on usage and

branches/blt4/src/core/RpLibraryCInterface.cc

@@ -5 +5 @@
  * ======================================================================
  *  AUTHOR:  Derrick Kearney, Purdue University
- *  Copyright (c) 2004-2007  Purdue Research Foundation
+ *  Copyright (c) 2004-2012  HUBzero Foundation, LLC
  *
  *  See the file "license.terms" for information on usage and

branches/blt4/src/core/RpLibraryCInterface.h

@@ -5 +5 @@
  * ======================================================================
  *  AUTHOR:  Derrick Kearney, Purdue University
- *  Copyright (c) 2004-2007  Purdue Research Foundation
+ *  Copyright (c) 2004-2012  HUBzero Foundation, LLC
  *
  *  See the file "license.terms" for information on usage and

branches/blt4/src/core/RpLibraryFInterface.cc

@@ -5 +5 @@
  * ======================================================================
  *  AUTHOR:  Derrick Kearney, Purdue University
- *  Copyright (c) 2004-2007  Purdue Research Foundation
+ *  Copyright (c) 2004-2012  HUBzero Foundation, LLC
  *
  *  See the file "license.terms" for information on usage and
@@ -238 +238 @@
             xmlText = lib->get(inPath);
             if (!xmlText.empty()) {
-                fortranify(xmlText.c_str(),retText, retText_len);
+                fortranify(xmlText.c_str(),retText,retText_len);
             }
 

branches/blt4/src/core/RpLibraryFInterface.h

@@ -5 +5 @@
  * ======================================================================
  *  AUTHOR:  Derrick S. Kearney, Purdue University
- *  Copyright (c) 2004-2007  Purdue Research Foundation
+ *  Copyright (c) 2004-2012  HUBzero Foundation, LLC
  *
  *  See the file "license.terms" for information on usage and

branches/blt4/src/core/RpLibraryFStubs.c

@@ -5 +5 @@
  * ======================================================================
  *  AUTHOR:  Derrick Kearney, Purdue University
- *  Copyright (c) 2004-2007  Purdue Research Foundation
+ *  Copyright (c) 2004-2012  HUBzero Foundation, LLC
  *
  *  See the file "license.terms" for information on usage and

branches/blt4/src/core/RpLibraryFStubs.h

@@ -5 +5 @@
  * ======================================================================
  *  AUTHOR:  Derrick Kearney, Purdue University
- *  Copyright (c) 2004-2007  Purdue Research Foundation
+ *  Copyright (c) 2004-2012  HUBzero Foundation, LLC
  *
  *  See the file "license.terms" for information on usage and

branches/blt4/src/core/RpOutcome.cc

@@ -4 +4 @@
  *
  *  AUTHOR:  Michael McLennan, Purdue University
- *  Copyright (c) 2004-2007  Purdue Research Foundation
+ *  Copyright (c) 2004-2012  HUBzero Foundation, LLC
  * ----------------------------------------------------------------------
  *  See the file "license.terms" for information on usage and

branches/blt4/src/core/RpOutcome.h

@@ -4 +4 @@
  *
  *  AUTHOR:  Michael McLennan, Purdue University
- *  Copyright (c) 2004-2007  Purdue Research Foundation
+ *  Copyright (c) 2004-2012  HUBzero Foundation, LLC
  * ----------------------------------------------------------------------
  *  See the file "license.terms" for information on usage and

branches/blt4/src/core/RpOutcomeCHelper.h

@@ -5 +5 @@
  * ======================================================================
  *  AUTHOR:  Derrick Kearney, Purdue University
- *  Copyright (c) 2004-2007  Purdue Research Foundation
+ *  Copyright (c) 2004-2012  HUBzero Foundation, LLC
  *
  *  See the file "license.terms" for information on usage and

branches/blt4/src/core/RpOutcomeCInterface.cc

@@ -5 +5 @@
  * ======================================================================
  *  AUTHOR:  Derrick Kearney, Purdue University
- *  Copyright (c) 2004-2007  Purdue Research Foundation
+ *  Copyright (c) 2004-2012  HUBzero Foundation, LLC
  *
  *  See the file "license.terms" for information on usage and

branches/blt4/src/core/RpOutcomeCInterface.h

@@ -5 +5 @@
  * ======================================================================
  *  AUTHOR:  Derrick Kearney, Purdue University
- *  Copyright (c) 2004-2007  Purdue Research Foundation
+ *  Copyright (c) 2004-2012  HUBzero Foundation, LLC
  *
  *  See the file "license.terms" for information on usage and

branches/blt4/src/core/RpPtr.cc

@@ -4 +4 @@
  *
  *  AUTHOR:  Michael McLennan, Purdue University
- *  Copyright (c) 2004-2006  Purdue Research Foundation
+ *  Copyright (c) 2004-2012  HUBzero Foundation, LLC
  * ----------------------------------------------------------------------
  *  See the file "license.terms" for information on usage and

branches/blt4/src/core/RpPtr.h

@@ -4 +4 @@
  *
  *  AUTHOR:  Michael McLennan, Purdue University
- *  Copyright (c) 2004-2006  Purdue Research Foundation
+ *  Copyright (c) 2004-2012  HUBzero Foundation, LLC
  * ----------------------------------------------------------------------
  *  See the file "license.terms" for information on usage and

branches/blt4/src/core/RpResult.cc

@@ -9 +9 @@
  * ======================================================================
  *  AUTHOR:  Michael McLennan, Purdue University
- *  Copyright (c) 2004-2005  Purdue Research Foundation
+ *  Copyright (c) 2004-2012  HUBzero Foundation, LLC
  *
  *  See the file "license.terms" for information on usage and

branches/blt4/src/core/RpSimpleBuffer.h

@@ -6 +6 @@
  *  AUTHOR:  Derrick Kearney, Purdue University
  *
- *  Copyright (c) 2004-2008  Purdue Research Foundation
+ *  Copyright (c) 2004-2012  HUBzero Foundation, LLC
  * ----------------------------------------------------------------------
  *  See the file "license.terms" for information on usage and
@@ -49 +49 @@
  *  GOVERNMENT USE: If you are acquiring this software on behalf of the
  *  U.S. government, the Government shall have only "Restricted Rights"
- *  in the software and related documentation as defined in the Federal·
+ *  in the software and related documentation as defined in the Federal
  *  Acquisition Regulations (FARs) in Clause 52.227.19 (c) (2).  If you
  *  are acquiring the software on behalf of the Department of Defense, the
@@ -57 +57 @@
  *  authors grant the U.S. Government and others acting in its behalf
  *  permission to use and distribute the software in accordance with the
- *  terms specified in this license.·
+ *  terms specified in this license.
  *
  * ======================================================================
@@ -245 +245 @@
         return;
     }
-    _numElemsUsed = numElems;
 }
 
@@ -644 +643 @@
 
     while (curMemb != _numElemsUsed) {
-        fprintf(stdout,"_buf[%lu] = :%#x:\n", (long unsigned int)curMemb,
+        fprintf(stdout,"_buf[%lu] = :%#lx:\n", (long unsigned int)curMemb,
                 (unsigned long)_buf[curMemb]);
         curMemb += 1;

branches/blt4/src/core/RpUnits.cc

@@ -7 +7 @@
  * ======================================================================
  *  AUTHOR:  Derrick Kearney, Purdue University
- *  Copyright (c) 2004-2007  Purdue Research Foundation
+ *  Copyright (c) 2004-2012  HUBzero Foundation, LLC
  *
  *  See the file "license.terms" for information on usage and
@@ -1335 +1335 @@
     std::string type = "";     // junk var used because units2list requires it
     std::string retStr = "";
-    double origNumVal = 0;
     double numVal = 0;
     double toExp = 0;
@@ -1365 +1364 @@
 
     convErr = unitSlice(val,fromUnitsName,numVal);
-    origNumVal = numVal;
 
     if (convErr != 0) {
@@ -2700 +2698 @@
     // RpUnits* cubic_meter  = RpUnits::define("m3", NULL, RP_TYPE_VOLUME);
     // RpUnits* cubic_feet   = RpUnits::define("ft3", NULL, RP_TYPE_VOLUME);
-    RpUnits* us_gallon    = NULL;
-    RpUnits* liter        = NULL;
-
-    us_gallon    = RpUnits::define("gal", NULL, RP_TYPE_VOLUME);
-    liter        = RpUnits::define("L", NULL, RP_TYPE_VOLUME, RPUNITS_METRIC);
+    // RpUnits* us_gallon    = NULL;
+    // RpUnits* liter        = NULL;
+
+    RpUnits::define("gal", NULL, RP_TYPE_VOLUME);
+    RpUnits::define("L", NULL, RP_TYPE_VOLUME, RPUNITS_METRIC);
 
     /*
@@ -2785 +2783 @@
 RpUnitsPreset::addPresetMass () {
 
-    RpUnits* gram  = NULL;
-
-    gram  = RpUnits::define("g", NULL, RP_TYPE_MASS, RPUNITS_METRIC,!RPUNITS_CASE_INSENSITIVE);
+    RpUnits::define("g", NULL, RP_TYPE_MASS, RPUNITS_METRIC,!RPUNITS_CASE_INSENSITIVE);
 
     return 0;
@@ -2887 +2883 @@
 RpUnitsPreset::addPresetForce () {
 
-    RpUnits* newton = NULL;
-
-    newton = RpUnits::define("N",  NULL, RP_TYPE_FORCE, RPUNITS_METRIC);
+    RpUnits::define("N",  NULL, RP_TYPE_FORCE, RPUNITS_METRIC);
 
     return 0;
@@ -2937 +2931 @@
 /**
  * Defines the following units:
+ *   volt  (V)
  *   mole  (mol)
- *
+ *   hertz (Hz)
+ *   becquerel (Bq)
+ *   amu
+ *   bel (B)
+ *   amp
+ *   ohm
  * Return codes: 0 success, anything else is error
  */
@@ -2945 +2945 @@
 RpUnitsPreset::addPresetMisc () {
 
-    RpUnits* volt      = NULL;
-    RpUnits* mole      = NULL;
-    RpUnits* hertz     = NULL;
-    RpUnits* becquerel = NULL;
-    RpUnits* amu       = NULL;
-    RpUnits* bel       = NULL;
-    RpUnits* amp       = NULL;
-    RpUnits* ohm       = NULL;
-
-    volt      = RpUnits::define("V",  NULL, RP_TYPE_EPOT, RPUNITS_METRIC);
-    mole      = RpUnits::define("mol",NULL, "quantity", RPUNITS_METRIC);
-    hertz     = RpUnits::define("Hz", NULL, "frequency", RPUNITS_METRIC);
-    becquerel = RpUnits::define("Bq", NULL, "radioactivity", RPUNITS_METRIC);
-    amu       = RpUnits::define("amu", NULL, "mass_unit", !RPUNITS_METRIC);
-    bel       = RpUnits::define("B", NULL, "audio_transmission", RPUNITS_METRIC);
-    amp       = RpUnits::define("amp", NULL, "electric_current", RPUNITS_METRIC);
-    ohm       = RpUnits::define("ohm", NULL, "electric_resistance", RPUNITS_METRIC);
+    RpUnits::define("V",  NULL, RP_TYPE_EPOT, RPUNITS_METRIC);
+    RpUnits::define("mol",NULL, "quantity", RPUNITS_METRIC);
+    RpUnits::define("Hz", NULL, "frequency", RPUNITS_METRIC);
+    RpUnits::define("Bq", NULL, "radioactivity", RPUNITS_METRIC);
+    RpUnits::define("amu", NULL, "mass_unit", !RPUNITS_METRIC);
+    RpUnits::define("B", NULL, "audio_transmission", RPUNITS_METRIC);
+    RpUnits::define("amp", NULL, "electric_current", RPUNITS_METRIC);
+    RpUnits::define("ohm", NULL, "electric_resistance", RPUNITS_METRIC);
 
     // RpUnits* percent   = RpUnits::define("%",  NULL, RP_TYPE_MISC);
@@ -2981 +2972 @@
 RpUnitsPreset::addPresetPower () {
 
-    RpUnits* watt      = NULL;
-
     // watts are derived units = J/s = kg*m2/s3 = Newton*m/s and Amps*Volt
-    watt      = RpUnits::define("W",  NULL, RP_TYPE_POWER, RPUNITS_METRIC);
+    RpUnits::define("W",  NULL, RP_TYPE_POWER, RPUNITS_METRIC);
 
     return 0;

branches/blt4/src/core/RpUnits.h

@@ -7 +7 @@
  * ======================================================================
  *  AUTHOR:  Derrick Kearney, Purdue University
- *  Copyright (c) 2004-2007  Purdue Research Foundation
+ *  Copyright (c) 2004-2012  HUBzero Foundation, LLC
  *
  *  See the file "license.terms" for information on usage and

branches/blt4/src/core/RpUnitsCInterface.cc

@@ -5 +5 @@
  * ======================================================================
  *  AUTHOR:  Derrick Kearney, Purdue University
- *  Copyright (c) 2004-2005  Purdue Research Foundation
+ *  Copyright (c) 2004-2012  HUBzero Foundation, LLC
  *
  *  See the file "license.terms" for information on usage and

branches/blt4/src/core/RpUnitsCInterface.h

@@ -5 +5 @@
  * ======================================================================
  *  AUTHOR:  Derrick Kearney, Purdue University
- *  Copyright (c) 2004-2005  Purdue Research Foundation
+ *  Copyright (c) 2004-2012  HUBzero Foundation, LLC
  *
  *  See the file "license.terms" for information on usage and

branches/blt4/src/core/RpUnitsFInterface.cc

@@ -5 +5 @@
  * ======================================================================
  *  AUTHOR:  Derrick Kearney, Purdue University
- *  Copyright (c) 2004-2005  Purdue Research Foundation
+ *  Copyright (c) 2004-2012  HUBzero Foundation, LLC
  *
  *  See the file "license.terms" for information on usage and

branches/blt4/src/core/RpUnitsFInterface.h

@@ -5 +5 @@
  * ======================================================================
  *  AUTHOR:  Derrick Kearney, Purdue University
- *  Copyright (c) 2004-2005  Purdue Research Foundation
+ *  Copyright (c) 2004-2012  HUBzero Foundation, LLC
  *
  *  See the file "license.terms" for information on usage and

branches/blt4/src/core/RpUnitsFStubs.c

@@ -5 +5 @@
  * ======================================================================
  *  AUTHOR:  Derrick Kearney, Purdue University
- *  Copyright (c) 2004-2005  Purdue Research Foundation
+ *  Copyright (c) 2004-2012  HUBzero Foundation, LLC
  *
  *  See the file "license.terms" for information on usage and

branches/blt4/src/core/RpUnitsFStubs.h

@@ -5 +5 @@
  * ======================================================================
  *  AUTHOR:  Derrick Kearney, Purdue University
- *  Copyright (c) 2004-2005  Purdue Research Foundation
+ *  Copyright (c) 2004-2012  HUBzero Foundation, LLC
  *
  *  See the file "license.terms" for information on usage and

branches/blt4/src/core/RpUnitsStd.cc

@@ -1 +1 @@
 /*
  * ======================================================================
- *  Copyright (c) 2004-2005  Purdue Research Foundation
+ *  Copyright (c) 2004-2012  HUBzero Foundation, LLC
  *
  *  See the file "license.terms" for information on usage and

branches/blt4/src/core/RpUnitsStd.h

@@ -1 +1 @@
 /*
  * ======================================================================
- *  Copyright (c) 2004-2005  Purdue Research Foundation
+ *  Copyright (c) 2004-2012  HUBzero Foundation, LLC
  *
  *  See the file "license.terms" for information on usage and

branches/blt4/src/core/RpUtils.cc

@@ -5 +5 @@
  *  AUTHOR:  Derrick Kearney, Purdue University
  *
- *  Copyright (c) 2004-2007  Purdue Research Foundation
+ *  Copyright (c) 2004-2012  HUBzero Foundation, LLC
  * ----------------------------------------------------------------------
  *  See the file "license.terms" for information on usage and

branches/blt4/src/core/RpUtils.h

@@ -5 +5 @@
  *  AUTHOR:  Derrick Kearney, Purdue University
  *
- *  Copyright (c) 2004-2007  Purdue Research Foundation
+ *  Copyright (c) 2004-2012  HUBzero Foundation, LLC
  * ----------------------------------------------------------------------
  *  See the file "license.terms" for information on usage and

branches/blt4/src/core/RpUtilsCInterface.cc

@@ -5 +5 @@
  * ======================================================================
  *  AUTHOR:  Derrick Kearney, Purdue University
- *  Copyright (c) 2004-2007  Purdue Research Foundation
+ *  Copyright (c) 2004-2012  HUBzero Foundation, LLC
  *
  *  See the file "license.terms" for information on usage and

branches/blt4/src/core/RpUtilsCInterface.h

@@ -5 +5 @@
  * ======================================================================
  *  AUTHOR:  Derrick Kearney, Purdue University
- *  Copyright (c) 2004-2007  Purdue Research Foundation
+ *  Copyright (c) 2004-2012  HUBzero Foundation, LLC
  *
  *  See the file "license.terms" for information on usage and

branches/blt4/src/core/RpUtilsFInterface.cc

@@ -5 +5 @@
  * ======================================================================
  *  AUTHOR:  Derrick Kearney, Purdue University
- *  Copyright (c) 2004-2007  Purdue Research Foundation
+ *  Copyright (c) 2004-2012  HUBzero Foundation, LLC
  *
  *  See the file "license.terms" for information on usage and

branches/blt4/src/core/RpUtilsFInterface.h

@@ -5 +5 @@
  * ======================================================================
  *  AUTHOR:  Derrick S. Kearney, Purdue University
- *  Copyright (c) 2004-2007  Purdue Research Foundation
+ *  Copyright (c) 2004-2012  HUBzero Foundation, LLC
  *
  *  See the file "license.terms" for information on usage and

branches/blt4/src/core/RpUtilsFStubs.c

@@ -5 +5 @@
  * ======================================================================
  *  AUTHOR:  Derrick Kearney, Purdue University
- *  Copyright (c) 2004-2007  Purdue Research Foundation
+ *  Copyright (c) 2004-2012  HUBzero Foundation, LLC
  *
  *  See the file "license.terms" for information on usage and

branches/blt4/src/core/RpUtilsFStubs.h

@@ -5 +5 @@
  * ======================================================================
  *  AUTHOR:  Derrick Kearney, Purdue University
- *  Copyright (c) 2004-2007  Purdue Research Foundation
+ *  Copyright (c) 2004-2012  HUBzero Foundation, LLC
  *
  *  See the file "license.terms" for information on usage and

branches/blt4/src/core/config.h.in

@@ -70 +70 @@
 #undef HAVE_CTYPE_H
 
+/* Define to 1 if you have the <env.h> header file. */
+#undef HAVE_ENV_H
+
 /* Define to 1 if you have the <errno.h> header file. */
 #undef HAVE_ERRNO_H
 
+/* Render servers can use ffmpeg */
+#undef HAVE_FFMPEG
+
 /* Define to 1 if you have the <ffmpeg/avcodec.h> header file. */
 #undef HAVE_FFMPEG_AVCODEC_H
@@ -91 +97 @@
 #undef HAVE_FSTREAM
 
+/* Define to 1 if you have the `gettimeofday' function. */
+#undef HAVE_GETTIMEOFDAY
+
 /* Define to 1 if you have the `img_convert' function. */
 #undef HAVE_IMG_CONVERT
@@ -121 +130 @@
 #undef HAVE_LIBAVUTIL_AVUTIL_H
 
-/* Define to 1 if you have the `m' library (-lm). */
-#undef HAVE_LIBM
+/* Define to 1 if you have the <libavutil/mathematics.h> header file. */
+#undef HAVE_LIBAVUTIL_MATHEMATICS_H
 
 /* Define to 1 if you have the `ncurses' library (-lncurses). */
@@ -154 +163 @@
 #undef HAVE_NCURSES_H
 
+/* Define to 1 if you have the <node.h> header file. */
+#undef HAVE_NODE_H
+
 /* Define to 1 if you have the <Python.h> header file. */
 #undef HAVE_PYTHON_H
 
+/* Define to 1 if you have the <ruby.h> header file. */
+#undef HAVE_RUBY_H
+
+/* Define to 1 if you have the <ruby/node.h> header file. */
+#undef HAVE_RUBY_NODE_H
+
 /* Define to 1 if you have the <sstream> header file. */
 #undef HAVE_SSTREAM
@@ -208 +226 @@
 #undef HAVE_VECTOR
 
+/* Define to 1 if you have the <version.h> header file. */
+#undef HAVE_VERSION_H
+
 /* Define to the address where bug reports for this package should be sent. */
 #undef PACKAGE_BUGREPORT
@@ -220 +241 @@
 #undef PACKAGE_TARNAME
 
-/* Define to the home page for this package. */
-#undef PACKAGE_URL
-
 /* Define to the version of this package. */
 #undef PACKAGE_VERSION
+
+/* Define this macro to use ruby/node.h */
+#undef REALLY_HAVE_RUBY_NODE_H
 
 /* The size of `int', as computed by sizeof. */

branches/blt4/src/core/rappture.h

@@ -1 +1 @@
 /*
  * ======================================================================
- *  Copyright (c) 2004-2005  Purdue Research Foundation
+ *  Copyright (c) 2004-2012  HUBzero Foundation, LLC
  *
  *  See the file "license.terms" for information on usage and

branches/blt4/src/core/rappture_fortran.c

@@ -1 +1 @@
 /*
  * ======================================================================
- *  Copyright (c) 2004-2005  Purdue Research Foundation
+ *  Copyright (c) 2004-2012  HUBzero Foundation, LLC
  *
  *  See the file "license.terms" for information on usage and

branches/blt4/src/core/scew/scew_extras.c

@@ -5 +5 @@
  * ======================================================================
  *  AUTHOR:  Derrick Kearney, Purdue University
- *  Copyright (c) 2004-2005  Purdue Research Foundation
+ *  Copyright (c) 2004-2012  HUBzero Foundation, LLC
  *
  *  See the file "license.terms" for information on usage and

branches/blt4/src/core/scew/scew_extras.h

@@ -1 +1 @@
 /*
  * ======================================================================
- *  Copyright (c) 2004-2005  Purdue Research Foundation
+ *  Copyright (c) 2004-2012  HUBzero Foundation, LLC
  *
  *  See the file "license.terms" for information on usage and

branches/blt4/src/core/scew_extras.c

@@ -5 +5 @@
  * ======================================================================
  *  AUTHOR:  Derrick Kearney, Purdue University
- *  Copyright (c) 2004-2005  Purdue Research Foundation
+ *  Copyright (c) 2004-2012  HUBzero Foundation, LLC
  *
  *  See the file "license.terms" for information on usage and

branches/blt4/src/core/scew_extras.h

@@ -1 +1 @@
 /*
  * ======================================================================
- *  Copyright (c) 2004-2005  Purdue Research Foundation
+ *  Copyright (c) 2004-2012  HUBzero Foundation, LLC
  *
  *  See the file "license.terms" for information on usage and