Commit Graph

488 Commits

Author SHA1 Message Date
Alex Lin
3a7e756926 Unit test directories do not support gtest libs in lib64
Added library search dirs ${GTEST_HOME}/lib64 and ${GTEST_HOME}/lib
to the link line.

refs #264
2016-07-01 11:50:06 -05:00
Alex Lin
48ad85d0af Some Trick jobs are labeled "simobject.classPtr->Foo()" trick_dp barfs on the "->" string
The "->" string interferes with some code in quick plot trying to split array ranges into
individual variables.  The old code only tested for the '-' character.  Changed these
checks to regular expressions that only match '-' if it is not followed by '>'.  Also
converted tabs to spaces throughout the file, hence the big diff.

refs #51
2016-06-30 15:35:23 -05:00
Alex Lin
595feb280b Convert old units to udunits in test code
Found a couple more units to convert.

refs #261
2016-06-30 11:24:18 -05:00
Alex Lin
35cec634e5 Convert old units to udunits in test code
Changed all of the old units to the new udunit strings.

refs #261
2016-06-30 10:03:39 -05:00
Alex Lin
adfecdef11 Search for some optional packages in configure script.
Side effect of GSL included by default is that the monte carlo
test code needs to know that.  The test code did not include the HAVE_GSL
flag correctly, causing the tests to fail.  Fixed it.

refs #260
2016-06-30 09:59:09 -05:00
Alex Lin
bc9fdb1b71 Search for some optional packages in configure script.
The configure script will check in the standard directories for
HDF5, GSL, and gtest.  The user can skip this automatic check by
adding --without-<feature> while running the configure script.

refs #260
2016-06-29 17:37:45 -05:00
Alex Lin
1731390c98 Switch compilation of ICG from clang++ to g++
Removed the lines that set the compiler to clang++, defaulting
it to g++.  Added lines in the makefile to set __clang_major__,
__clang_minor__, and __clang_patchlevel__.  These are required
to compile several of the files in the ICG directory.

refs #259
2016-06-29 17:33:04 -05:00
Alex Lin
4ab584ed55 Support using Python 3
Fixed the configure script to allow the user to specify using a python3
interpreter.  Had to change the the way to load the swig generated python modules.
Also had to change code dealing with python strings, oct, long, and
boolean operations.

refs #258
2016-06-28 13:44:21 -05:00
Alex Lin
268d3407df Set and use LD in our makefiles correctly.
Changed TRICK_LD to TRICK_CPPC in the unit test makefiles.  It
should be TRICK_CPPC on these lines.

refs #131
2016-06-28 08:58:33 -05:00
Alex Lin
1224c43e7f Set and use LD in our makefiles correctly.
Set LD in our makefiles to the ld executable found by configure.
Changed the final sim link to use TRICK_CPPC as the link command since
it was using the compiler anyways.  Changed the places where we use "ld" to
use LD.

refs #131
2016-06-27 12:48:35 -05:00
Derek Bankieris
68a25a74ae refs #257 Ignore -psn_* arguments 2016-06-27 12:46:23 -05:00
Alex Lin
6f20aa4b8b Save X11 include and library information from configure
Saved the value of x_libraries variable from the autoconf AC_PATH_X if
the location is not standard.

refs #133
2016-06-27 09:50:04 -05:00
Alex Lin
8921811f7e When running a monte carlo set, don't delete the log files in the master run directory.
Moved the job that removes log files from a default data to a phase 1 initialization
job.  Initialization jobs are not run in the master sim if the sim is a monte carlo
run, so the data is not deleted.

refs #35
2016-06-24 17:20:13 -05:00
Alex Lin
9bcee57b6a S_define_exp needs a list of dependencies
I made S_define_exp a PHONY target in the makefile so it is always
regenerated.  It's fast to regenerate, so I'm taking the easy way
out. :D

refs #138
2016-06-24 15:59:50 -05:00
Alex Lin
9ae65f84b2 configure script needs to test for g++ 4.8 and above.
Added a check to test the version of g++ in the configure script.
Also did a "which" command to save the full path of the CC and CXX
commands.  This will ensure that the same CC and CXX executables
are run no matter how the environment changes.

refs #255
2016-06-23 09:07:59 -05:00
Alex Lin
0514612039 Output "--" if that was specified in the header file.
Copy and paste error in TrickHDF5.cpp, used wrong variable name.

refs #254
2016-06-23 09:07:59 -05:00
Derek Bankieris
14d4c94b2e refs #256 Pass -Djava.net.preferIPv4Stack=true when launching Java GUIs to eliminate socket error. 2016-06-22 12:33:29 -05:00
Alex Lin
bfdc491fe3 Output "--" if that was specified in the header file.
Unit tests failed sometimes.  Found that an attributes structure for time
in the data recording class was unintialized.  This led to the mods
field to have random data, and sometimes triggering sys.exec.out.time
to be assigned no units.  Fixed it by zeroing out the structure.

refs #254
2016-06-21 17:02:32 -05:00
Alex Lin
fcb63e0e06 Output "--" if that was specified in the header file.
Used the mods field in the attributes to indicate of "--" was specified in the header file.  We
still save the units as "1" to keep it compatible with udunits.  When outputting the variable
in data recording or variable server we check to see if the mods field for "--" is set.  We
output "--" if the mods field is set.  Also allowed "--" to persist in data products.

refs #254
2016-06-21 16:12:28 -05:00
Alex Lin
d9f1780939 exec_get_current_version returns string out of scope
Changed Trick::Executive::get_current_version to return a const reference
to the string that holds the version.  This avoids a copy of the string object
and avoids that object going out of scope.  As a string, the debug_command
had the same problem so I fixed that one as well.

refs #252
2016-06-21 16:03:15 -05:00
Alex Lin
75fb095960 er7_util header files not being installed
Checked in makefile with debug statement overriding the install prefix. :(

refs #246
2016-06-20 14:05:56 -05:00
Alex Lin
c9e3bc77da er7_util header files not being installed
Added a makefile install rule to copy the header files out of
er7_utils to the install directory.  Adjusted ICG to ignore
Trick header files if they are installed.

refs #246
2016-06-20 13:40:45 -05:00
Alex Lin
11fb71f036 man pages completely out of date
First step to updating man pages, renaming pages to match executable name and deleting man pages for commands long gone.

refs #253
2016-06-20 11:22:45 -05:00
Alex Lin
fb4601734f Need to include SimTime.hh for ICG and swig processing.
Added the sim time header files to files_to_ICG.hh and sim_services.i so it will be processed.

refs #247
2016-06-15 16:11:09 -05:00
Alex Lin
237230dc53 Have ICG ignore Fink Dirs (in /sw) on Macs
The UDUNITS_LDFLAGS contents need to be in quotes.  Found this while
trying to use the udunits package in /sw with Fink.

refs #248
2016-06-13 10:37:30 -05:00
John M. Penn
7ae371c72e Include stddef.h in integrator_c_intf.h. Refs #249 2016-06-10 15:46:10 -05:00
John M. Penn
af8548ce6a Exclude /sw (Fink directories from being processed by ICG. Refs#248 2016-06-10 14:52:19 -05:00
Alex Lin
0f7a396db1 Build fails on Ubuntu 16.04
The recently introduced configure time test fails to run on RedHat 6 machines.

refs #174
2016-06-02 10:18:29 -05:00
Alex Lin
149e01a4c9 Fix warnings in cannon sims
Fixed a lot of warnings about missing prototypes and unused variables.

refs #245
2016-06-02 09:37:42 -05:00
Alex Lin
5966c61add Build fails on Ubuntu 16.04
Created a configure time test to see if clang will compile ICG correctly.
If the compilation fails, an error message telling the user to go download
clang/llvm from llvm.org is show.

refs #174
2016-06-02 08:52:00 -05:00
Alex Lin
1615e0f13b ICG should ignore FILE * variables
In ICG if we encounter a FILE * variable, we ignore it setting the IO specification to 0.

refs #244
2016-06-02 08:50:18 -05:00
John M. Penn
54039b0084 Update main README.md 2016-05-26 18:57:25 -05:00
John M. Penn
83fd363eb7 Update picture in the SIM_sun README file. REF: #242 2016-05-26 18:37:23 -05:00
John M. Penn
5b53f8155a Delete these tutorial files because they are going into the wiki rather than here. Ref #241 2016-05-25 17:06:33 -05:00
John M. Penn
323ea2a40a First four sections of rewritten tutorial. Refs #241 2016-05-25 15:58:06 -05:00
Alex Lin
3e82f79f28 Use udunits package for units conversions.
FieldDescription.cpp is missing and include for stack.  Strange it compiles
on most platforms.

refs #231
2016-05-18 08:26:14 -05:00
Alex Lin
82d950bb9a Use udunits package for units conversions
Changed the java GUIs to use udunit symbol names

refs #231
2016-05-17 10:58:08 -05:00
Alex Lin
8a9497a9bc Use udunits package for units conversions
removed udunits.h from makefile dependencies

refs #231
2016-05-17 09:55:12 -05:00
Alex Lin
a95e8e086b Use udunits package for units conversions
Copied the units_conv.c from 15 that includes the new units to master.

Swept through the code removing includes to Unit.hh and UCF.h where they
are no longer needed.  Remade makefile dependencies.

refs #231
2016-05-17 09:01:37 -05:00
Alex Lin
7e218a0472 Use udunits package for units conversions
Change the Variable Server to use udunits.

refs #231
2016-05-16 17:14:50 -05:00
Alex Lin
9d3a51625f Allow --with-gtest argument with no directory
Added the option to not provide a directory name when using
--with-gtest

refs #237
2016-05-12 14:42:23 -05:00
Alex Lin
f19c002365 ./configure needs to properly enforce java version dependency
Really strange, all of the python flags changed.  Must have been
using an old autoconf cache for a long time.

refs #234
2016-05-12 09:31:05 -05:00
Alex Lin
83e299f618 ./configure needs to properly enforce java version dependency
Somewhere along the way the configure variable PYTHON_LDFLAGS changed
to PYTHON_LIBS.

refs #234
2016-05-12 09:27:17 -05:00
Alex Lin
7dc034315f ./configure needs to properly enforce java version dependency
Had to change the redirect syntax on the mac.

refs #234
2016-05-12 08:55:59 -05:00
Alex Lin
c9b8992fc1 ./configure needs to properly enforce java version dependency
Added a javac version check >= 1.8 to configure.

refs #234
2016-05-12 08:50:42 -05:00
Alex Lin
ee8f07469e Use udunits package for units conversions
Changed the files in our math utilities to use the udunits symbols

refs #231
2016-05-11 16:20:44 -05:00
Alex Lin
384519ce24 Use udunits package for units conversions
PyFrame_GetLineNumber is not present in python 2.6.  We have
to use PyCode_Addr2Line instead to get the line number.

refs #231
2016-05-11 15:14:19 -05:00
Alex Lin
929372e863 Use udunits package for units conversions
Created a UDUNITS_LDFLAGS to store an link library path and -luduints2.

refs #231
2016-05-11 14:43:53 -05:00
Alex Lin
01fd86a513 Use udunits package for units conversions
Needed to add UDUNITS_INCLUDES to the ICG makefile and remove
the hardcoded udunits include path

refs #231
2016-05-11 11:27:39 -05:00
Alex Lin
d7569bf9f2 Use udunits package for units conversions
Some individual tests in SIM_test_ip were still failing because the conversion
between lb and kg has a different number of digits now.

refs #231
2016-05-11 10:56:33 -05:00