Merge branch 'master' of github.com:Parallel-in-Time/PararealF90

Parallel-in-Time · Sep 21, 2015 · 7fcd7f8 · 7fcd7f8
2 parents eb8884c + ecf8051
commit 7fcd7f8
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/makefile.defs.DORA b/makefile.defs.DORA
@@ -1,6 +1,7 @@
 F90 = ftn
 
-FCFLAGS = -cpp -O3 -fopenmp -Wtabs -ffree-line-length-none -Wall -fbackslash
+#FCFLAGS = -cpp -O3 -fopenmp -Wtabs -ffree-line-length-none -Wall -fbackslash
+FCFLAGS = -O3 -h omp -F
 
 # Flags useful for debugging
 #FCFLAGS += -g -frecursive -ffree-form -frange-check -fbacktrace -fvar-tracking -C -Wconversion -fimplicit-none -Warray-temporaries -Wcharacter-truncation -Wline-truncation -fcheck=all -fbounds-check
diff --git a/run_parareal_energy.py b/run_parareal_energy.py
@@ -11,7 +11,7 @@
 #
 generate_q0(Nx, Ny, Nz)
 Nproc = 24
-Nsamples = 40
+Nsamples = 50
 
 # Prepare generation of a bash script to rename RUR output...
 # These log files are identified using the JobID. Running rename.sh after all jobs are finished will
@@ -32,7 +32,7 @@
 Nfine = timemesh.get('Nfine')
 Ncoarse = timemesh.get('Ncoarse')
 
-for kk in range(14,15):
+for kk in range(0,Nsamples):
   types = [ 'mpi', 'openmp', 'openmp_pipe' ]
   for ii in range(0,len(types)):