Porting working changes from 3D-seq to 3D-MPI
This commit is contained in:
		@@ -8,8 +8,8 @@ name poisson
 | 
			
		||||
 | 
			
		||||
xlength    1.0		# domain size in x-direction
 | 
			
		||||
ylength    1.0		# domain size in y-direction
 | 
			
		||||
imax       1000		# number of interior cells in x-direction
 | 
			
		||||
jmax       10000		# number of interior cells in y-direction
 | 
			
		||||
imax       100		# number of interior cells in x-direction
 | 
			
		||||
jmax       100		# number of interior cells in y-direction
 | 
			
		||||
 | 
			
		||||
# Pressure Iteration Data:
 | 
			
		||||
# -----------------------
 | 
			
		||||
@@ -17,6 +17,6 @@ jmax       10000		# number of interior cells in y-direction
 | 
			
		||||
itermax  10000		# maximal number of pressure iteration in one time step
 | 
			
		||||
eps      0.000001	# stopping tolerance for pressure iteration
 | 
			
		||||
rho      0.99999
 | 
			
		||||
omg      1.991		# relaxation parameter for SOR iteration
 | 
			
		||||
omg      1.8		# relaxation parameter for SOR iteration
 | 
			
		||||
 | 
			
		||||
#===============================================================================
 | 
			
		||||
 
 | 
			
		||||
@@ -1,73 +0,0 @@
 | 
			
		||||
Rank, SOR, RB
 | 
			
		||||
1, 1138.31, 447.94
 | 
			
		||||
2, 569.26, 225.46
 | 
			
		||||
3, 379.59, 150.36
 | 
			
		||||
4, 284.87, 112.45
 | 
			
		||||
5, 227.82, 89.36
 | 
			
		||||
6, 190.25, 75.91
 | 
			
		||||
7, 163.19, 64.62
 | 
			
		||||
8, 142.55, 56.34
 | 
			
		||||
9, 126.80, 49.90
 | 
			
		||||
10, 114.09, 45.32
 | 
			
		||||
11, 103.80, 40.71
 | 
			
		||||
12, 95.28, 37.55
 | 
			
		||||
13, 87.99, 35.60
 | 
			
		||||
14, 81.72, 33.19
 | 
			
		||||
15, 76.30, 30.71
 | 
			
		||||
16, 71.51, 29.01
 | 
			
		||||
17, 67.35, 26.94
 | 
			
		||||
18, 63.69, 25.98
 | 
			
		||||
19, 60.47, 24.49
 | 
			
		||||
20, 57.49, 23.21
 | 
			
		||||
21, 54.81, 22.22
 | 
			
		||||
22, 52.26, 21.01
 | 
			
		||||
23, 50.01, 20.81
 | 
			
		||||
24, 47.93, 19.83
 | 
			
		||||
25, 46.04, 18.94
 | 
			
		||||
26, 44.30, 18.01
 | 
			
		||||
27, 42.68, 17.71
 | 
			
		||||
28, 41.16, 16.93
 | 
			
		||||
29, 39.72, 16.33
 | 
			
		||||
30, 38.51, 16.10
 | 
			
		||||
31, 37.31, 15.27
 | 
			
		||||
32, 36.15, 14.86
 | 
			
		||||
33, 35.11, 14.31
 | 
			
		||||
34, 34.08, 13.76
 | 
			
		||||
35, 33.13, 13.50
 | 
			
		||||
36, 32.22, 13.41
 | 
			
		||||
37, 31.37, 12.86
 | 
			
		||||
38, 30.55, 12.65
 | 
			
		||||
39, 29.83, 12.04
 | 
			
		||||
40, 29.02, 11.88
 | 
			
		||||
41, 28.34, 11.45
 | 
			
		||||
42, 27.75, 11.33
 | 
			
		||||
43, 27.13, 10.96
 | 
			
		||||
44, 26.52, 10.69
 | 
			
		||||
45, 26.02, 10.43
 | 
			
		||||
46, 25.37, 10.24
 | 
			
		||||
47, 24.86, 10.07
 | 
			
		||||
48, 24.42, 9.76
 | 
			
		||||
49, 23.93, 9.85
 | 
			
		||||
50, 23.38, 9.44
 | 
			
		||||
51, 23.11, 9.33
 | 
			
		||||
52, 22.58, 9.01
 | 
			
		||||
53, 22.18, 8.95
 | 
			
		||||
54, 21.82, 8.78
 | 
			
		||||
55, 21.39, 8.56
 | 
			
		||||
56, 21.04, 8.45
 | 
			
		||||
57, 20.71, 8.30
 | 
			
		||||
58, 20.38, 8.10
 | 
			
		||||
59, 20.03, 7.99
 | 
			
		||||
60, 19.78, 7.77
 | 
			
		||||
61, 19.44, 7.64
 | 
			
		||||
62, 19.15, 7.55
 | 
			
		||||
63, 18.83, 7.46
 | 
			
		||||
64, 18.66, 7.29
 | 
			
		||||
65, 18.25, 7.19
 | 
			
		||||
66, 18.07, 7.09
 | 
			
		||||
67, 17.83, 7.02
 | 
			
		||||
68, 17.60, 6.90
 | 
			
		||||
69, 17.48, 6.84
 | 
			
		||||
70, 17.22, 6.78
 | 
			
		||||
71, 19.10, 6.74
 | 
			
		||||
72, 17.46, 6.83
 | 
			
		||||
		
		
			
  | 
@@ -1,39 +0,0 @@
 | 
			
		||||
#!/bin/bash -l
 | 
			
		||||
#SBATCH --job-name=Sim
 | 
			
		||||
#SBATCH --output=Sim_Fritz.o%j
 | 
			
		||||
#SBATCH --partition=singlenode
 | 
			
		||||
#SBATCH --nodes=1
 | 
			
		||||
#SBATCH --ntasks-per-node=21
 | 
			
		||||
#SBATCH --ntasks=21
 | 
			
		||||
#SBATCH --time=20:00:00
 | 
			
		||||
#SBATCH --constraint=hwperf
 | 
			
		||||
#SBATCH --export=NONE
 | 
			
		||||
#SBATCH --cpu-freq=2400000-2400000:performance
 | 
			
		||||
 | 
			
		||||
unset SLURM_EXPORT_ENV 
 | 
			
		||||
 | 
			
		||||
echo "Starting: $(date)"
 | 
			
		||||
 | 
			
		||||
export 
 | 
			
		||||
 | 
			
		||||
module load python intel/2022.1.0 intelmpi/2021.7.0 itac #likwid/5.2.2
 | 
			
		||||
module list
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
cd $SLURM_SUBMIT_DIR
 | 
			
		||||
 | 
			
		||||
rm result.csv
 | 
			
		||||
touch result.csv
 | 
			
		||||
echo "Rank, SOR, RB" >> result.csv
 | 
			
		||||
 | 
			
		||||
for i in $(seq 1 1 72)
 | 
			
		||||
do
 | 
			
		||||
    time="$i, "
 | 
			
		||||
 | 
			
		||||
    time+="$(srun --cpu-freq=2200000-2200000:performance -n $i ./exe-ICC poisson.par 1 | grep 'Solution took' | cut -c 15-)"
 | 
			
		||||
    time+=", "
 | 
			
		||||
    time+="$(srun --cpu-freq=2200000-2200000:performance -n $i ./exe-ICC poisson.par 2 | grep 'Solution took' | cut -c 15-)"
 | 
			
		||||
    time=${time//s}
 | 
			
		||||
    echo $time >> result.csv
 | 
			
		||||
done
 | 
			
		||||
@@ -7,6 +7,8 @@
 | 
			
		||||
#ifndef __SOLVER_H_
 | 
			
		||||
#define __SOLVER_H_
 | 
			
		||||
#include "parameter.h"
 | 
			
		||||
#include "timing.h"
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
typedef struct {
 | 
			
		||||
    double  dx, dy;
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user