From 1a945610858cf0bf7c14cf7dec4bc30a9f5a6359 Mon Sep 17 00:00:00 2001 From: Zaher Salman Date: Mon, 4 Feb 2013 15:45:01 +0000 Subject: [PATCH] Clean up MakeFile and use gfortran. Added install instructions for PerlQt3 (for SL6). General clean up. --- trimsp/src/Makefile | 27 +++++++------------ trimsp/{ => src}/TrimSPGUI/COPYING.txt | 0 trimsp/{ => src}/TrimSPGUI/Chem.pm | 0 trimsp/src/TrimSPGUI/INSTALL | 18 +++++++++++++ trimsp/{ => src}/TrimSPGUI/PlotFraction.png | Bin trimsp/{ => src}/TrimSPGUI/PlotProfiles.png | Bin trimsp/{ => src}/TrimSPGUI/TrimSP | 0 trimsp/{ => src}/TrimSPGUI/TrimSP.cfg | 0 trimsp/{ => src}/TrimSPGUI/TrimSPGUI.pl | 1 + trimsp/{ => src}/TrimSPGUI/TrimSPGUI.ui | 0 trimsp/{ => src}/TrimSPGUI/TrimSPGUI.ui.h | 0 trimsp/{ => src}/TrimSPGUI/icon.odg | Bin trimsp/{ => src}/TrimSPGUI/icon.png | Bin trimsp/{ => src}/TrimSPGUI/plotFrc.C | 0 trimsp/{ => src}/TrimSPGUI/plotRge.C | 0 trimsp/{ => src}/TrimSPGUI4/COPYING.txt | 0 trimsp/{ => src}/TrimSPGUI4/Chem.pm | 0 trimsp/{ => src}/TrimSPGUI4/PlotFraction.png | Bin trimsp/{ => src}/TrimSPGUI4/PlotProfiles.png | Bin trimsp/{ => src}/TrimSPGUI4/TrimSP | 0 trimsp/{ => src}/TrimSPGUI4/TrimSP.cfg | 0 trimsp/{ => src}/TrimSPGUI4/TrimSP.pl | 0 trimsp/{ => src}/TrimSPGUI4/TrimSPGUI4.pm | 0 trimsp/{ => src}/TrimSPGUI4/TrimSPGUI4.ui | 0 trimsp/{ => src}/TrimSPGUI4/Ui_TrimSPGUI4.pm | 0 trimsp/{ => src}/TrimSPGUI4/densities.dat | 0 trimsp/{ => src}/TrimSPGUI4/icon.odg | Bin trimsp/{ => src}/TrimSPGUI4/icon.png | Bin trimsp/{ => src}/TrimSPGUI4/plotFrc.C | 0 trimsp/{ => src}/TrimSPGUI4/plotRge.C | 0 trimsp/{ => src}/TrimSPGUI4/readAscii.C | 0 trimsp/src/{ => org}/datmak7l_tp.F | 0 trimsp/src/{trimsp7l_zs.F => trimsp7l.F} | 0 33 files changed, 29 insertions(+), 17 deletions(-) rename trimsp/{ => src}/TrimSPGUI/COPYING.txt (100%) rename trimsp/{ => src}/TrimSPGUI/Chem.pm (100%) create mode 100644 trimsp/src/TrimSPGUI/INSTALL rename trimsp/{ => src}/TrimSPGUI/PlotFraction.png (100%) rename trimsp/{ => src}/TrimSPGUI/PlotProfiles.png (100%) rename trimsp/{ => src}/TrimSPGUI/TrimSP (100%) rename trimsp/{ => src}/TrimSPGUI/TrimSP.cfg (100%) rename trimsp/{ => src}/TrimSPGUI/TrimSPGUI.pl (99%) rename trimsp/{ => src}/TrimSPGUI/TrimSPGUI.ui (100%) rename trimsp/{ => src}/TrimSPGUI/TrimSPGUI.ui.h (100%) rename trimsp/{ => src}/TrimSPGUI/icon.odg (100%) rename trimsp/{ => src}/TrimSPGUI/icon.png (100%) rename trimsp/{ => src}/TrimSPGUI/plotFrc.C (100%) rename trimsp/{ => src}/TrimSPGUI/plotRge.C (100%) rename trimsp/{ => src}/TrimSPGUI4/COPYING.txt (100%) rename trimsp/{ => src}/TrimSPGUI4/Chem.pm (100%) rename trimsp/{ => src}/TrimSPGUI4/PlotFraction.png (100%) rename trimsp/{ => src}/TrimSPGUI4/PlotProfiles.png (100%) rename trimsp/{ => src}/TrimSPGUI4/TrimSP (100%) rename trimsp/{ => src}/TrimSPGUI4/TrimSP.cfg (100%) rename trimsp/{ => src}/TrimSPGUI4/TrimSP.pl (100%) rename trimsp/{ => src}/TrimSPGUI4/TrimSPGUI4.pm (100%) rename trimsp/{ => src}/TrimSPGUI4/TrimSPGUI4.ui (100%) rename trimsp/{ => src}/TrimSPGUI4/Ui_TrimSPGUI4.pm (100%) rename trimsp/{ => src}/TrimSPGUI4/densities.dat (100%) rename trimsp/{ => src}/TrimSPGUI4/icon.odg (100%) rename trimsp/{ => src}/TrimSPGUI4/icon.png (100%) rename trimsp/{ => src}/TrimSPGUI4/plotFrc.C (100%) rename trimsp/{ => src}/TrimSPGUI4/plotRge.C (100%) rename trimsp/{ => src}/TrimSPGUI4/readAscii.C (100%) rename trimsp/src/{ => org}/datmak7l_tp.F (100%) rename trimsp/src/{trimsp7l_zs.F => trimsp7l.F} (100%) diff --git a/trimsp/src/Makefile b/trimsp/src/Makefile index 2ef33df..11814cb 100644 --- a/trimsp/src/Makefile +++ b/trimsp/src/Makefile @@ -3,31 +3,24 @@ # 17-Jun-2002 TP, use standard f77 code; use # ranlux random number generator of the CERN mathlib # -#FC=g77 -ff90 -FC=g77 +# 4-Feb-2013 ZS, clean up makefile and include random number +# generator in the code. Use gfortran which is now +# a standard part of gcc in moder systems. +# +FC=gfortran #DEBUG = -g -O DEBUG = #WARN= -Wall -W -WARN = -Wno-globals -DIALECT = -fno-backslash -fno-automatic -finit-local-zero +WARN= +#DIALECT = -fno-backslash -fno-automatic -finit-local-zero #DIALECT = -finit-local-zero +DIALECT = OPS=-c $(DIALECT) $(WARN) $(DEBUG) -# for random number generator -#CERNLIB_DIR = $(CERN_ROOT)/lib -# -all : trimsp7l_zs.o trimsp7l_zs datmak7l_tp.o datmak7l_tp -trimsp7l_zs.o : trimsp7l_zs.F - $(FC) $(OPS) $< +all : trimsp7l -trimsp7l_zs : trimsp7l_zs.o +trimsp7l : trimsp7l.F $(FC) -o $(HOME)/bin/$@ $< -datmak7l_tp.o : datmak7l_tp.F - $(FC) $(OPS) $< - -datmak7l_tp : datmak7l_tp.o - $(FC) -o $(HOME)/bin/$@ $< - clean: rm -f *.o *~ \#* .#* diff --git a/trimsp/TrimSPGUI/COPYING.txt b/trimsp/src/TrimSPGUI/COPYING.txt similarity index 100% rename from trimsp/TrimSPGUI/COPYING.txt rename to trimsp/src/TrimSPGUI/COPYING.txt diff --git a/trimsp/TrimSPGUI/Chem.pm b/trimsp/src/TrimSPGUI/Chem.pm similarity index 100% rename from trimsp/TrimSPGUI/Chem.pm rename to trimsp/src/TrimSPGUI/Chem.pm diff --git a/trimsp/src/TrimSPGUI/INSTALL b/trimsp/src/TrimSPGUI/INSTALL new file mode 100644 index 0000000..978994c --- /dev/null +++ b/trimsp/src/TrimSPGUI/INSTALL @@ -0,0 +1,18 @@ +This GUI uses PerlQt3. If this package is available in your distribution +then you do not need to do anything, simply run the TrimSP script as is. +If your distribution does not come with a PerlQt3 package, the easiest way +to install it is through perl CPAN. + +Before you start, make sure that the follwoing packages are installed. +For example, for SL6 and similar: + +yum install perl-CPAN perl-YAML perl-Parse-CPAN-Meta perl-Test-CPAN-Meta libX11-devel libXext-devel libXaw-devel libXi-devel qt3-devel + +then install the PerlQt3 module in CPAN using the following command: + +cpan +notest install GGARAND/PerlQt-3.008.tar.gz + +Now, you are ready to run the GUI. + +For questions and support please constact Zaher Salman \ No newline at end of file diff --git a/trimsp/TrimSPGUI/PlotFraction.png b/trimsp/src/TrimSPGUI/PlotFraction.png similarity index 100% rename from trimsp/TrimSPGUI/PlotFraction.png rename to trimsp/src/TrimSPGUI/PlotFraction.png diff --git a/trimsp/TrimSPGUI/PlotProfiles.png b/trimsp/src/TrimSPGUI/PlotProfiles.png similarity index 100% rename from trimsp/TrimSPGUI/PlotProfiles.png rename to trimsp/src/TrimSPGUI/PlotProfiles.png diff --git a/trimsp/TrimSPGUI/TrimSP b/trimsp/src/TrimSPGUI/TrimSP similarity index 100% rename from trimsp/TrimSPGUI/TrimSP rename to trimsp/src/TrimSPGUI/TrimSP diff --git a/trimsp/TrimSPGUI/TrimSP.cfg b/trimsp/src/TrimSPGUI/TrimSP.cfg similarity index 100% rename from trimsp/TrimSPGUI/TrimSP.cfg rename to trimsp/src/TrimSPGUI/TrimSP.cfg diff --git a/trimsp/TrimSPGUI/TrimSPGUI.pl b/trimsp/src/TrimSPGUI/TrimSPGUI.pl similarity index 99% rename from trimsp/TrimSPGUI/TrimSPGUI.pl rename to trimsp/src/TrimSPGUI/TrimSPGUI.pl index bb49af1..0f3156c 100644 --- a/trimsp/TrimSPGUI/TrimSPGUI.pl +++ b/trimsp/src/TrimSPGUI/TrimSPGUI.pl @@ -2146,6 +2146,7 @@ sub PrepLayers for (my $i=1;$i<=7;$i++) { my $LayerName = "BoxL".$i; my $LayerAttrib = child($LayerName); + print $LayerAttrib."\n"; if ($i<=$All{"NL"}) { $LayerAttrib->setDisabled(0); } else { diff --git a/trimsp/TrimSPGUI/TrimSPGUI.ui b/trimsp/src/TrimSPGUI/TrimSPGUI.ui similarity index 100% rename from trimsp/TrimSPGUI/TrimSPGUI.ui rename to trimsp/src/TrimSPGUI/TrimSPGUI.ui diff --git a/trimsp/TrimSPGUI/TrimSPGUI.ui.h b/trimsp/src/TrimSPGUI/TrimSPGUI.ui.h similarity index 100% rename from trimsp/TrimSPGUI/TrimSPGUI.ui.h rename to trimsp/src/TrimSPGUI/TrimSPGUI.ui.h diff --git a/trimsp/TrimSPGUI/icon.odg b/trimsp/src/TrimSPGUI/icon.odg similarity index 100% rename from trimsp/TrimSPGUI/icon.odg rename to trimsp/src/TrimSPGUI/icon.odg diff --git a/trimsp/TrimSPGUI/icon.png b/trimsp/src/TrimSPGUI/icon.png similarity index 100% rename from trimsp/TrimSPGUI/icon.png rename to trimsp/src/TrimSPGUI/icon.png diff --git a/trimsp/TrimSPGUI/plotFrc.C b/trimsp/src/TrimSPGUI/plotFrc.C similarity index 100% rename from trimsp/TrimSPGUI/plotFrc.C rename to trimsp/src/TrimSPGUI/plotFrc.C diff --git a/trimsp/TrimSPGUI/plotRge.C b/trimsp/src/TrimSPGUI/plotRge.C similarity index 100% rename from trimsp/TrimSPGUI/plotRge.C rename to trimsp/src/TrimSPGUI/plotRge.C diff --git a/trimsp/TrimSPGUI4/COPYING.txt b/trimsp/src/TrimSPGUI4/COPYING.txt similarity index 100% rename from trimsp/TrimSPGUI4/COPYING.txt rename to trimsp/src/TrimSPGUI4/COPYING.txt diff --git a/trimsp/TrimSPGUI4/Chem.pm b/trimsp/src/TrimSPGUI4/Chem.pm similarity index 100% rename from trimsp/TrimSPGUI4/Chem.pm rename to trimsp/src/TrimSPGUI4/Chem.pm diff --git a/trimsp/TrimSPGUI4/PlotFraction.png b/trimsp/src/TrimSPGUI4/PlotFraction.png similarity index 100% rename from trimsp/TrimSPGUI4/PlotFraction.png rename to trimsp/src/TrimSPGUI4/PlotFraction.png diff --git a/trimsp/TrimSPGUI4/PlotProfiles.png b/trimsp/src/TrimSPGUI4/PlotProfiles.png similarity index 100% rename from trimsp/TrimSPGUI4/PlotProfiles.png rename to trimsp/src/TrimSPGUI4/PlotProfiles.png diff --git a/trimsp/TrimSPGUI4/TrimSP b/trimsp/src/TrimSPGUI4/TrimSP similarity index 100% rename from trimsp/TrimSPGUI4/TrimSP rename to trimsp/src/TrimSPGUI4/TrimSP diff --git a/trimsp/TrimSPGUI4/TrimSP.cfg b/trimsp/src/TrimSPGUI4/TrimSP.cfg similarity index 100% rename from trimsp/TrimSPGUI4/TrimSP.cfg rename to trimsp/src/TrimSPGUI4/TrimSP.cfg diff --git a/trimsp/TrimSPGUI4/TrimSP.pl b/trimsp/src/TrimSPGUI4/TrimSP.pl similarity index 100% rename from trimsp/TrimSPGUI4/TrimSP.pl rename to trimsp/src/TrimSPGUI4/TrimSP.pl diff --git a/trimsp/TrimSPGUI4/TrimSPGUI4.pm b/trimsp/src/TrimSPGUI4/TrimSPGUI4.pm similarity index 100% rename from trimsp/TrimSPGUI4/TrimSPGUI4.pm rename to trimsp/src/TrimSPGUI4/TrimSPGUI4.pm diff --git a/trimsp/TrimSPGUI4/TrimSPGUI4.ui b/trimsp/src/TrimSPGUI4/TrimSPGUI4.ui similarity index 100% rename from trimsp/TrimSPGUI4/TrimSPGUI4.ui rename to trimsp/src/TrimSPGUI4/TrimSPGUI4.ui diff --git a/trimsp/TrimSPGUI4/Ui_TrimSPGUI4.pm b/trimsp/src/TrimSPGUI4/Ui_TrimSPGUI4.pm similarity index 100% rename from trimsp/TrimSPGUI4/Ui_TrimSPGUI4.pm rename to trimsp/src/TrimSPGUI4/Ui_TrimSPGUI4.pm diff --git a/trimsp/TrimSPGUI4/densities.dat b/trimsp/src/TrimSPGUI4/densities.dat similarity index 100% rename from trimsp/TrimSPGUI4/densities.dat rename to trimsp/src/TrimSPGUI4/densities.dat diff --git a/trimsp/TrimSPGUI4/icon.odg b/trimsp/src/TrimSPGUI4/icon.odg similarity index 100% rename from trimsp/TrimSPGUI4/icon.odg rename to trimsp/src/TrimSPGUI4/icon.odg diff --git a/trimsp/TrimSPGUI4/icon.png b/trimsp/src/TrimSPGUI4/icon.png similarity index 100% rename from trimsp/TrimSPGUI4/icon.png rename to trimsp/src/TrimSPGUI4/icon.png diff --git a/trimsp/TrimSPGUI4/plotFrc.C b/trimsp/src/TrimSPGUI4/plotFrc.C similarity index 100% rename from trimsp/TrimSPGUI4/plotFrc.C rename to trimsp/src/TrimSPGUI4/plotFrc.C diff --git a/trimsp/TrimSPGUI4/plotRge.C b/trimsp/src/TrimSPGUI4/plotRge.C similarity index 100% rename from trimsp/TrimSPGUI4/plotRge.C rename to trimsp/src/TrimSPGUI4/plotRge.C diff --git a/trimsp/TrimSPGUI4/readAscii.C b/trimsp/src/TrimSPGUI4/readAscii.C similarity index 100% rename from trimsp/TrimSPGUI4/readAscii.C rename to trimsp/src/TrimSPGUI4/readAscii.C diff --git a/trimsp/src/datmak7l_tp.F b/trimsp/src/org/datmak7l_tp.F similarity index 100% rename from trimsp/src/datmak7l_tp.F rename to trimsp/src/org/datmak7l_tp.F diff --git a/trimsp/src/trimsp7l_zs.F b/trimsp/src/trimsp7l.F similarity index 100% rename from trimsp/src/trimsp7l_zs.F rename to trimsp/src/trimsp7l.F