Merge branch 'main' of git.clustercockpit.org:moebiusband/NuSiF-Solver

BasicSolver/3D-mpi/include_ICC.mk

@@ -1,11 +1,11 @@
 ifeq ($(ENABLE_MPI),true)
-CC   = mpiicc
+CC = mpiicc
 DEFINES  = -D_MPI
 else
-CC   = icc
+CC = icc
 endif
 
-GCC  = gcc
+GCC = gcc
 LINKER = $(CC)
 
 ifeq ($(ENABLE_OPENMP),true)
@@ -15,6 +15,6 @@ endif
 VERSION  = --version
 CFLAGS   =  -O3 -xHost -qopt-zmm-usage=high -std=c99 $(OPENMP)
 LFLAGS   = $(OPENMP)
-DEFINES  += -D_GNU_SOURCE
+DEFINES  += -D_GNU_SOURCE# -DDEBUG
 INCLUDES =
 LIBS     =

BasicSolver/3D-mpi/src/main.c

@@ -71,6 +71,7 @@ int main(int argc, char** argv)
         printf("Solution took %.2fs\n", timeStop - timeStart);
     }
 
+    timeStart = getTimeStamp();
 #ifdef _VTK_WRITER_MPI
     VtkOptions opts = { .grid = s.grid, .comm = s.comm };
     vtkOpen(&opts, s.problem);
@@ -111,6 +112,12 @@ int main(int argc, char** argv)
     }
 #endif
 
+    timeStop = getTimeStamp();
+
+    if (commIsMaster(&s.comm)) {
+        printf("Result output took %.2fs\n", timeStop - timeStart);
+    }
+
     commFinalize(&s.comm);
     return EXIT_SUCCESS;
 }

BasicSolver/3D-mpi/src/vtkWriter-mpi.c

@@ -91,8 +91,7 @@ void vtkScalar(VtkOptions* o, char* name, double* s)
     char header[100];
     char* cursor = header;
 
-    cursor += sprintf(cursor, "SCALARS %s double 1\n", name);
-    cursor += sprintf(cursor, "LOOKUP_TABLE default\n");
+    cursor += sprintf(cursor, "SCALARS %s double\n", name);
 
     if (commIsMaster(&o->comm)) {
         MPI_File_write(o->fh, header, (int)strlen(header), MPI_CHAR, MPI_STATUS_IGNORE);