matchup code added

matchup/Makefile

@@ -0,0 +1,21 @@
+CPP := mpicxx
+CPPFLAGS := -O3
+SRCDIR := ./src
+OBJDIR := ./obj
+INCLUDES := -I $(SRCDIR) -I/home/prlarsen/hacc3/trunk/genericio -I/home/prlarsen/hacc3/trunk/cosmotools/algorithms/halofinder -I/home/prlarsen/hacc3/trunk/cosmotools/algorithms/mergertree_ct -I/home/prlarsen/hacc3/trunk/cosmotools/common
+#
+
+#/home/prlarsen/trunk_steve/trunk/genericio -I/home/prlarsen/trunk_steve/trunk/cosmotools/algorithms/halofinder -I/home/prlarsen/trunk_steve/trunk/cosmotools/algorithms/mergertree_ct -I/home/prlarsen/trunk_steve/trunk/cosmotools/common
+OBJECTS := $(OBJDIR)/main.o
+
+
+#linking
+match : $(OBJECTS) $(LIBS)
+	$(CPP) $(CPPFLAGS) $(OBJECTS) -L/home/prlarsen/hacc3/trunk/cooley.cpu/mpi/lib -lCosmoTools -lGenericIOMPI -o match -fopenmp
+
+#compilation
+$(OBJDIR)/main.o: $(SRCDIR)/main.cpp 
+	$(CPP) $(CPPFLAGS) $(INCLUDES) -c $(SRCDIR)/main.cpp -o $(OBJDIR)/main.o -fopenmp
+
+clean:
+	rm $(OBJDIR)/*.o match

matchup/Makefile_backup

@@ -0,0 +1,18 @@
+CPP := mpicxx
+CPPFLAGS := -O3
+SRCDIR := ./src
+OBJDIR := ./obj
+INCLUDES := -I $(SRCDIR) -I/home/prlarsen/trunk_steve/trunk/genericio -I/home/prlarsen/trunk_steve/trunk/cosmotools/algorithms/halofinder -I/home/prlarsen/trunk_steve/trunk/cosmotools/algorithms/mergertree_ct -I/home/prlarsen/trunk_steve/trunk/cosmotools/common
+OBJECTS := $(OBJDIR)/main.o
+
+
+#linking
+match : $(OBJECTS) $(LIBS)
+	$(CPP) $(CPPFLAGS) $(OBJECTS) -L/home/prlarsen/trunk_steve/trunk/cooley.cpu/mpi/lib -lCosmoTools -lGenericIOMPI -o match -fopenmp
+
+#compilation
+$(OBJDIR)/main.o: $(SRCDIR)/main.cpp 
+	$(CPP) $(CPPFLAGS) $(INCLUDES) -c $(SRCDIR)/main.cpp -o $(OBJDIR)/main.o -fopenmp
+
+clean:
+	rm $(OBJDIR)/*.o match

matchup/README

@@ -0,0 +1 @@
+mpirun -f $COBALT_NODEFILE -n 64 ./match /projects/LastJourney/prlarsen/halo_lightcone_LJ/output/lcHalos76/lc_intrp_halos.76 /projects/LastJourney/heitmann/L5025/HACC000/analysis/Halos/b0168/Props/STEP77/m000p-77.haloproperties /projects/LastJourney/prlarsen/halo_lightcone_LJ/matched_output/test.gio

matchup/backup/Makefile

@@ -0,0 +1,24 @@
+CPP := mpicxx
+CPPFLAGS := -O3
+SRCDIR := ./src
+OBJDIR := ./obj
+INCLUDES := -I $(SRCDIR) -I/home/prlarsen/trunk_steve/trunk/genericio -I/home/prlarsen/trunk_steve/trunk/cosmotools/algorithms/halofinder -I/home/prlarsen/trunk_steve/trunk/cosmotools/algorithms/mergertree_ct -I/home/prlarsen/trunk_steve/trunk/cosmotools/common
+#INCLUDES := -I $(SRCDIR) -I/home/prlarsen/hacc3/trunk/genericio -I/home/prlarsen/hacc3/trunk/cosmotools/algorithms/halofinder -I/home/prlarsen/hacc3/trunk/cosmotools/algorithms/mergertree_ct -I/home/prlarsen/hacc3/trunk/cosmotools/common
+OBJECTS := $(OBJDIR)/main.o
+#LIBS := /home/prlarsen/hacc3/trunk/cooley.cpu/mpi/lib/libGenericIOMPI.a
+#LIBS := /home/prlarsen/trunk_steve/trunk/cooley.cpu/mpi/lib/libGenericIOMPI.a
+
+
+#linking
+match : $(OBJECTS) $(LIBS)
+	$(CPP) $(CPPFLAGS) $(OBJECTS) -L/home/prlarsen/trunk_steve/trunk/cooley.cpu/mpi/lib -lCosmoTools -lGenericIOMPI -o match -fopenmp
+#
+#	$(CPP) $(CPPFLAGS) $(OBJECTS) -L/home/prlarsen/hacc3/trunk/cooley.cpu/mpi/lib -lCosmoTools -lGenericIOMPI -o match -fopenmp
+
+#compilation
+$(OBJDIR)/main.o: $(SRCDIR)/main.cpp 
+#$(LIBS)
+	$(CPP) $(CPPFLAGS) $(INCLUDES) -c $(SRCDIR)/main.cpp -o $(OBJDIR)/main.o -fopenmp
+
+clean:
+	rm $(OBJDIR)/*.o match

matchup/cobalt_pl.sh

@@ -0,0 +1,33 @@
+#!/bin/sh
+NODES=`cat $COBALT_NODEFILE | wc -l`
+PROCS=$((NODES*12))
+OMP_NUM_THREADS=1
+export OMP_NUM_THREADS
+# probably want to divide this based on memory requirements - 98 is step 42-43, 1 is step 487-499
+for i in {35..36}
+# 36.. 80
+#36..98}
+#{1..74}
+#8}
+do
+echo $i
+i2=`expr $i + 1`
+echo $i2
+step=$(tail -n+$i steps_lj.txt | head -n1)
+step2=$(tail -n+$i2 steps_lj.txt | head -n1)
+echo $step
+echo $step2
+#mkdir /projects/LastJourney/prlarsen/halo_lightcone_LJ/output/lcHalos$step2
+mkdir /projects/LastJourney/prlarsen/halo_lightcone_LJ/matched_output2/lcHalos$step2
+LC_IN_FILE=/projects/LastJourney/prlarsen/halo_lightcone_LJ/output/lcHalos$step2/lc_intrp_halos.$step2
+LC_OUT_FILE=/projects/LastJourney/prlarsen/halo_lightcone_LJ/matched_output2/lcHalos$step2/lc_intrp_halos_matched.$step2
+#FOF_FILE=/projects/LastJourney/rangel/LastJourney/MergerTrees_updated_004/m000p-${step}.treenodes
+FOF_FILE=/projects/LastJourney/heitmann/L5025/HACC000/analysis/Halos/b0168/Props/STEP${step}/m000p-${step}.haloproperties
+echo $LC_IN_FILE
+echo $LC_OUT_FILE
+echo $FOF_FILE
+
+mpirun --env LD_PRELOAD=$DARSHAN_PRELOAD -f $COBALT_NODEFILE  -n $PROCS /home/prlarsen/lc_codes/rangel/matchup2/match  $LC_IN_FILE $FOF_FILE $LC_OUT_FILE 
+
+done
+

matchup/cobalt_test.sh

@@ -0,0 +1,13 @@
+#!/bin/sh
+NODES=`cat $COBALT_NODEFILE | wc -l`
+PROCS=$((NODES*12))
+
+
+mpirun -f $COBALT_NODEFILE  -n $PROCS /home/rangel/matchup/match  /projects/LastJourney/prlarsen/halo_lightcone_LJ/output/lcHalos76/lc_intrp_halos.76 /projects/LastJourney/heitmann/L5025/HACC000/analysis/Halos/b0168/Props/STEP77/m000p-77.haloproperties /projects/LastJourney/prlarsen/halo_lightcone_LJ/matched_output/a.out
+
+
+
+#/projects/LastJourney/rangel/LastJourney/MergerTrees_updated_004/m000p-148.treenodes#6539 
+
+
+#mpirun -f $COBALT_NODEFILE  -n $PROCS /home/prlarsen/lc_codes/rangel/matchup2/match  /projects/LastJourney/prlarsen/halo_lightcone_LJ/output/lcHalos76/lc_intrp_halos.76 /projects/LastJourney/rangel/LastJourney/MergerTrees_updated_004/m000p-77.treenodes /projects/LastJourney/prlarsen/halo_lightcone_LJ/matched_output/a.out

matchup/src/MurmurHashNeutral2.cpp

@@ -0,0 +1,49 @@
+//-----------------------------------------------------------------------------
+// MurmurHashNeutral2, by Austin Appleby
+
+// Same as MurmurHash2, but endian- and alignment-neutral.
+// Half the speed though, alas.
+
+unsigned int MurmurHashNeutral2 ( const void * key, int len, unsigned int seed )
+{
+	const unsigned int m = 0x5bd1e995;
+	const int r = 24;
+
+	unsigned int h = seed ^ len;
+
+	const unsigned char * data = (const unsigned char *)key;
+
+	while(len >= 4)
+	{
+		unsigned int k;
+
+		k  = data[0];
+		k |= data[1] << 8;
+		k |= data[2] << 16;
+		k |= data[3] << 24;
+
+		k *= m; 
+		k ^= k >> r; 
+		k *= m;
+
+		h *= m;
+		h ^= k;
+
+		data += 4;
+		len -= 4;
+	}
+
+	switch(len)
+	{
+	case 3: h ^= data[2] << 16;
+	case 2: h ^= data[1] << 8;
+	case 1: h ^= data[0];
+	        h *= m;
+	};
+
+	h ^= h >> 13;
+	h *= m;
+	h ^= h >> 15;
+
+	return h;
+}