fixed input files, updated readme and gitignore

studouglas · Oct 29, 2015 · a7c9159 · a7c9159
1 parent b0a5264
commit a7c9159
Show file tree

Hide file tree

Showing 5 changed files with 32 additions and 381 deletions.
diff --git a/.gitignore b/.gitignore
@@ -17,7 +17,10 @@ geant4.10.00.p02-build-xcode
 G4STORK/Build/*
 G4STORK/include/Marshaled*
 G4STORK/include/*.msh
+G4STORK/OutputFiles
+G4STORK/SourceFiles
 
+geant4.10.00.p02/tmp
 geant4.10.00.p02-build/*
 geant4.10.00.p02-install/*
 geant4.10.00.p02/examples/*

diff --git a/G4STORK/InputFiles/C6LatticeInput.txt b/G4STORK/InputFiles/C6LatticeInput.txt
@@ -4,15 +4,16 @@
 WORLD C6Lattice
 
 # Number of runs, events per run and primaries per event
-NUM_RUNS 100
+NUM_RUNS 5
 NUM_EVENTS 12
-NUM_PRIMARY_PER_EVENT 30
+NUM_PRIMARY_PER_EVENT 20
 
 #Cross-section Data Directory
 CS_DATA_DIR DEFAULT
 
 #Final State Data Directory
-FS_DATA_DIR /home/SuperKamiGuru/NuclearSim/Data/ZippedG4NDL/0K/
+#FS_DATA_DIR /home/SuperKamiGuru/NuclearSim/Data/ZippedG4NDL/0K/
+FS_DATA_DIR DEFAULT
 
 # Uniform source ditribution around the fuel
 #UNIFORM_DIST_WITH_DIM 1 G4Tubs 1 4.7 7.2 0.5 25. 0. 0.
@@ -21,7 +22,7 @@ FS_DATA_DIR /home/SuperKamiGuru/NuclearSim/Data/ZippedG4NDL/0K/
 SEED 2013092304
 
 # Produce delayed neutrons instantaneously
-# Gives error when running -- temporarily disable (Stuart, Oct 14) INSTANT_DELAYED 1
+DELAYED_OPTION 1
 
 # Periodic Boundary condition
 PERIODIC_BC 0
@@ -39,7 +40,7 @@ NEUTRON_ENERGY 2.0
 #INITIAL_SOURCE_FILE Src_SCWRJason-100.txt
 
 # Output files 
-OUTPUT_LOG Log_C6Lattice.txt
+OUTPUT_LOG /Users/stuart/Documents/4th_Year/CS_4ZP6/GEANT4-GPU/G4STORK/OutputFiles/Log_C6Lattice.txt
 #OUTPUT_SOURCE Src_C6Lattice.txt
 #OUTPUT_FISSION Fis_C6Lattice.txt
 

diff --git a/G4STORK/InputFiles/SCWRDopplerInput.txt b/G4STORK/InputFiles/SCWRDopplerInput.txt
@@ -8,19 +8,19 @@ K_CALC K_Generational
 
 # Number of runs, events per run and primaries per event
 NUM_RUNS 50
-NUM_EVENTS 40
+NUM_EVENTS 12
 NUM_PRIMARY_PER_EVENT 60
 
 #Cross-section Data Directory
-CS_DATA_DIR /home/SuperKamiGuru/NuclearSim/Data/InterpolatedMCNPData/SCWRDopplerNew/
+#CS_DATA_DIR /home/SuperKamiGuru/NuclearSim/Data/InterpolatedMCNPData/SCWRDopplerNew/
 
 #Final State Data Directory
-FS_DATA_DIR /home/SuperKamiGuru/NuclearSim/Data/ConvertedMCNPData/293.606K/
+#FS_DATA_DIR /home/SuperKamiGuru/NuclearSim/Data/ConvertedMCNPData/293.606K/
 
 # Uniform source ditribution around the fuel
 UNIFORM_DIST_WITH_DIM 1 G4Tubs 1 4.7 7.2 0.5 25. 0. 0.
 
-# origin for the initail source distribution
+# origin for the initial source distribution
 INITIAL_SOURCE_POS -6.25 -6.25 0.
 
 # Initial random seed
@@ -45,9 +45,9 @@ NEUTRON_ENERGY 2.0
 #INITIAL_SOURCE_FILE Src_SCWRDoppler-100.txt
 
 # Output files 
-OUTPUT_LOG LogFiles/Log_SCWROutCVRDoppler-1.75-KGen.txt
-OUTPUT_SOURCE SourceFiles/Src_SCWROutCVRDoppler-1.75-KGen.txt
-OUTPUT_FISSION FissionFiles/Fis_SCWROutCVRDoppler-1.75-KGen.txt
+OUTPUT_LOG /Users/stuart/Documents/4th_Year/CS_4ZP6/GEANT4-GPU/G4STORK/OutputFiles/Log_SCWROutCVRDoppler-1.75-KGen.txt
+#OUTPUT_SOURCE SourceFiles/Src_SCWROutCVRDoppler-1.75-KGen.txt
+#OUTPUT_FISSION FissionFiles/Fis_SCWROutCVRDoppler-1.75-KGen.txt
 
 # Frequency of source output
 OUTPUT_SRC_FREQ 50