Merge pull request CH-Earth#65 from bartnijssen/cleanup/issue60

Cleanup/issue60
dmocko · Jul 8, 2015 · d9f7136 · d9f7136
2 parents 61137c1 + 671e089
commit d9f7136
Show file tree

Hide file tree

Showing 5 changed files with 2 additions and 2 deletions.
diff --git a/build/Makefile b/build/Makefile
@@ -39,15 +39,15 @@ ENGINE_DIR = $(F_KORE_DIR)/engine
 SUMMA_NRUTIL= \
         nrtype.f90 \
 		nr_utility.f90
-NRUTIL = $(patsubst %, $(NUMREC_DIR)/%, $(SUMMA_NRUTIL))
+NRUTIL = $(patsubst %, $(ENGINE_DIR)/%, $(SUMMA_NRUTIL))
 
 #
 # Numerical recipes procedures
 # NOTE: all numerical recipes procedures are now replaced with free versions
 SUMMA_NRPROC= \
 		expIntegral.f90 \
 		spline_int.f90
-NRPROC = $(patsubst %, $(NUMREC_DIR)/%, $(SUMMA_NRPROC))
+NRPROC = $(patsubst %, $(ENGINE_DIR)/%, $(SUMMA_NRPROC))
 
 # Hook-up modules (set files and directory paths)
 SUMMA_HOOKUP= \

diff --git a/build/source/numrec/expIntegral.f90 → build/source/engine/expIntegral.f90 b/build/source/numrec/expIntegral.f90 → build/source/engine/expIntegral.f90
diff --git a/build/source/numrec/nr_utility.f90 → build/source/engine/nr_utility.f90 b/build/source/numrec/nr_utility.f90 → build/source/engine/nr_utility.f90
diff --git a/build/source/numrec/nrtype.f90 → build/source/engine/nrtype.f90 b/build/source/numrec/nrtype.f90 → build/source/engine/nrtype.f90
diff --git a/build/source/numrec/spline_int.f90 → build/source/engine/spline_int.f90 b/build/source/numrec/spline_int.f90 → build/source/engine/spline_int.f90