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

Reformat license header

Browse Source
This commit is contained in:
Jan Eitzinger
2024-11-01 08:40:57 +01:00
parent 002275e633
commit b2f9d41582
9 changed files with 52 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
PoissonSolver/2D-seq/src/allocate.h
View File

@@ -1,9 +1,7 @@
/* /* Copyright (C) NHR@FAU, University Erlangen-Nuremberg.
* Copyright (C) 2022 NHR@FAU, University Erlangen-Nuremberg.
* All rights reserved. * All rights reserved.
* Use of this source code is governed by a MIT-style * Use of this source code is governed by a MIT-style
* license that can be found in the LICENSE file. * license that can be found in the LICENSE file. */
*/
#ifndef __ALLOCATE_H_ #ifndef __ALLOCATE_H_
#define __ALLOCATE_H_ #define __ALLOCATE_H_
#include <stdlib.h> #include <stdlib.h>

16
PoissonSolver/2D-seq/src/main.c
View File

@@ -1,14 +1,9 @@
/* /* Copyright (C) NHR@FAU, University Erlangen-Nuremberg.ke
* Copyright (C) 2022 NHR@FAU, University Erlangen-Nuremberg.
* All rights reserved. * All rights reserved.
* Use of this source code is governed by a MIT-style * Use of this source code is governed by a MIT-style
* license that can be found in the LICENSE file. * license that can be found in the LICENSE file. */
*/
#include <float.h>
#include <limits.h>
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <unistd.h>
#include "likwid-marker.h" #include "likwid-marker.h"
#include "parameter.h" #include "parameter.h"
@@ -44,11 +39,12 @@ int main(int argc, char** argv)
variant = atoi(argv[2]); variant = atoi(argv[2]);
} }
if (argc == 4) { if (argc == 4) {
sscanf("%lf", argv[2], &params.omg); sscanf("%lf", argv[3], &params.omg);
sscanf("%lf", argv[2], &params.rho);
} }
initSolver(&solver, &params, 2); initSolver(&solver, &params, 2);
writeResult(&solver, "p-init.dat");
switch (variant) { switch (variant) {
case SOR: case SOR:
printf("Plain SOR\n"); printf("Plain SOR\n");
@@ -64,7 +60,7 @@ int main(int argc, char** argv)
break; break;
} }
printf(" %.2fs\n", endTime - startTime); printf(" %.2fs\n", endTime - startTime);
// writeResult(&solver); writeResult(&solver, "p-final.dat");
LIKWID_MARKER_CLOSE; LIKWID_MARKER_CLOSE;
return EXIT_SUCCESS; return EXIT_SUCCESS;

10
PoissonSolver/2D-seq/src/parameter.c
View File

@@ -1,9 +1,7 @@
/* /* Copyright (C) NHR@FAU, University Erlangen-Nuremberg.
* Copyright (C) 2022 NHR@FAU, University Erlangen-Nuremberg. * All rights reserved.
* All rights reserved. This file is part of nusif-solver. * Use of this source code is governed by a MIT-style
* Use of this source code is governed by a MIT style * license that can be found in the LICENSE file. */
* license that can be found in the LICENSE file.
*/
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>

10
PoissonSolver/2D-seq/src/parameter.h
View File

@@ -1,9 +1,7 @@
/* /* Copyright (C) NHR@FAU, University Erlangen-Nuremberg.
* Copyright (C) 2022 NHR@FAU, University Erlangen-Nuremberg. * All rights reserved.
* All rights reserved. This file is part of nusif-solver. * Use of this source code is governed by a MIT-style
* Use of this source code is governed by a MIT style * license that can be found in the LICENSE file. */
* license that can be found in the LICENSE file.
*/
#ifndef __PARAMETER_H_ #ifndef __PARAMETER_H_
#define __PARAMETER_H_ #define __PARAMETER_H_

28
PoissonSolver/2D-seq/src/solver.c
View File

@@ -1,9 +1,7 @@
/* /* Copyright (C) NHR@FAU, University Erlangen-Nuremberg.
* Copyright (C) 2022 NHR@FAU, University Erlangen-Nuremberg. * All rights reserved.
* All rights reserved. This file is part of nusif-solver. * Use of this source code is governed by a MIT-style
* Use of this source code is governed by a MIT style * license that can be found in the LICENSE file. */
* license that can be found in the LICENSE file.
*/
#include "math.h" #include "math.h"
#include "stdio.h" #include "stdio.h"
#include "stdlib.h" #include "stdlib.h"
@@ -75,6 +73,7 @@ void solve(Solver* solver)
double epssq = eps * eps; double epssq = eps * eps;
int it = 0; int it = 0;
double res = 1.0; double res = 1.0;
char filename[20];
while ((res >= epssq) && (it < itermax)) { while ((res >= epssq) && (it < itermax)) {
res = 0.0; res = 0.0;
@@ -104,11 +103,14 @@ void solve(Solver* solver)
res = res / (double)(imax * jmax); res = res / (double)(imax * jmax);
#ifdef DEBUG #ifdef DEBUG
printf("%d Residuum: %e\n", it, res); printf("%d Residuum: %e\n", it, res);
#endif
#ifdef ANIMATE
sprintf(filename, "p-%d.dat", it);
writeResult(solver, filename);
#endif #endif
it++; it++;
} }
// printf("Solver took %d iterations to reach %f\n", it, sqrt(res));
printf("%d, %f\n", it, solver->omega); printf("%d, %f\n", it, solver->omega);
} }
@@ -165,6 +167,10 @@ void solveRB(Solver* solver)
res = res / (double)(imax * jmax); res = res / (double)(imax * jmax);
#ifdef DEBUG #ifdef DEBUG
printf("%d Residuum: %e\n", it, res); printf("%d Residuum: %e\n", it, res);
#endif
#ifdef ANIMATE
sprintf(filename, "p-%d.dat", it);
writeResult(solver, filename);
#endif #endif
it++; it++;
} }
@@ -230,6 +236,10 @@ void solveRBA(Solver* solver)
res = res / (double)(imax * jmax); res = res / (double)(imax * jmax);
#ifdef DEBUG #ifdef DEBUG
printf("%d Residuum: %e Omega: %e\n", it, res, omega); printf("%d Residuum: %e Omega: %e\n", it, res, omega);
#endif
#ifdef ANIMATE
sprintf(filename, "p-%d.dat", it);
writeResult(solver, filename);
#endif #endif
it++; it++;
} }
@@ -239,14 +249,14 @@ void solveRBA(Solver* solver)
printf("%d, %f\n", it, omega); printf("%d, %f\n", it, omega);
} }
void writeResult(Solver* solver) void writeResult(Solver* solver, char* filename)
{ {
int imax = solver->imax; int imax = solver->imax;
int jmax = solver->jmax; int jmax = solver->jmax;
double* p = solver->p; double* p = solver->p;
FILE* fp; FILE* fp;
fp = fopen("p.dat", "w"); fp = fopen(filename, "w");
if (fp == NULL) { if (fp == NULL) {
printf("Error!\n"); printf("Error!\n");

12
PoissonSolver/2D-seq/src/solver.h
View File

@@ -1,9 +1,7 @@
/* /* Copyright (C) NHR@FAU, University Erlangen-Nuremberg.
* Copyright (C) 2022 NHR@FAU, University Erlangen-Nuremberg. * All rights reserved.
* All rights reserved. This file is part of nusif-solver. * Use of this source code is governed by a MIT-style
* Use of this source code is governed by a MIT style * license that can be found in the LICENSE file. */
* license that can be found in the LICENSE file.
*/
#ifndef __SOLVER_H_ #ifndef __SOLVER_H_
#define __SOLVER_H_ #define __SOLVER_H_
#include "parameter.h" #include "parameter.h"
@@ -17,7 +15,7 @@ typedef struct {
} Solver; } Solver;
extern void initSolver(Solver*, Parameter*, int problem); extern void initSolver(Solver*, Parameter*, int problem);
extern void writeResult(Solver*); extern void writeResult(Solver*, char*);
extern void solve(Solver*); extern void solve(Solver*);
extern void solveRB(Solver*); extern void solveRB(Solver*);
extern void solveRBA(Solver*); extern void solveRBA(Solver*);

11
PoissonSolver/2D-seq/src/timing.c
View File

@@ -1,9 +1,7 @@
/* /* Copyright (C) NHR@FAU, University Erlangen-Nuremberg.
* Copyright (C) 2022 NHR@FAU, University Erlangen-Nuremberg.
* All rights reserved. * All rights reserved.
* Use of this source code is governed by a MIT-style * Use of this source code is governed by a MIT-style
* license that can be found in the LICENSE file. * license that can be found in the LICENSE file. */
*/
#include <stdlib.h> #include <stdlib.h>
#include <time.h> #include <time.h>
@@ -21,7 +19,4 @@ double getTimeResolution()
return (double)ts.tv_sec + (double)ts.tv_nsec * 1.e-9; return (double)ts.tv_sec + (double)ts.tv_nsec * 1.e-9;
} }
double getTimeStamp_() double getTimeStamp_() { return getTimeStamp(); }
{
return getTimeStamp();
}

7
PoissonSolver/2D-seq/src/timing.h
View File

@@ -1,14 +1,11 @@
/* /* Copyright (C) NHR@FAU, University Erlangen-Nuremberg.
* Copyright (C) 2022 NHR@FAU, University Erlangen-Nuremberg.
* All rights reserved. * All rights reserved.
* Use of this source code is governed by a MIT-style * Use of this source code is governed by a MIT-style
* license that can be found in the LICENSE file. * license that can be found in the LICENSE file. */
*/
#ifndef __TIMING_H_ #ifndef __TIMING_H_
#define __TIMING_H_ #define __TIMING_H_
extern double getTimeStamp(); extern double getTimeStamp();
extern double getTimeResolution(); extern double getTimeResolution();
extern double getTimeStamp_();
#endif // __TIMING_H_ #endif // __TIMING_H_

9
PoissonSolver/2D-seq/src/util.h
View File

@@ -1,12 +1,11 @@
/* /* Copyright (C) NHR@FAU, University Erlangen-Nuremberg.
* Copyright (C) 2022 NHR@FAU, University Erlangen-Nuremberg.
* All rights reserved. * All rights reserved.
* Use of this source code is governed by a MIT-style * Use of this source code is governed by a MIT-style
* license that can be found in the LICENSE file. * license that can be found in the LICENSE file. */
*/
#ifndef __UTIL_H_ #ifndef __UTIL_H_
#define __UTIL_H_ #define __UTIL_H_
#define HLINE "----------------------------------------------------------------------------\n" #define HLINE \
"----------------------------------------------------------------------------\n"
#ifndef MIN #ifndef MIN
#define MIN(x, y) ((x) < (y) ? (x) : (y)) #define MIN(x, y) ((x) < (y) ? (x) : (y))