From 5b813c5007f8c3824f3785473fefc6bd53bca886 Mon Sep 17 00:00:00 2001
From: Oliver Hahn <oliverjhahn@gmail.com>
Date: Tue, 5 Nov 2013 22:56:05 +0100
Subject: [PATCH] fixed that sometimes real-space averaging for noise was used
 instead of k-space. fixed some other minor issues (mostly compiler warnings)

---
 Makefile              |  5 ++---
 convolution_kernel.cc | 10 +++++-----
 densities.cc          |  4 ++--
 mesh.hh               |  2 +-
 random.cc             |  2 +-
 5 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/Makefile b/Makefile
index 778891b..c6b2635 100644
--- a/Makefile
+++ b/Makefile
@@ -10,7 +10,7 @@ BOXLIB_HOME     = ${HOME}/nyx_tot_sterben/BoxLib
 ##############################################################################
 ### compiler and path settings
 CC      = g++
-OPT     = -Wall -Wno-unknown-pragmas -O0 -g -mtune=native
+OPT     = -Wall -Wno-unknown-pragmas -O3 -g -mtune=native
 CFLAGS  =  
 LFLAGS  = -lgsl -lgslcblas 
 CPATHS  = -I. -I$(HOME)/local/include -I/opt/local/include -I/usr/local/include
@@ -111,8 +111,7 @@ $(TARGET): $(OBJS)
 	$(CC) $(LPATHS) -o $@ $^ $(LFLAGS)
 endif
 
-#%.o: %.cc *.hh Makefile 
-%.o: %.cc *.hh
+%.o: %.cc *.hh Makefile 
 	$(CC) $(CFLAGS) $(CPATHS) -c $< -o $@
 
 clean:
diff --git a/convolution_kernel.cc b/convolution_kernel.cc
index b1c8050..4ff6e22 100644
--- a/convolution_kernel.cc
+++ b/convolution_kernel.cc
@@ -490,7 +490,7 @@ namespace convolution{
         return eval_split_recurse( tfr, xmid, dx, prevval, nsplit );
     }
     
-    //#define OLD_KERNEL_SAMPLING
+#define OLD_KERNEL_SAMPLING
 	
 	template< typename real_t >
 	void kernel_real_cached<real_t>::precompute_kernel( transfer_function* ptf, tf_type type, const refinement_hierarchy& refh )
@@ -1095,10 +1095,10 @@ namespace convolution{
 				}
 			}
 
-			LOGUSER("Averaging fine kernel to coarse kernel...");
+			/*			LOGUSER("Averaging fine kernel to coarse kernel...");
 
 			//... copy averaged and convolved fine kernel to coarse kernel
-			/*#pragma omp parallel for
+			#pragma omp parallel for
 			for( int ix=0; ix<nx; ix+=2 )
 				for( int iy=0; iy<ny; iy+=2 )
 					for( int iz=0; iz<nz; iz+=2 )
@@ -1130,9 +1130,9 @@ namespace convolution{
 												 +rkernel[ACC_RF(ix-i,iy-j+1,iz-k+1)] + rkernel[ACC_RF(ix-i+1,iy-j+1,iz-k+1)]);
 									}
 						
-					}*/
+					}
 
-			
+			*/
 			sprintf(cachefname,"temp_kernel_level%03d.tmp",ilevel);
 			LOGUSER("Storing kernel in temp file \'%s\'.",cachefname);
 			fp = fopen(cachefname,"w+");
diff --git a/densities.cc b/densities.cc
index 3c5bbb6..ba75bb1 100644
--- a/densities.cc
+++ b/densities.cc
@@ -634,7 +634,7 @@ void GenerateDensityHierarchy(	config_file& cf, transfer_function *ptf, tf_type
 			*coarse = coarse_save;
 			coarse->subtract_oct_mean();
 			convolution::perform<real_t>( the_tf_kernel, reinterpret_cast<void*> (coarse->get_data_ptr()), shift );
-			coarse->subtract_mean();
+			//coarse->subtract_mean();
 			//coarse->upload_bnd_add( *delta.get_grid(levelmin+i-1) );
 			
 			//... clean up
@@ -684,7 +684,7 @@ void GenerateDensityHierarchy(	config_file& cf, transfer_function *ptf, tf_type
 
 		the_tf_kernel->deallocate();
 		
-		coarse->subtract_mean();
+		//coarse->subtract_mean();
 		
 		//... upload data to coarser grid
 		//coarse->upload_bnd_add( *delta.get_grid(levelmax-1) );
diff --git a/mesh.hh b/mesh.hh
index 66e8404..495c454 100644
--- a/mesh.hh
+++ b/mesh.hh
@@ -655,7 +655,7 @@ public:
         //! generate a mask
         if( m_levelmin != levelmax() )
         {
-            for( int ilevel = levelmax()-1; ilevel >= levelmin(); --ilevel )
+            for( int ilevel = (int)levelmax()-1; ilevel >= (int)levelmin(); --ilevel )
             {
                 double xq[3], dx = 1.0/(1ul<<ilevel); //1.0/(1ul<<(levelmax()-1));
                 
diff --git a/random.cc b/random.cc
index 117b91c..2269f6e 100644
--- a/random.cc
+++ b/random.cc
@@ -1610,7 +1610,7 @@ void random_number_generator<rng,T>::compute_random_numbers( void )
 			if( ilevel >= levelmax_ )
 				randc[ilevel] = new rng( *randc[ilevel+1], kavg );
 			else
-				randc[ilevel] = new rng( *randc[ilevel+1], false );
+				randc[ilevel] = new rng( *randc[ilevel+1], kavg );
 			
 			if( ilevel+1 > levelmax_ )
 			{