Commit 07141c68 authored by adelmann's avatar adelmann 🎗
Browse files

cleanup

parent b879f8b1
* text=auto !eol
/CMakeLists.txt -text
/Doxyfile -text
ENV/Generic-Linux.bash -text
ENV/Jacquard-Linux.bash -text
ENV/Maxwell-Linux.bash -text
ENV/Slsbd7-Linux.bash -text
ENV/XT3-Cray.bash -text
ENV/merlin3-Linux.bash -text
/INSTALL -text
/LICENSE -text
/README -text
......
# HDF5 ---------------------------------------------------------------------
export H5HOME=~/svnwork/hdf5inst
# end HDF5 -----------------------------------------------------------------
# IPL ----------------------------------------------------------------------
export IPL_ARCH=LINUX
export IPL_ROOT=~/svnwork/ipl
# EXPDE end ----------------------------------------------------------------
# GenTrackE start ----------------------------------------------------------
export GTHOME=~/svnwork/gte
export GTCLASSIC=~/svnwork/classic/3.3/src
# GenTrackE end ------------------------------------------------------------
# CMEE start ---------------------------------------------------------------
export CMEEHOME=~/svnwork/cmee-1.1
export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$CMEEHOME/src/.libs
# CMEE end -----------------------------------------------------------------
export CXX=$HOME/mpich/bin/mpicxx
export CC=$HOME/mpich/bin/mpicc
export F77=$HOME/mpich/bin/mpif77
export MYMPIRUN=$HOME/mpich/bin/mpirun
export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/dshome/adelmann/svnwork/hdf5inst/lib
# HDF5 ---------------------------------------------------------------------
export H5HOME=/usr/common/usg/hdf5/1.6.3/parallel
# end HDF5 -----------------------------------------------------------------
# IPL ----------------------------------------------------------------------
export IPL_ARCH=LINUX
export IPL_ROOT=~/svnwork/ipl
# EXPDE end ----------------------------------------------------------------
# GenTrackE start ----------------------------------------------------------
export GTHOME=~/svnwork/gte
export GTCLASSIC=~/svnwork/classic/3.3/src
# GenTrackE end ------------------------------------------------------------
export CXX=mpicxx
export CC=mpicc
export F77=mpif77
export MYMPIRUN=mpiexec
export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/common/homes/a/adelmann/svnwork/gsl/lib
# IPPL ----------------------------------------------------------------------
export IPPL_ARCH=LINUX
export IPPL_ROOT=/home/adelmann/svnwork/ippl
# EXPDE end ----------------------------------------------------------------
export CXX=mpic++
export CC=mpicc
export F77=mpif77
export MYMPIRUN=mpirun
export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$H5HOME/install/lib
source /home/adelmann/svnwork/femaXX/install_3pl/config_maxwell
export FEMAXX_PREFIX=/home/adelmann/svnwork/femaXX
# IPPL ----------------------------------------------------------------------
export IPPL_ARCH=LINUX-SER
export IPPL_ROOT=~/svnwork/ippl
# EXPDE end ----------------------------------------------------------------
export CXX=g++ #$HOME/install/mpich/bin/mpicxx
export CC=gcc #$HOME/install/mpich/bin/mpicc
export F77=g77 #$HOME/install/mpich/bin/mpif77
#export CXX=$HOME/install/mpich/bin/mpicxx
#export CC=$HOME/install/mpich/bin/mpicc
#export F77=$HOME/install/mpich/bin/mpif77
export MYMPIRUN=mpirun
export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$H5HOME/install/lib
# IPPL ----------------------------------------------------------------------
export IPPL_ARCH=XT3
export IPPL_ROOT=~/svnwork/ippl
# EXPDE end ----------------------------------------------------------------
module load craypat
module load gcc-catamount
module load pgi/6.0.5
module load xt-lustre-ss
export MPICH_CXX=~roberto/CSCS/MAD9P_GNU/qk-g++
export CXX=CC
export CPP=cc
export F77=ftn
export MYMPIRUN=yod
#export IOBUF_PARAMS='%stdout,dataH5.dat'
#export IOBUF_PARAMS='*:verbose'
#export IOBUF_VERBOSE=1
# IPPL ----------------------------------------------------------------------
export IPPL_ARCH=LINUX
export IPPL_ROOT=~adelmann/svnwork/ippl
# EXPDE end ----------------------------------------------------------------
export CXX=mpicxx
export CC=mpicc
export F77=mpif77
export MYMPIRUN=mpirun
export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$H5HOME/install/lib
......@@ -6,40 +6,6 @@
#
###########################################################################
<install instructions>
0) NEED H5Part installed, check http://amas.web.psi.ch/
1) Check if in ./ENV a setup script for your architecture/machine exists
1.1) if YES execoute the script
source ENV/merlin3-Linux.bash
1.2) if NO set the following environment variables:
# IPPL ----------------------------------------------------------------------
export IPPL_ARCH=LINUX
export IPPL_ROOT=~/svnwork/ippl
# IPPL end ----------------------------------------------------------------
export CXX=mpicxx
export CC=mpicc
export F77=mpif77
export MYMPIRUN=mpirun
export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$H5HOME/install/lib
2) Generate configure and finally make ippl
Change --libdir accordingly
cd src
mkdir -p con
aclocal
autoconf
automake -a -c
make clean
./configure --with-ippl-linuxgcc --libdir=/home2/adelmann/svnwork/ippl/lib/LINUX CC=mpicc CXX=mpicxx F77=mpif77 --no-create --no-recursion
/***************************************************************************
......
......@@ -2,125 +2,18 @@
#
# The IPPL Framework
#
# Visit http://people.web.psi.ch/adelmann/ for more details
# Visit http://amas.web.psi.ch for more details.
#
###########################################################################
This is the main directory for version 1.0 of the IPPL FrameWork.
The FrameWork makes heavy use of template, so, although it is
necessary to first form libippl.a with the Makefile produced by the
configuration script, template instantiations are made mostly during
the building of your actual application. We are currently working on
mechanisms to automate this process or "pre-instantiate" your needed
template code. Examples will be provided in forthcomming versions.
necessary to first form libippl.a.
The IPPL library is compiled by generating a master Makefile using
the configure script. To execute this script, type "conf" in the
ippl directory followed by the architecture you wish to compile on
and any options you prefer. The options include the communications
library (if any) you wish to use, optimization level, utilization of
netCDF, and inclusion of a graphics library. Typing "conf" with no
options will print out a listing of the available options. This
script uses perl, and has been developed mostly on SGI platform
utilizing the KCC compiler from Kuck and Associates. The FrameWork now
runs with other compilers and a full list of compatible compilers and
platforms will be available shortly.
The IPPL library is compiled using cmake, details can be found at
In order to compile the FrameWork, you need to set two environment
variables: IPPL_ROOT and IPPL_ARCH. IPPL_ROOT should be the full
path name of where the ippl directory resides, such as
setenv IPPL_ROOT /users/smith/develop/ippl
likewise, the IPPL_ARCH variable should be set to the architecture
for which you are compiling the FrameWork, such as
setenv IPPL_ARCH SGI64 ( IRIX 6.2 systems)
the architecture names are provided by running conf with no variables.
The configure script will execute "makedepend", which determines the
include file dependencies of all the source files and writes them into
the Makefile. The Makefile is created in a subdirectory inside the
/lib directory that is named after the architecture you have chosen to
compile for (e.g., /lib/SGI64). If the Makefile produced by conf fails,
you may have to edit the settings of the macros in conf, such as the
library paths, to suite your specific site.
Once conf is finished, go down to the subdirectory named after your
architecture (such as /lib/SGI64) and type make, the Makefile there
will compile the IPPL library and produces a libippl.a to be linked
in with all your applications. An example Makefile.app is also placed
in the directory in which you wish to build ippl applications - it is
meant as a guide to show how all the necessary libraries are included.
Remember to define the IPPL_ARCH and IPPL_ROOT variables when you
use these Makefiles, they depend upon these environment variable being
set each time you log on.
Changes (Andrea Adelmann, Julian Cummings Oct/Sept. 2002):
New conf switch GCC (for gcc v3.2 and up). Note the GPLUSPLUS is for compiler
gcc version smaller 3.0 like the stable 2.95.3.
New version string: v0-35-2002
Source code changes:
- SubParticleAssign.cpp
typedef typename RHS::Wrapped Wrapped;
// Get the object wrapped in the PETE expression object
// RHS::Wrapped& bb = b.PETE_unwrap();
Wrapped& bb = b.PETE_unwrap();
- Message.cpp
m.putmsg((void*) (&*beg), sizeof(T2), d);
//m.putmsg((void*) beg, sizeof(T2), d);
- ParticleAttrib.h
// curr = myList->end();
curr = &*myList->end();
// ParticleAttribIterator(ParticleList_t& pa)
// : myList(&pa), curr(pa.begin()) { }
ParticleAttribIterator(ParticleList_t& pa)
: myList(&pa), curr(&(*pa.begin())) { }
- ParticleBase.h
add using std::sort;
- BrickExpression.h needs #include "Field/AssignTags.h"
- In case of the gcc 3.2 I still use the old strstream.h file.
The sstream seams to have a bug or the strstream based implementation is
the source for the problem. The problem is that after the first output
no more output is seen on the console.
- test(s)
Change some includes from old to new style.
Comment out missing tests:
binary
binarywhere
Tests that fail: particles/spatial.cpp
- remove ifdefs for PGC
Have fun!
- ippl folk
variables: IPPL_ROOT.
Please report bugs to andreas.adelmann@psi.ch
......
......@@ -32,7 +32,7 @@ COPT = -g $(USER_COPT)
USER_F77OPT =
F77OPT = $(USER_F77OPT)
CXXFLAGS = -fpermissive -Wno-deprecated -ftemplate-depth-80 -funroll-loops -fstrict-aliasing $(CXXOPT) $(CXXINCLUDES) $(CXXDEFINES)
CXXFLAGS = -fpermissive -Wparentheses -std=c++0x -DUSENAMESPACE -Wno-deprecated -g -funroll-loops $(CXXOPT) $(CXXINCLUDES) $(CXXDEFINES)
USER_CXXFLAGSLIB =
USER_CXXFLAGSAPP =
......@@ -58,7 +58,7 @@ LDFLAGS = $(CXXFLAGSAPP) $(USER_LDFLAGS)
LINKER = $(CXX) -v
USER_LFLAGS =
LFLAGS = -L$(IPPL_ROOT)/lib/ $(USER_LFLAGS)
LFLAGS = -L$(IPPL_PREFIX)/lib/ $(USER_LFLAGS)
USER_LIBS =
LIBS = -lippl -lm -lstdc++ $(USER_LIBS)
......
###########################################################################
#
# The IPPL Framework
#
# This program was prepared by the Regents of the University of
# Visit http://people.web.psi.ch/adelmann/ for more details
#
###########################################################################
SHELL = /bin/sh
include $(IPPL_ROOT)/test/Makefile.def
###########################################################################
###
### self-check programs: these test codes can be run as part of a self-check
### suite. Each prints out text that contains the word "passed" or "failed".
### If any part of the test code output contains "failed" (case-insensitive)
### the program should be considered as having failed due to some logical
### consistency check problem. If the word failed does not appear anywhere
### in the output, the program should be considered as not showing a problem.
###
TESTS = testPwrSpec
SELF_CHECK = \
testPwrSpec
TESTSFAIL = spatial
###
### Almost all test codes, even those that don't follow the passed/failed rule
### and that cannot be used as part of the self-check suite.
###
SELF_CHECK = $(TESTS)
TESTS = \
testPwrSpec
include ../Makefile.def
###########################################################################
all: $(TESTS)
###
### Rules to make all these tests
###
self_check: $(SELF_CHECK)
for i in $(SELF_CHECK) ; do echo $$i ; $$i ; done
all: $(TESTS)
clean:
test: tests
tests: $(TESTS)
for i in $(TESTS) ; do echo $$i ; $$i ; done
clean:
rm -f $(TESTS) $(TESTS:=.o) core *~
clobber: clean
rm -rf ii_files ti_files .d*
rm -rf ii_files ti_files .d* text.*
###########################################################################
# $RCSfile: Makefile,v $ $Author: adelmann $
# $Revision: 1.1.1.1 $ $Date: 2003/01/23 07:40:38 $
###########################################################################
......@@ -33,6 +33,8 @@ Build:
#include <iostream>
#include <set>
using namespace std;
// dimension of our positions
const unsigned Dim = 3;
......@@ -248,8 +250,8 @@ public:
delete FLI_m;
}
// void calcPwrSpecAndSave(CxField_t *f, string fn) {
void calcPwrSpecAndSave(ChargedParticles *p, string fn) {
// void calcPwrSpecAndSave(CxField_t *f, std::string fn) {
void calcPwrSpecAndSave(ChargedParticles *p, std::string fn) {
Inform m("calcPwrSpecAndSave ");
rho_m = p->EFDMag_m;
......@@ -434,7 +436,7 @@ int main(int argc, char *argv[]){
P->initFields();
msg << "P->initField() done " << endl;
pwrSpec->calcPwrSpecAndSave(P, string("pwrSpec.dat"));
pwrSpec->calcPwrSpecAndSave(P, std::string("pwrSpec.dat"));
msg << "calcPwrSpecAndSave done " << endl;
......
......@@ -8,7 +8,7 @@
###########################################################################
SHELL = /bin/sh
include $(IPPL_ROOT)/lib/Makefile.def
include $(IPPL_ROOT)/test/Makefile.def
###########################################################################
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment