From 6e1b95ca10742175a27cf3fe28f4c4cc4109aa30 Mon Sep 17 00:00:00 2001
From: Andrew Strong <aws@olga4.opt.rzg.mpg.de>
Date: Tue, 28 Apr 2020 18:15:17 +0200
Subject: [PATCH] ppfrag.cc from unused to source since used by ./configure
version. manual builds now have rm ppfrag.o
---
version_54/source/manual_build_dev | 2 +-
version_54/source/manual_compile | 4 ++++
version_54/source/manual_compile_dev | 6 +++++-
version_54/source/manual_link_dev | 2 ++
version_54/source/{unused => }/ppfrag.cc | 0
5 files changed, 12 insertions(+), 2 deletions(-)
rename version_54/source/{unused => }/ppfrag.cc (100%)
diff --git a/version_54/source/manual_build_dev b/version_54/source/manual_build_dev
index 1d08bdf..8777b45 100644
--- a/version_54/source/manual_build_dev
+++ b/version_54/source/manual_build_dev
@@ -5,6 +5,6 @@ source manual_compile_one_dev
source manual_link_dev
source manual_setenv_dev
-./galpropdev
+./galpropdev -r dummygaldef
diff --git a/version_54/source/manual_compile b/version_54/source/manual_compile
index 969464f..db1f367 100644
--- a/version_54/source/manual_compile
+++ b/version_54/source/manual_compile
@@ -4,6 +4,7 @@ module unload gcc
echo f90 files in order to get spectra.mod, remove in case using other compiler
echo added -fopenmp -O3
echo no -g is that meaningful with -O3
+echo ../config.h is needed but generated by ./configure
rm spectra.mod
@@ -11,3 +12,6 @@ rm spectra.mod
g++ -I. -I.. -I/afs/ipp-garching.mpg.de/home/a/aws/propagate/c/cfitsio/3.26/gcc_sles11_olga2/cfitsio/include -I/afs/ipp-garching.mpg.de/home/a/aws/propagate/c/CCfits/gcc_olga2_sles11_cfitsio3.26/usr/local/include -I/afs/ipp-garching.mpg.de/home/a/aws/Healpix/Healpix_3.11/src/cxx/generic_gcc/include -I/afs/ipp-garching.mpg.de/home/a/aws/propagate/c/CLHEP/2.0.4.3/installed_here/include -I/afs/ipp-garching.mpg.de/home/a/aws/gsl/gsl-1.10/olga/include -DGALDEF_PATH=\"/afs/ipp/u/aws/propagate/c/GALDEF\" -DFITSDATA_PATH=\"/afs/ipp/u/aws/propagate/c/FITS\" -DDATA_PATH=\"/afs/ipp/u/aws/propagate/c/gitlab/galprop/version_54/source/fortran_data\" -O3 -fopenmp -c *.cc *.f intpol.f90 init.f90
+echo ppfrag.cc is main but used in ./configure version
+rm ppfrag.o
+
diff --git a/version_54/source/manual_compile_dev b/version_54/source/manual_compile_dev
index d946330..264641a 100644
--- a/version_54/source/manual_compile_dev
+++ b/version_54/source/manual_compile_dev
@@ -5,7 +5,7 @@ module load gcc
echo changing to new libraries cfitsio-3.47
echo f90 files in order to get spectra.mod, remove in case using other compiler
echo added -fopenmp -O3
-
+echo ../config.h is needed but generated by ./configure
rm spectra.mod
@@ -14,3 +14,7 @@ echo cfitsio-3.47 CCfits-2.5 with same cfitsio
g++ -I. -I.. -I/afs/ipp-garching.mpg.de/home/a/aws/propagate/c/cfitsio/3.47/cfitsio-3.47/build/include -I/afs/ipp-garching.mpg.de/home/a/aws/propagate/c/CCfits/CCfits-2.5_cfitsio_3.47/CCfits/build/usr/local/include -I/afs/ipp-garching.mpg.de/home/a/aws/Healpix/Healpix_3.11/src/cxx/generic_gcc/include -I/afs/ipp-garching.mpg.de/home/a/aws/propagate/c/CLHEP/2.0.4.3/installed_here/include -I/afs/ipp-garching.mpg.de/home/a/aws/gsl/gsl-1.10/olga/include -DGALDEF_PATH=\"/afs/ipp/u/aws/propagate/c/GALDEF\" -DFITSDATA_PATH=\"/afs/ipp/u/aws/propagate/c/FITS\" -DDATA_PATH=\"/afs/ipp/u/aws/propagate/c/gitlab/galprop/version_54/source/fortran_data\" -O3 -fopenmp -c *.cc *.f intpol.f90 init.f90
+echo ppfrag.cc is main but used in ./configure version
+rm ppfrag.o
+
+
diff --git a/version_54/source/manual_link_dev b/version_54/source/manual_link_dev
index 0298fe0..d0bcfa9 100644
--- a/version_54/source/manual_link_dev
+++ b/version_54/source/manual_link_dev
@@ -1,3 +1,5 @@
module load gcc
+echo binary = galpropdev
+
g++ -g -O3 -Wall -fopenmp -o galpropdev *.o -lcfitsio -L/afs/ipp-garching.mpg.de/home/a/aws/propagate/c/CCfits/CCfits-2.5_cfitsio_3.47/CCfits/build/usr/local/lib -lCCfits -L/afs/ipp-garching.mpg.de/home/a/aws/Healpix/Healpix_3.11/src/cxx/generic_gcc/lib -lhealpix_cxx -lcxxsupport -lfftpack -lgfortran -L/afs/ipp-garching.mpg.de/home/a/aws/gsl/gsl-1.10/olga/lib -lgsl -lgslcblas -lm -L/afs/ipp-garching.mpg.de/home/a/aws/propagate/c/CLHEP/2.0.4.3/installed_here/lib -lCLHEP -L/afs/ipp-garching.mpg.de/home/a/aws/propagate/c/cfitsio/3.47/cfitsio-3.47/build/lib
diff --git a/version_54/source/unused/ppfrag.cc b/version_54/source/ppfrag.cc
similarity index 100%
rename from version_54/source/unused/ppfrag.cc
rename to version_54/source/ppfrag.cc
--
GitLab