AdityaUjeniya/NuSiF-Solver
1
0
Fork 0
forked from moebiusband/NuSiF-Solver
Code Pull Requests Activity

Remaining update

Browse Source
This commit is contained in:
Aditya Ujeniya
2024-09-19 13:12:09 +02:00
parent 1a1420890b
commit 85543dee11
40 changed files with 161 additions and 1023 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
EnhancedSolver/2D-mpi/config.mk
View File

@@ -1,5 +1,5 @@
# Supported: GCC, CLANG, ICC
TAG ?= ICC
# Supported: GCC, CLANG, ICX
TAG ?= ICX
# Supported: true, false
ENABLE_MPI ?= true
ENABLE_OPENMP ?= false

6
EnhancedSolver/2D-mpi/include_ICC.mk → EnhancedSolver/2D-mpi/include_ICX.mk
View File

@@ -1,8 +1,8 @@
ifeq ($(ENABLE_MPI),true)
CC = mpiicc
CC = mpiicx
DEFINES = -D_MPI
else
CC = icc
CC = icx
endif
GCC = gcc
@@ -13,7 +13,7 @@ OPENMP = -qopenmp
endif
VERSION = --version
CFLAGS = -O3 -xHost -qopt-zmm-usage=high -std=c99 $(OPENMP)
CFLAGS = -O3 -xHost -qopt-zmm-usage=high -std=c99 $(OPENMP) -Wno-unused-command-line-argument
LFLAGS = $(OPENMP)
DEFINES += -D_GNU_SOURCE# -DDEBUG
INCLUDES =

15
EnhancedSolver/2D-mpi/src/comm-v1.c
View File

@@ -9,17 +9,6 @@
#include "comm.h"
#ifdef _MPI
// subroutines local to this module
static int sum(int* sizes, int position)
{
int sum = 0;
for (int i = 0; i < position; i += position) {
sum += sizes[i];
}
return sum;
}
static void gatherArray(
Comm* c, int cnt, int* rcvCounts, int* displs, double* src, double* dst)
@@ -133,8 +122,8 @@ void commCollectResult(Comm* c,
double* u,
double* v,
double* p,
int jmax,
int imax)
int imax,
int jmax)
{
#ifdef _MPI
int *rcvCounts, *displs;

19
EnhancedSolver/2D-mpi/src/main.c
View File

@@ -17,6 +17,25 @@
#include "progress.h"
#include "timing.h"
static FILE* initResidualWriter()
{
FILE* fp;
fp = fopen("residual.dat", "w");
if (fp == NULL) {
printf("Error!\n");
exit(-1);
}
return fp;
}
static void writeResidual(FILE* fp, double ts, double res)
{
fprintf(fp, "%f, %f\n", ts, res);
}
static void writeResults(Discretization* s)
{
#ifdef _MPI

19
EnhancedSolver/2D-mpi/src/progress.c
View File

@@ -48,23 +48,4 @@ void stopProgress()
{
printf("\n");
fflush(stdout);
}
FILE* initResidualWriter()
{
FILE* fp;
fp = fopen("residual.dat", "w");
if (fp == NULL) {
printf("Error!\n");
exit(-1);
}
return fp;
}
void writeResidual(FILE* fp, double ts, double res)
{
fprintf(fp, "%f, %f\n", ts, res);
}

2
EnhancedSolver/2D-mpi/src/progress.h
View File

@@ -12,6 +12,4 @@
extern void initProgress(double);
extern void printProgress(double);
extern void stopProgress();
extern FILE* initResidualWriter(void);
extern void writeResidual(FILE*, double, double);
#endif

4
EnhancedSolver/2D-mpi/src/solver-mg.c
View File

@@ -133,7 +133,7 @@ static void setBoundaryCondition(Solver* s, double* p, int imaxLocal, int jmaxLo
#endif
}
static double smooth(Solver* s, double* p, double* rhs, int level, Comm* comm)
static void smooth(Solver* s, double* p, double* rhs, int level, Comm* comm)
{
int imaxLocal = comm->imaxLocal;
int jmaxLocal = comm->jmaxLocal;
@@ -253,6 +253,8 @@ static double multiGrid(Solver* s, double* p, double* rhs, int level, Comm* comm
// restrict
restrictMG(s, level, comm);
// Create a new comm object withupdated imaxLocal and jmaxLocal
// along with their updated bufferTypes, sdispls, rdispls
Comm newcomm;
commUpdateDatatypes(s->comm, &newcomm, comm->imaxLocal / 2, comm->jmaxLocal / 2);

4
EnhancedSolver/2D-seq/config.mk
View File

@@ -1,5 +1,5 @@
# Supported: GCC, CLANG, ICC
TAG ?= ICC
# Supported: GCC, CLANG, ICX
TAG ?= ICX
ENABLE_OPENMP ?= false
# Supported: sor, rb, mg
SOLVER ?= mg

2
EnhancedSolver/2D-seq/include_ICC.mk → EnhancedSolver/2D-seq/include_ICX.mk
View File

@@ -7,7 +7,7 @@ OPENMP = -qopenmp
endif
VERSION = --version
CFLAGS = -O3 -xHost -qopt-zmm-usage=high -std=c99 $(OPENMP)
CFLAGS = -O3 -xHost -qopt-zmm-usage=high -std=c99 $(OPENMP) -Wno-unused-command-line-argument
LFLAGS = $(OPENMP)
DEFINES = -D_GNU_SOURCE
INCLUDES =

19
EnhancedSolver/2D-seq/src/main.c
View File

@@ -15,6 +15,25 @@
#include "solver.h"
#include "timing.h"
static FILE* initResidualWriter()
{
FILE* fp;
fp = fopen("residual.dat", "w");
if (fp == NULL) {
printf("Error!\n");
exit(EXIT_FAILURE);
}
return fp;
}
static void writeResidual(FILE* fp, double ts, double res)
{
fprintf(fp, "%f, %f\n", ts, res);
}
int main(int argc, char** argv)
{
double timeStart, timeStop;

18
EnhancedSolver/2D-seq/src/progress.c
View File

@@ -49,21 +49,3 @@ void stopProgress()
printf("\n");
fflush(stdout);
}
FILE* initResidualWriter()
{
FILE* fp;
fp = fopen("residual.dat", "w");
if (fp == NULL) {
printf("Error!\n");
exit(EXIT_FAILURE);
}
return fp;
}
void writeResidual(FILE* fp, double ts, double res)
{
fprintf(fp, "%f, %f\n", ts, res);
}

2
EnhancedSolver/2D-seq/src/progress.h
View File

@@ -10,6 +10,4 @@
extern void initProgress(double);
extern void printProgress(double);
extern void stopProgress(void);
extern FILE* initResidualWriter(void);
extern void writeResidual(FILE*, double, double);
#endif

4
EnhancedSolver/3D-mpi/config.mk
View File

@@ -1,5 +1,5 @@
# Supported: GCC, CLANG, ICC
TAG ?= ICC
# Supported: GCC, CLANG, ICX
TAG ?= ICX
# Supported: true, false
ENABLE_MPI ?= true
ENABLE_OPENMP ?= false

6
EnhancedSolver/3D-mpi/include_ICC.mk → EnhancedSolver/3D-mpi/include_ICX.mk
View File

@@ -1,8 +1,8 @@
ifeq ($(ENABLE_MPI),true)
CC = mpiicc
CC = mpiicx
DEFINES = -D_MPI
else
CC = icc
CC = icx
endif
GCC = gcc
@@ -13,7 +13,7 @@ OPENMP = -qopenmp
endif
VERSION = --version
CFLAGS = -O3 -qopt-zmm-usage=high -std=c99 $(OPENMP) -xHost
CFLAGS = -O3 -qopt-zmm-usage=high -std=c99 $(OPENMP) -xHost -Wno-unused-command-line-argument
LFLAGS = $(OPENMP)
DEFINES += -D_GNU_SOURCE# -DDEBUG
INCLUDES =

19
EnhancedSolver/3D-mpi/src/main.c
View File

@@ -17,6 +17,24 @@
#include "timing.h"
#include "vtkWriter.h"
static FILE* initResidualWriter()
{
FILE* fp;
fp = fopen("residual.dat", "w");
if (fp == NULL) {
printf("Error!\n");
exit(EXIT_FAILURE);
}
return fp;
}
static void writeResidual(FILE* fp, double ts, double res)
{
fprintf(fp, "%f, %f\n", ts, res);
}
int main(int argc, char** argv)
{
double timeStart, timeStop;
@@ -46,7 +64,6 @@ int main(int argc, char** argv)
initSolver(&s, &d, &p);
initParticleTracer(&particletracer, &p, &d);
#ifndef VERBOSE
initProgress(d.te);
#endif

14
EnhancedSolver/3D-mpi/src/progress.c
View File

@@ -49,17 +49,3 @@ void stopProgress()
fflush(stdout);
}
FILE* initResidualWriter()
{
FILE* fp;
fp = fopen("residual.dat", "w");
if (fp == NULL) {
printf("Error!\n");
exit(EXIT_FAILURE);
}
return fp;
}
void writeResidual(FILE* fp, double ts, double res) { fprintf(fp, "%f, %f\n", ts, res); }

3
EnhancedSolver/3D-mpi/src/progress.h
View File

@@ -12,6 +12,5 @@
extern void initProgress(double);
extern void printProgress(double);
extern void stopProgress(void);
extern FILE* initResidualWriter(void);
extern void writeResidual(FILE*, double, double);
#endif

4
EnhancedSolver/3D-mpi/src/solver-mg.c
View File

@@ -172,7 +172,7 @@ static void setBoundaryCondition(
#endif
}
static double smooth(Solver* s, double* p, double* rhs, int level, Comm* comm)
static void smooth(Solver* s, double* p, double* rhs, int level, Comm* comm)
{
int imaxLocal = comm->imaxLocal;
int jmaxLocal = comm->jmaxLocal;
@@ -316,6 +316,8 @@ static double multiGrid(Solver* s, double* p, double* rhs, int level, Comm* comm
// restrict
restrictMG(s, level, comm);
// Create a new comm object withupdated imaxLocal and jmaxLocal
// along with their updated bufferTypes, sdispls, rdispls
Comm newcomm;
commUpdateDatatypes(s->comm, &newcomm, imaxLocal, jmaxLocal, kmaxLocal);

4
EnhancedSolver/3D-seq/config.mk
View File

@@ -1,5 +1,5 @@
# Supported: GCC, CLANG, ICC
TAG ?= ICC
# Supported: GCC, CLANG, ICX
TAG ?= ICX
ENABLE_OPENMP ?= false
# Supported: rb, mg
SOLVER ?= mg

4
EnhancedSolver/3D-seq/include_ICC.mk → EnhancedSolver/3D-seq/include_ICX.mk
View File

@@ -1,4 +1,4 @@
CC = icc
CC = icx
GCC = gcc
LINKER = $(CC)
@@ -7,7 +7,7 @@ OPENMP = -qopenmp
endif
VERSION = --version
CFLAGS = -O3 -xHost -qopt-zmm-usage=high -std=c99 $(OPENMP)
CFLAGS = -O3 -xHost -qopt-zmm-usage=high -std=c99 $(OPENMP) -Wno-unused-command-line-argument
LFLAGS = $(OPENMP)
DEFINES = -D_GNU_SOURCE
INCLUDES =

19
EnhancedSolver/3D-seq/src/main.c
View File

@@ -19,6 +19,25 @@
#define G(v, i, j, k) v[(k) * (imax + 2) * (jmax + 2) + (j) * (imax + 2) + (i)]
static FILE* initResidualWriter()
{
FILE* fp;
fp = fopen("residual.dat", "w");
if (fp == NULL) {
printf("Error!\n");
exit(EXIT_FAILURE);
}
return fp;
}
static void writeResidual(FILE* fp, double ts, double res)
{
fprintf(fp, "%f, %f\n", ts, res);
}
static void createBulkArrays(
Discretization* s, double* pg, double* ug, double* vg, double* wg)
{

18
EnhancedSolver/3D-seq/src/progress.c
View File

@@ -50,21 +50,3 @@ void stopProgress()
fflush(stdout);
}
FILE* initResidualWriter()
{
FILE* fp;
fp = fopen("residual.dat", "w");
if (fp == NULL) {
printf("Error!\n");
exit(EXIT_FAILURE);
}
return fp;
}
void writeResidual(FILE* fp, double ts, double res)
{
fprintf(fp, "%f, %f\n", ts, res);
}

3
EnhancedSolver/3D-seq/src/progress.h
View File

@@ -10,6 +10,5 @@
extern void initProgress(double);
extern void printProgress(double);
extern void stopProgress(void);
extern FILE* initResidualWriter(void);
extern void writeResidual(FILE*, double, double);
#endif

2
EnhancedSolver/3D-seq/src/solver-mg.c
View File

@@ -112,7 +112,7 @@ static void setBoundaryCondition(double* p, int imax, int jmax, int kmax)
}
}
static double smooth(
static void smooth(
Solver* s, double* p, double* rhs, int level, int imax, int jmax, int kmax)
{
double eps = s->eps;