Changeset 3953


Ignore:
Timestamp:
Sep 24, 2013 12:41:04 PM (8 years ago)
Author:
gah
Message:

sync with trunk

Location:
branches/blt4/src/core
Files:
63 edited

Legend:

Unmodified
Added
Removed
  • branches/blt4/src/core/Makefile.in

    r1948 r3953  
    1313INSTALL         = @INSTALL@
    1414MKDIR_P         = @MKDIR_P@
    15 
     15SVN_VERSION     := $(shell svnversion $(srcdir))
     16RAPPTURE_VERSION = @PACKAGE_VERSION@
    1617CXX             = @CXX@
    1718# This hack is because the tcl.m4 file generates the line
     
    3233DX_LIB_SPEC     = @DX_LIB_SPEC@
    3334DX_INC_SPEC     = @DX_INC_SPEC@
    34 
    35 CC_SWITCHES     = $(CFLAGS) $(CFLAGS_DEBUG) $(INCLUDES) $(DEFINES)
    36 CXX_SWITCHES    = $(CFLAGS) $(CFLAGS_DEBUG) $(INCLUDES) $(DEFINES)
     35DEFINES         = -DSVN_VERSION=\"$(SVN_VERSION)\" \
     36                  -DRAPPTURE_VERSION=\"$(RAPPTURE_VERSION)\"
     37
     38CC_SWITCHES     = $(CFLAGS) $(CFLAGS_DEBUG) $(INCLUDES) $(DEFINES)
     39CXX_SWITCHES    = $(CFLAGS) $(CFLAGS_DEBUG) $(INCLUDES) $(DEFINES)
    3740
    3841INCLUDES        = \
     
    196199
    197200distclean: clean
    198         $(RM) Makefile *~
     201        $(RM) Makefile config.h *~
  • branches/blt4/src/core/RpBindingsDict.cc

    r1084 r3953  
    55 * ======================================================================
    66 *  AUTHOR:  Derrick S. Kearney, Purdue University
    7  *  Copyright (c) 2004-2008  Purdue Research Foundation
     7 *  Copyright (c) 2004-2012  HUBzero Foundation, LLC
    88 *
    99 *  See the file "license.terms" for information on usage and
  • branches/blt4/src/core/RpBindingsDict.h

    r1084 r3953  
    55 * ======================================================================
    66 *  AUTHOR:  Derrick S. Kearney, Purdue University
    7  *  Copyright (c) 2004-2005  Purdue Research Foundation
     7 *  Copyright (c) 2004-2012  HUBzero Foundation, LLC
    88 *
    99 *  See the file "license.terms" for information on usage and
  • branches/blt4/src/core/RpBuffer.cc

    r2544 r3953  
    55 *  AUTHOR:  Derrick Kearney, Purdue University
    66 *
    7  *  Copyright (c) 2004-2008  Purdue Research Foundation
     7 *  Copyright (c) 2004-2012  HUBzero Foundation, LLC
    88 * ----------------------------------------------------------------------
    99 *  See the file "license.terms" for information on usage and
  • branches/blt4/src/core/RpBuffer.h

    r1527 r3953  
    55 *  AUTHOR:  Derrick Kearney, Purdue University
    66 *
    7  *  Copyright (c) 2004-2008  Purdue Research Foundation
     7 *  Copyright (c) 2004-2012  HUBzero Foundation, LLC
    88 * ----------------------------------------------------------------------
    99 *  See the file "license.terms" for information on usage and
  • branches/blt4/src/core/RpBufferCHelper.h

    r1018 r3953  
    55 * ======================================================================
    66 *  AUTHOR:  Derrick Kearney, Purdue University
    7  *  Copyright (c) 2004-2007  Purdue Research Foundation
     7 *  Copyright (c) 2004-2012  HUBzero Foundation, LLC
    88 *
    99 *  See the file "license.terms" for information on usage and
  • branches/blt4/src/core/RpBufferCInterface.cc

    r1384 r3953  
    55 * ======================================================================
    66 *  AUTHOR:  Derrick Kearney, Purdue University
    7  *  Copyright (c) 2004-2007  Purdue Research Foundation
     7 *  Copyright (c) 2004-2012  HUBzero Foundation, LLC
    88 *
    99 *  See the file "license.terms" for information on usage and
  • branches/blt4/src/core/RpBufferCInterface.h

    r1366 r3953  
    66 * ======================================================================
    77 *  AUTHOR:  Derrick Kearney, Purdue University
    8  *  Copyright (c) 2004-2007  Purdue Research Foundation
     8 *  Copyright (c) 2004-2012  HUBzero Foundation, LLC
    99 *
    1010 *  See the file "license.terms" for information on usage and
  • branches/blt4/src/core/RpDXWriter.cc

    r1328 r3953  
    77 * ======================================================================
    88 *  AUTHOR:  Derrick S. Kearney, Purdue University
    9  *  Copyright (c) 2005-2008  Purdue Research Foundation
     9 *  Copyright (c) 2004-2012  HUBzero Foundation, LLC
    1010 *
    1111 *  See the file "license.terms" for information on usage and
  • branches/blt4/src/core/RpDXWriter.h

    r1325 r3953  
    88 * ======================================================================
    99 *  AUTHOR:  Derrick S. Kearney, Purdue University
    10  *  Copyright (c) 2005-2008  Purdue Research Foundation
     10 *  Copyright (c) 2004-2012  HUBzero Foundation, LLC
    1111 *
    1212 *  See the file "license.terms" for information on usage and
  • branches/blt4/src/core/RpDXWriterFInterface.cc

    r1086 r3953  
    55 * ======================================================================
    66 *  AUTHOR:  Derrick Kearney, Purdue University
    7  *  Copyright (c) 2005-2008  Purdue Research Foundation
     7 *  Copyright (c) 2004-2012  HUBzero Foundation, LLC
    88 *
    99 *  See the file "license.terms" for information on usage and
  • branches/blt4/src/core/RpDXWriterFInterface.h

    r1086 r3953  
    55 * ======================================================================
    66 *  AUTHOR:  Derrick S. Kearney, Purdue University
    7  *  Copyright (c) 2005-2008  Purdue Research Foundation
     7 *  Copyright (c) 2004-2012  HUBzero Foundation, LLC
    88 *
    99 *  See the file "license.terms" for information on usage and
  • branches/blt4/src/core/RpDXWriterFStubs.c

    r1086 r3953  
    55 * ======================================================================
    66 *  AUTHOR:  Derrick S. Kearney, Purdue University
    7  *  Copyright (c) 2005-2008  Purdue Research Foundation
     7 *  Copyright (c) 2004-2012  HUBzero Foundation, LLC
    88 *
    99 *  See the file "license.terms" for information on usage and
  • branches/blt4/src/core/RpDXWriterFStubs.h

    r1086 r3953  
    55 * ======================================================================
    66 *  AUTHOR:  Derrick S. Kearney, Purdue University
    7  *  Copyright (c) 2005-2008  Purdue Research Foundation
     7 *  Copyright (c) 2004-2012  HUBzero Foundation, LLC
    88 *
    99 *  See the file "license.terms" for information on usage and
  • branches/blt4/src/core/RpDict.h

    • Property svn:executable deleted
    r2936 r3953  
    44 *
    55 *  AUTHOR:  Derrick Kearney, Purdue University
    6  *  Copyright (c) 2004-2008  Purdue Research Foundation
     6 *  Copyright (c) 2004-2012  HUBzero Foundation, LLC
    77 *
    88 *  See the file "license.terms" for information on usage and
  • branches/blt4/src/core/RpEncode.cc

    r1617 r3953  
    77 * ======================================================================
    88 *  AUTHOR:  Derrick Kearney, Purdue University
    9  *  Copyright (c) 2004-2007  Purdue Research Foundation
     9 *  Copyright (c) 2004-2012  HUBzero Foundation, LLC
    1010 *
    1111 *  See the file "license.terms" for information on usage and
  • branches/blt4/src/core/RpEncode.h

    r1451 r3953  
    66 *  AUTHOR:  Derrick Kearney, Purdue University
    77 *
    8  *  Copyright (c) 2004-2007  Purdue Research Foundation
     8 *  Copyright (c) 2004-2012  HUBzero Foundation, LLC
    99 * ----------------------------------------------------------------------
    1010 *  See the file "license.terms" for information on usage and
  • branches/blt4/src/core/RpEntityRef.cc

    r1582 r3953  
    22 * ======================================================================
    33 *  AUTHOR:  Derrick Kearney, Purdue University
    4  *  Copyright (c) 2004-2006  Purdue Research Foundation
     4 *  Copyright (c) 2004-2012  HUBzero Foundation, LLC
    55 *
    66 *  See the file "license.terms" for information on usage and
  • branches/blt4/src/core/RpEntityRef.h

    r788 r3953  
    1818 * ======================================================================
    1919 *  AUTHOR:  Derrick Kearney, Purdue University
    20  *  Copyright (c) 2004-2007  Purdue Research Foundation
     20 *  Copyright (c) 2004-2012  HUBzero Foundation, LLC
    2121 *
    2222 *  See the file "license.terms" for information on usage and
  • branches/blt4/src/core/RpFortranCommon.cc

    r1086 r3953  
    77 * ======================================================================
    88 *  AUTHOR:  Derrick Kearney, Purdue University
    9  *  Copyright (c) 2004-2005  Purdue Research Foundation
     9 *  Copyright (c) 2004-2012  HUBzero Foundation, LLC
    1010 *
    1111 *  See the file "license.terms" for information on usage and
  • branches/blt4/src/core/RpFortranCommon.h

    r1086 r3953  
    77 * ======================================================================
    88 *  AUTHOR:  Derrick Kearney, Purdue University
    9  *  Copyright (c) 2004-2005  Purdue Research Foundation
     9 *  Copyright (c) 2004-2012  HUBzero Foundation, LLC
    1010 *
    1111 *  See the file "license.terms" for information on usage and
  • branches/blt4/src/core/RpLibrary.cc

    r3025 r3953  
    55 * ======================================================================
    66 *  AUTHOR:  Derrick S. Kearney, Purdue University
    7  *  Copyright (c) 2004-2007  Purdue Research Foundation
     7 *  Copyright (c) 2004-2012  HUBzero Foundation, LLC
    88 *
    99 *  See the file "license.terms" for information on usage and
     
    1212 */
    1313
     14#include "config.h"
    1415#include "scew/scew.h"
    1516#include "scew_extras.h"
     
    6364        parser = scew_parser_create();
    6465
    65         // Don't trim whitespaces
    66         scew_parser_ignore_whitespaces(parser, 0);
     66        // Don't ignore whitespaces!
     67        // Things like string inputs may have trailing newlines that
     68        // matter to the underlying application.
     69        scew_parser_ignore_whitespaces(parser, 1);
    6770
    6871        /* Loads an XML file */
     
    132135    // fill in the current RpLibrary's data with other's data
    133136    parser = scew_parser_create();
    134     // Don't trim whitespaces
    135     scew_parser_ignore_whitespaces(parser, 0);
     137    scew_parser_ignore_whitespaces(parser, 1);
    136138
    137139    // Loads the XML from other
     
    219221        // fill in the current RpLibrary's data with other's data
    220222        parser = scew_parser_create();
    221         // Don't trim whitespaces
    222         scew_parser_ignore_whitespaces(parser, 0);
     223        scew_parser_ignore_whitespaces(parser, 1);
    223224
    224225        // Loads the XML from other
     
    18731874    scew_element *tmpNode   = NULL;
    18741875    const char *contents    = NULL;
    1875     int retVal              = 1;
    18761876    int deleteTmpNode       = 0;
    18771877
     
    19391939                    // maybe we want to count the number of children
    19401940                    // that we have successfully added?
    1941                     retVal = 0;
    19421941                }
    19431942                else {
     
    22222221RpLibrary::result(int exitStatus)
    22232222{
    2224     std::stringstream outputFile;
    22252223    std::fstream file;
    22262224    std::string xmlText = "";
    2227     time_t t = 0;
    2228     struct tm* timeinfo = NULL;
    2229     std::string timestamp = "";
    2230     std::string username = "";
    2231     std::string hostname = "";
     2225    time_t t;
     2226    struct tm* timeinfo;
     2227    std::stringstream outputFile;
     2228    std::string timestamp;
     2229    std::string username;
     2230    std::string hostname;
    22322231    char *user = NULL;
    22332232
    2234     if (this->root) {
    2235 #ifdef _POSIX_SOURCE
    2236         // if the posix function gettimeofday is available,
    2237         // we can get more precision on the time and more
    2238         // unique filenames.
    2239         struct timeval tv;
    2240         gettimeofday(&tv,NULL);
    2241         outputFile << "run" << tv.tv_sec << tv.tv_usec << ".xml";
     2233    if (this->root == NULL) {
     2234        return;                         /* No tree available */
     2235    }
     2236
     2237    t = time(NULL);                     /* This is presumably the time the
     2238                                         * simulation finished. */
     2239#ifdef HAVE_GETTIMEOFDAY
     2240    /* If the posix function gettimeofday is available, use it to produce
     2241     * unique filenames. */
     2242    struct timeval tv;
     2243    gettimeofday(&tv,NULL);
     2244    outputFile << "run" << tv.tv_sec << tv.tv_usec << ".xml";
    22422245#else
    2243         outputFile << "run" << (int)time(&t) << ".xml";
     2246    outputFile << "run" << (int)t << ".xml";
    22442247#endif
    2245         file.open(outputFile.str().c_str(),std::ios::out);
    2246 
    2247         put("tool.version.rappture.revision","$LastChangedRevision$");
    2248         put("tool.version.rappture.modified","$LastChangedDate$");
    2249         if ( "" == get("tool.version.rappture.language") ) {
    2250             put("tool.version.rappture.language","c++");
    2251         }
    2252 
    2253         // generate a timestamp for the run file
    2254         timeinfo = localtime(&t);
    2255         timestamp = std::string(ctime(&t));
    2256         // erase the 24th character because it is a newline
    2257         timestamp.erase(24);
    2258         // concatinate the timezone
    2259         timestamp.append(" ");
     2248    file.open(outputFile.str().c_str(),std::ios::out);
     2249   
     2250   
     2251    put("tool.version.rappture.version", RAPPTURE_VERSION);
     2252    put("tool.version.rappture.revision", SVN_VERSION);
     2253    put("tool.version.rappture.modified",
     2254        "$LastChangedDate$");
     2255    if ( "" == get("tool.version.rappture.language") ) {
     2256        put("tool.version.rappture.language","c++");
     2257    }
     2258    // generate a timestamp for the run file
     2259    timeinfo = localtime(&t);
     2260    timestamp = std::string(ctime(&t));
     2261    // erase the 24th character because it is a newline
     2262    timestamp.erase(24);
     2263    // concatenate the timezone
     2264    timestamp.append(" ");
    22602265#ifdef _WIN32
    2261         timestamp.append(_tzname[_daylight]);
    2262         // username is left blank for windows because i dont know
    2263         // how to retrieve username on win32 environment.
    2264         username = "";
    2265         hostname = "";
     2266    timestamp.append(_tzname[_daylight]);
     2267    username = "";
     2268    hostname = "";
     2269    user = getenv("USERNAME");
     2270    if (user != NULL) {
     2271        username = std::string(user);
     2272    } else {
     2273        user = getenv("LOGNAME");
     2274        if (user != NULL) {
     2275            username = std::string(user);
     2276        }
     2277    }
    22662278#else
    2267         timestamp.append(timeinfo->tm_zone);
    2268         user = getenv("USER");
    2269         if (user != NULL) {
    2270             username = std::string(user);
    2271         } else {
    2272             user = getenv("LOGNAME");
    2273             if (user != NULL) {
    2274                 username = std::string(user);
    2275             }
    2276         }
     2279    timestamp.append(timeinfo->tm_zone);
     2280    user = getenv("USER");
     2281    if (user != NULL) {
     2282        username = std::string(user);
     2283    } else {
     2284        user = getenv("LOGNAME");
     2285        if (user != NULL) {
     2286            username = std::string(user);
     2287        }
     2288    }
    22772289#endif
    22782290
    2279         // add the timestamp to the run file
    2280         put("output.time", timestamp);
    2281         put("output.status",exitStatus);
    2282         put("output.user",username);
    2283         put("output.host",hostname);
    2284 
    2285         if ( file.is_open() ) {
    2286             xmlText = xml();
    2287             if (!xmlText.empty()) {
    2288                 file << xmlText;
    2289             }
    2290             // check to make sure there were no
    2291             // errors while writing the run.xml file.
    2292             if (   (!file.good())
    2293                 || ((long)xmlText.length() != ((long)file.tellp()-(long)1))
     2291    // add the timestamp to the run file
     2292    put("output.time", timestamp);
     2293    put("output.status",exitStatus);
     2294    put("output.user",username);
     2295    put("output.host",hostname);
     2296   
     2297    if ( file.is_open() ) {
     2298        xmlText = xml();
     2299        if (!xmlText.empty()) {
     2300            file << xmlText;
     2301        }
     2302        // check to make sure there were no
     2303        // errors while writing the run.xml file.
     2304        if (   (!file.good())
     2305               || ((long)xmlText.length() != ((long)file.tellp()-(long)1))
    22942306               ) {
    2295                  status.error("Error while writing run file");
    2296                  status.addContext("RpLibrary::result()");
    2297             }
    2298             file.close();
    2299         }
    2300         else {
    2301             status.error("Error while opening run file");
    2302             status.addContext("RpLibrary::result()");
    2303         }
    2304         std::cout << "=RAPPTURE-RUN=>" << outputFile.str() << std::endl;
    2305     }
     2307            status.error("Error while writing run file");
     2308            status.addContext("RpLibrary::result()");
     2309        }
     2310        file.close();
     2311    } else {
     2312        status.error("Error while opening run file");
     2313        status.addContext("RpLibrary::result()");
     2314    }
     2315    std::cout << "=RAPPTURE-RUN=>" << outputFile.str() << std::endl;
    23062316}
    23072317
  • branches/blt4/src/core/RpLibrary.h

    r2544 r3953  
    55 * ======================================================================
    66 *  AUTHOR:  Derrick S. Kearney, Purdue University
    7  *  Copyright (c) 2004-2007  Purdue Research Foundation
     7 *  Copyright (c) 2004-2012  HUBzero Foundation, LLC
    88 *
    99 *  See the file "license.terms" for information on usage and
  • branches/blt4/src/core/RpLibraryCInterface.cc

    r1018 r3953  
    55 * ======================================================================
    66 *  AUTHOR:  Derrick Kearney, Purdue University
    7  *  Copyright (c) 2004-2007  Purdue Research Foundation
     7 *  Copyright (c) 2004-2012  HUBzero Foundation, LLC
    88 *
    99 *  See the file "license.terms" for information on usage and
  • branches/blt4/src/core/RpLibraryCInterface.h

    r1018 r3953  
    55 * ======================================================================
    66 *  AUTHOR:  Derrick Kearney, Purdue University
    7  *  Copyright (c) 2004-2007  Purdue Research Foundation
     7 *  Copyright (c) 2004-2012  HUBzero Foundation, LLC
    88 *
    99 *  See the file "license.terms" for information on usage and
  • branches/blt4/src/core/RpLibraryFInterface.cc

    r2558 r3953  
    55 * ======================================================================
    66 *  AUTHOR:  Derrick Kearney, Purdue University
    7  *  Copyright (c) 2004-2007  Purdue Research Foundation
     7 *  Copyright (c) 2004-2012  HUBzero Foundation, LLC
    88 *
    99 *  See the file "license.terms" for information on usage and
     
    238238            xmlText = lib->get(inPath);
    239239            if (!xmlText.empty()) {
    240                 fortranify(xmlText.c_str(),retText, retText_len);
     240                fortranify(xmlText.c_str(),retText,retText_len);
    241241            }
    242242
  • branches/blt4/src/core/RpLibraryFInterface.h

    r2544 r3953  
    55 * ======================================================================
    66 *  AUTHOR:  Derrick S. Kearney, Purdue University
    7  *  Copyright (c) 2004-2007  Purdue Research Foundation
     7 *  Copyright (c) 2004-2012  HUBzero Foundation, LLC
    88 *
    99 *  See the file "license.terms" for information on usage and
  • branches/blt4/src/core/RpLibraryFStubs.c

    r2544 r3953  
    55 * ======================================================================
    66 *  AUTHOR:  Derrick Kearney, Purdue University
    7  *  Copyright (c) 2004-2007  Purdue Research Foundation
     7 *  Copyright (c) 2004-2012  HUBzero Foundation, LLC
    88 *
    99 *  See the file "license.terms" for information on usage and
  • branches/blt4/src/core/RpLibraryFStubs.h

    r2544 r3953  
    55 * ======================================================================
    66 *  AUTHOR:  Derrick Kearney, Purdue University
    7  *  Copyright (c) 2004-2007  Purdue Research Foundation
     7 *  Copyright (c) 2004-2012  HUBzero Foundation, LLC
    88 *
    99 *  See the file "license.terms" for information on usage and
  • branches/blt4/src/core/RpOutcome.cc

    r2544 r3953  
    44 *
    55 *  AUTHOR:  Michael McLennan, Purdue University
    6  *  Copyright (c) 2004-2007  Purdue Research Foundation
     6 *  Copyright (c) 2004-2012  HUBzero Foundation, LLC
    77 * ----------------------------------------------------------------------
    88 *  See the file "license.terms" for information on usage and
  • branches/blt4/src/core/RpOutcome.h

    r1366 r3953  
    44 *
    55 *  AUTHOR:  Michael McLennan, Purdue University
    6  *  Copyright (c) 2004-2007  Purdue Research Foundation
     6 *  Copyright (c) 2004-2012  HUBzero Foundation, LLC
    77 * ----------------------------------------------------------------------
    88 *  See the file "license.terms" for information on usage and
  • branches/blt4/src/core/RpOutcomeCHelper.h

    r1018 r3953  
    55 * ======================================================================
    66 *  AUTHOR:  Derrick Kearney, Purdue University
    7  *  Copyright (c) 2004-2007  Purdue Research Foundation
     7 *  Copyright (c) 2004-2012  HUBzero Foundation, LLC
    88 *
    99 *  See the file "license.terms" for information on usage and
  • branches/blt4/src/core/RpOutcomeCInterface.cc

    r1074 r3953  
    55 * ======================================================================
    66 *  AUTHOR:  Derrick Kearney, Purdue University
    7  *  Copyright (c) 2004-2007  Purdue Research Foundation
     7 *  Copyright (c) 2004-2012  HUBzero Foundation, LLC
    88 *
    99 *  See the file "license.terms" for information on usage and
  • branches/blt4/src/core/RpOutcomeCInterface.h

    r1018 r3953  
    55 * ======================================================================
    66 *  AUTHOR:  Derrick Kearney, Purdue University
    7  *  Copyright (c) 2004-2007  Purdue Research Foundation
     7 *  Copyright (c) 2004-2012  HUBzero Foundation, LLC
    88 *
    99 *  See the file "license.terms" for information on usage and
  • branches/blt4/src/core/RpPtr.cc

    r1328 r3953  
    44 *
    55 *  AUTHOR:  Michael McLennan, Purdue University
    6  *  Copyright (c) 2004-2006  Purdue Research Foundation
     6 *  Copyright (c) 2004-2012  HUBzero Foundation, LLC
    77 * ----------------------------------------------------------------------
    88 *  See the file "license.terms" for information on usage and
  • branches/blt4/src/core/RpPtr.h

    r1031 r3953  
    44 *
    55 *  AUTHOR:  Michael McLennan, Purdue University
    6  *  Copyright (c) 2004-2006  Purdue Research Foundation
     6 *  Copyright (c) 2004-2012  HUBzero Foundation, LLC
    77 * ----------------------------------------------------------------------
    88 *  See the file "license.terms" for information on usage and
  • branches/blt4/src/core/RpResult.cc

    r1382 r3953  
    99 * ======================================================================
    1010 *  AUTHOR:  Michael McLennan, Purdue University
    11  *  Copyright (c) 2004-2005  Purdue Research Foundation
     11 *  Copyright (c) 2004-2012  HUBzero Foundation, LLC
    1212 *
    1313 *  See the file "license.terms" for information on usage and
  • branches/blt4/src/core/RpSimpleBuffer.h

    r2544 r3953  
    66 *  AUTHOR:  Derrick Kearney, Purdue University
    77 *
    8  *  Copyright (c) 2004-2008  Purdue Research Foundation
     8 *  Copyright (c) 2004-2012  HUBzero Foundation, LLC
    99 * ----------------------------------------------------------------------
    1010 *  See the file "license.terms" for information on usage and
     
    4949 *  GOVERNMENT USE: If you are acquiring this software on behalf of the
    5050 *  U.S. government, the Government shall have only "Restricted Rights"
    51  *  in the software and related documentation as defined in the Federal·
     51 *  in the software and related documentation as defined in the Federal
    5252 *  Acquisition Regulations (FARs) in Clause 52.227.19 (c) (2).  If you
    5353 *  are acquiring the software on behalf of the Department of Defense, the
     
    5757 *  authors grant the U.S. Government and others acting in its behalf
    5858 *  permission to use and distribute the software in accordance with the
    59  *  terms specified in this license.·
     59 *  terms specified in this license.
    6060 *
    6161 * ======================================================================
     
    245245        return;
    246246    }
    247     _numElemsUsed = numElems;
    248247}
    249248
     
    644643
    645644    while (curMemb != _numElemsUsed) {
    646         fprintf(stdout,"_buf[%lu] = :%#x:\n", (long unsigned int)curMemb,
     645        fprintf(stdout,"_buf[%lu] = :%#lx:\n", (long unsigned int)curMemb,
    647646                (unsigned long)_buf[curMemb]);
    648647        curMemb += 1;
  • branches/blt4/src/core/RpUnits.cc

    r1824 r3953  
    77 * ======================================================================
    88 *  AUTHOR:  Derrick Kearney, Purdue University
    9  *  Copyright (c) 2004-2007  Purdue Research Foundation
     9 *  Copyright (c) 2004-2012  HUBzero Foundation, LLC
    1010 *
    1111 *  See the file "license.terms" for information on usage and
     
    13351335    std::string type = "";     // junk var used because units2list requires it
    13361336    std::string retStr = "";
    1337     double origNumVal = 0;
    13381337    double numVal = 0;
    13391338    double toExp = 0;
     
    13651364
    13661365    convErr = unitSlice(val,fromUnitsName,numVal);
    1367     origNumVal = numVal;
    13681366
    13691367    if (convErr != 0) {
     
    27002698    // RpUnits* cubic_meter  = RpUnits::define("m3", NULL, RP_TYPE_VOLUME);
    27012699    // RpUnits* cubic_feet   = RpUnits::define("ft3", NULL, RP_TYPE_VOLUME);
    2702     RpUnits* us_gallon    = NULL;
    2703     RpUnits* liter        = NULL;
    2704 
    2705     us_gallon    = RpUnits::define("gal", NULL, RP_TYPE_VOLUME);
    2706     liter        = RpUnits::define("L", NULL, RP_TYPE_VOLUME, RPUNITS_METRIC);
     2700    // RpUnits* us_gallon    = NULL;
     2701    // RpUnits* liter        = NULL;
     2702
     2703    RpUnits::define("gal", NULL, RP_TYPE_VOLUME);
     2704    RpUnits::define("L", NULL, RP_TYPE_VOLUME, RPUNITS_METRIC);
    27072705
    27082706    /*
     
    27852783RpUnitsPreset::addPresetMass () {
    27862784
    2787     RpUnits* gram  = NULL;
    2788 
    2789     gram  = RpUnits::define("g", NULL, RP_TYPE_MASS, RPUNITS_METRIC,!RPUNITS_CASE_INSENSITIVE);
     2785    RpUnits::define("g", NULL, RP_TYPE_MASS, RPUNITS_METRIC,!RPUNITS_CASE_INSENSITIVE);
    27902786
    27912787    return 0;
     
    28872883RpUnitsPreset::addPresetForce () {
    28882884
    2889     RpUnits* newton = NULL;
    2890 
    2891     newton = RpUnits::define("N",  NULL, RP_TYPE_FORCE, RPUNITS_METRIC);
     2885    RpUnits::define("N",  NULL, RP_TYPE_FORCE, RPUNITS_METRIC);
    28922886
    28932887    return 0;
     
    29372931/**
    29382932 * Defines the following units:
     2933 *   volt  (V)
    29392934 *   mole  (mol)
    2940  *
     2935 *   hertz (Hz)
     2936 *   becquerel (Bq)
     2937 *   amu
     2938 *   bel (B)
     2939 *   amp
     2940 *   ohm
    29412941 * Return codes: 0 success, anything else is error
    29422942 */
     
    29452945RpUnitsPreset::addPresetMisc () {
    29462946
    2947     RpUnits* volt      = NULL;
    2948     RpUnits* mole      = NULL;
    2949     RpUnits* hertz     = NULL;
    2950     RpUnits* becquerel = NULL;
    2951     RpUnits* amu       = NULL;
    2952     RpUnits* bel       = NULL;
    2953     RpUnits* amp       = NULL;
    2954     RpUnits* ohm       = NULL;
    2955 
    2956     volt      = RpUnits::define("V",  NULL, RP_TYPE_EPOT, RPUNITS_METRIC);
    2957     mole      = RpUnits::define("mol",NULL, "quantity", RPUNITS_METRIC);
    2958     hertz     = RpUnits::define("Hz", NULL, "frequency", RPUNITS_METRIC);
    2959     becquerel = RpUnits::define("Bq", NULL, "radioactivity", RPUNITS_METRIC);
    2960     amu       = RpUnits::define("amu", NULL, "mass_unit", !RPUNITS_METRIC);
    2961     bel       = RpUnits::define("B", NULL, "audio_transmission", RPUNITS_METRIC);
    2962     amp       = RpUnits::define("amp", NULL, "electric_current", RPUNITS_METRIC);
    2963     ohm       = RpUnits::define("ohm", NULL, "electric_resistance", RPUNITS_METRIC);
     2947    RpUnits::define("V",  NULL, RP_TYPE_EPOT, RPUNITS_METRIC);
     2948    RpUnits::define("mol",NULL, "quantity", RPUNITS_METRIC);
     2949    RpUnits::define("Hz", NULL, "frequency", RPUNITS_METRIC);
     2950    RpUnits::define("Bq", NULL, "radioactivity", RPUNITS_METRIC);
     2951    RpUnits::define("amu", NULL, "mass_unit", !RPUNITS_METRIC);
     2952    RpUnits::define("B", NULL, "audio_transmission", RPUNITS_METRIC);
     2953    RpUnits::define("amp", NULL, "electric_current", RPUNITS_METRIC);
     2954    RpUnits::define("ohm", NULL, "electric_resistance", RPUNITS_METRIC);
    29642955
    29652956    // RpUnits* percent   = RpUnits::define("%",  NULL, RP_TYPE_MISC);
     
    29812972RpUnitsPreset::addPresetPower () {
    29822973
    2983     RpUnits* watt      = NULL;
    2984 
    29852974    // watts are derived units = J/s = kg*m2/s3 = Newton*m/s and Amps*Volt
    2986     watt      = RpUnits::define("W",  NULL, RP_TYPE_POWER, RPUNITS_METRIC);
     2975    RpUnits::define("W",  NULL, RP_TYPE_POWER, RPUNITS_METRIC);
    29872976
    29882977    return 0;
  • branches/blt4/src/core/RpUnits.h

    • Property svn:executable deleted
    r1527 r3953  
    77 * ======================================================================
    88 *  AUTHOR:  Derrick Kearney, Purdue University
    9  *  Copyright (c) 2004-2007  Purdue Research Foundation
     9 *  Copyright (c) 2004-2012  HUBzero Foundation, LLC
    1010 *
    1111 *  See the file "license.terms" for information on usage and
  • branches/blt4/src/core/RpUnitsCInterface.cc

    r1581 r3953  
    55 * ======================================================================
    66 *  AUTHOR:  Derrick Kearney, Purdue University
    7  *  Copyright (c) 2004-2005  Purdue Research Foundation
     7 *  Copyright (c) 2004-2012  HUBzero Foundation, LLC
    88 *
    99 *  See the file "license.terms" for information on usage and
  • branches/blt4/src/core/RpUnitsCInterface.h

    r1018 r3953  
    55 * ======================================================================
    66 *  AUTHOR:  Derrick Kearney, Purdue University
    7  *  Copyright (c) 2004-2005  Purdue Research Foundation
     7 *  Copyright (c) 2004-2012  HUBzero Foundation, LLC
    88 *
    99 *  See the file "license.terms" for information on usage and
  • branches/blt4/src/core/RpUnitsFInterface.cc

    r1024 r3953  
    55 * ======================================================================
    66 *  AUTHOR:  Derrick Kearney, Purdue University
    7  *  Copyright (c) 2004-2005  Purdue Research Foundation
     7 *  Copyright (c) 2004-2012  HUBzero Foundation, LLC
    88 *
    99 *  See the file "license.terms" for information on usage and
  • branches/blt4/src/core/RpUnitsFInterface.h

    r1018 r3953  
    55 * ======================================================================
    66 *  AUTHOR:  Derrick Kearney, Purdue University
    7  *  Copyright (c) 2004-2005  Purdue Research Foundation
     7 *  Copyright (c) 2004-2012  HUBzero Foundation, LLC
    88 *
    99 *  See the file "license.terms" for information on usage and
  • branches/blt4/src/core/RpUnitsFStubs.c

    r1018 r3953  
    55 * ======================================================================
    66 *  AUTHOR:  Derrick Kearney, Purdue University
    7  *  Copyright (c) 2004-2005  Purdue Research Foundation
     7 *  Copyright (c) 2004-2012  HUBzero Foundation, LLC
    88 *
    99 *  See the file "license.terms" for information on usage and
  • branches/blt4/src/core/RpUnitsFStubs.h

    r1018 r3953  
    55 * ======================================================================
    66 *  AUTHOR:  Derrick Kearney, Purdue University
    7  *  Copyright (c) 2004-2005  Purdue Research Foundation
     7 *  Copyright (c) 2004-2012  HUBzero Foundation, LLC
    88 *
    99 *  See the file "license.terms" for information on usage and
  • branches/blt4/src/core/RpUnitsStd.cc

    r1427 r3953  
    11/*
    22 * ======================================================================
    3  *  Copyright (c) 2004-2005  Purdue Research Foundation
     3 *  Copyright (c) 2004-2012  HUBzero Foundation, LLC
    44 *
    55 *  See the file "license.terms" for information on usage and
  • branches/blt4/src/core/RpUnitsStd.h

    r1427 r3953  
    11/*
    22 * ======================================================================
    3  *  Copyright (c) 2004-2005  Purdue Research Foundation
     3 *  Copyright (c) 2004-2012  HUBzero Foundation, LLC
    44 *
    55 *  See the file "license.terms" for information on usage and
  • branches/blt4/src/core/RpUtils.cc

    r1090 r3953  
    55 *  AUTHOR:  Derrick Kearney, Purdue University
    66 *
    7  *  Copyright (c) 2004-2007  Purdue Research Foundation
     7 *  Copyright (c) 2004-2012  HUBzero Foundation, LLC
    88 * ----------------------------------------------------------------------
    99 *  See the file "license.terms" for information on usage and
  • branches/blt4/src/core/RpUtils.h

    r665 r3953  
    55 *  AUTHOR:  Derrick Kearney, Purdue University
    66 *
    7  *  Copyright (c) 2004-2007  Purdue Research Foundation
     7 *  Copyright (c) 2004-2012  HUBzero Foundation, LLC
    88 * ----------------------------------------------------------------------
    99 *  See the file "license.terms" for information on usage and
  • branches/blt4/src/core/RpUtilsCInterface.cc

    r1018 r3953  
    55 * ======================================================================
    66 *  AUTHOR:  Derrick Kearney, Purdue University
    7  *  Copyright (c) 2004-2007  Purdue Research Foundation
     7 *  Copyright (c) 2004-2012  HUBzero Foundation, LLC
    88 *
    99 *  See the file "license.terms" for information on usage and
  • branches/blt4/src/core/RpUtilsCInterface.h

    r1018 r3953  
    55 * ======================================================================
    66 *  AUTHOR:  Derrick Kearney, Purdue University
    7  *  Copyright (c) 2004-2007  Purdue Research Foundation
     7 *  Copyright (c) 2004-2012  HUBzero Foundation, LLC
    88 *
    99 *  See the file "license.terms" for information on usage and
  • branches/blt4/src/core/RpUtilsFInterface.cc

    r1105 r3953  
    55 * ======================================================================
    66 *  AUTHOR:  Derrick Kearney, Purdue University
    7  *  Copyright (c) 2004-2007  Purdue Research Foundation
     7 *  Copyright (c) 2004-2012  HUBzero Foundation, LLC
    88 *
    99 *  See the file "license.terms" for information on usage and
  • branches/blt4/src/core/RpUtilsFInterface.h

    r1018 r3953  
    55 * ======================================================================
    66 *  AUTHOR:  Derrick S. Kearney, Purdue University
    7  *  Copyright (c) 2004-2007  Purdue Research Foundation
     7 *  Copyright (c) 2004-2012  HUBzero Foundation, LLC
    88 *
    99 *  See the file "license.terms" for information on usage and
  • branches/blt4/src/core/RpUtilsFStubs.c

    r1018 r3953  
    55 * ======================================================================
    66 *  AUTHOR:  Derrick Kearney, Purdue University
    7  *  Copyright (c) 2004-2007  Purdue Research Foundation
     7 *  Copyright (c) 2004-2012  HUBzero Foundation, LLC
    88 *
    99 *  See the file "license.terms" for information on usage and
  • branches/blt4/src/core/RpUtilsFStubs.h

    r1018 r3953  
    55 * ======================================================================
    66 *  AUTHOR:  Derrick Kearney, Purdue University
    7  *  Copyright (c) 2004-2007  Purdue Research Foundation
     7 *  Copyright (c) 2004-2012  HUBzero Foundation, LLC
    88 *
    99 *  See the file "license.terms" for information on usage and
  • branches/blt4/src/core/config.h.in

    r2936 r3953  
    7070#undef HAVE_CTYPE_H
    7171
     72/* Define to 1 if you have the <env.h> header file. */
     73#undef HAVE_ENV_H
     74
    7275/* Define to 1 if you have the <errno.h> header file. */
    7376#undef HAVE_ERRNO_H
    7477
     78/* Render servers can use ffmpeg */
     79#undef HAVE_FFMPEG
     80
    7581/* Define to 1 if you have the <ffmpeg/avcodec.h> header file. */
    7682#undef HAVE_FFMPEG_AVCODEC_H
     
    9197#undef HAVE_FSTREAM
    9298
     99/* Define to 1 if you have the `gettimeofday' function. */
     100#undef HAVE_GETTIMEOFDAY
     101
    93102/* Define to 1 if you have the `img_convert' function. */
    94103#undef HAVE_IMG_CONVERT
     
    121130#undef HAVE_LIBAVUTIL_AVUTIL_H
    122131
    123 /* Define to 1 if you have the `m' library (-lm). */
    124 #undef HAVE_LIBM
     132/* Define to 1 if you have the <libavutil/mathematics.h> header file. */
     133#undef HAVE_LIBAVUTIL_MATHEMATICS_H
    125134
    126135/* Define to 1 if you have the `ncurses' library (-lncurses). */
     
    154163#undef HAVE_NCURSES_H
    155164
     165/* Define to 1 if you have the <node.h> header file. */
     166#undef HAVE_NODE_H
     167
    156168/* Define to 1 if you have the <Python.h> header file. */
    157169#undef HAVE_PYTHON_H
    158170
     171/* Define to 1 if you have the <ruby.h> header file. */
     172#undef HAVE_RUBY_H
     173
     174/* Define to 1 if you have the <ruby/node.h> header file. */
     175#undef HAVE_RUBY_NODE_H
     176
    159177/* Define to 1 if you have the <sstream> header file. */
    160178#undef HAVE_SSTREAM
     
    208226#undef HAVE_VECTOR
    209227
     228/* Define to 1 if you have the <version.h> header file. */
     229#undef HAVE_VERSION_H
     230
    210231/* Define to the address where bug reports for this package should be sent. */
    211232#undef PACKAGE_BUGREPORT
     
    220241#undef PACKAGE_TARNAME
    221242
    222 /* Define to the home page for this package. */
    223 #undef PACKAGE_URL
    224 
    225243/* Define to the version of this package. */
    226244#undef PACKAGE_VERSION
     245
     246/* Define this macro to use ruby/node.h */
     247#undef REALLY_HAVE_RUBY_NODE_H
    227248
    228249/* The size of `int', as computed by sizeof. */
  • branches/blt4/src/core/rappture.h

    r656 r3953  
    11/*
    22 * ======================================================================
    3  *  Copyright (c) 2004-2005  Purdue Research Foundation
     3 *  Copyright (c) 2004-2012  HUBzero Foundation, LLC
    44 *
    55 *  See the file "license.terms" for information on usage and
  • branches/blt4/src/core/rappture_fortran.c

    r1018 r3953  
    11/*
    22 * ======================================================================
    3  *  Copyright (c) 2004-2005  Purdue Research Foundation
     3 *  Copyright (c) 2004-2012  HUBzero Foundation, LLC
    44 *
    55 *  See the file "license.terms" for information on usage and
  • branches/blt4/src/core/scew/scew_extras.c

    r1018 r3953  
    55 * ======================================================================
    66 *  AUTHOR:  Derrick Kearney, Purdue University
    7  *  Copyright (c) 2004-2005  Purdue Research Foundation
     7 *  Copyright (c) 2004-2012  HUBzero Foundation, LLC
    88 *
    99 *  See the file "license.terms" for information on usage and
  • branches/blt4/src/core/scew/scew_extras.h

    r1018 r3953  
    11/*
    22 * ======================================================================
    3  *  Copyright (c) 2004-2005  Purdue Research Foundation
     3 *  Copyright (c) 2004-2012  HUBzero Foundation, LLC
    44 *
    55 *  See the file "license.terms" for information on usage and
  • branches/blt4/src/core/scew_extras.c

    r1824 r3953  
    55 * ======================================================================
    66 *  AUTHOR:  Derrick Kearney, Purdue University
    7  *  Copyright (c) 2004-2005  Purdue Research Foundation
     7 *  Copyright (c) 2004-2012  HUBzero Foundation, LLC
    88 *
    99 *  See the file "license.terms" for information on usage and
  • branches/blt4/src/core/scew_extras.h

    r583 r3953  
    11/*
    22 * ======================================================================
    3  *  Copyright (c) 2004-2005  Purdue Research Foundation
     3 *  Copyright (c) 2004-2012  HUBzero Foundation, LLC
    44 *
    55 *  See the file "license.terms" for information on usage and
Note: See TracChangeset for help on using the changeset viewer.