diff --git a/BasicSolver/2D-seq/config.mk b/BasicSolver/2D-seq/config.mk
index 0b2c509..bdb36d8 100644
--- a/BasicSolver/2D-seq/config.mk
+++ b/BasicSolver/2D-seq/config.mk
@@ -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
diff --git a/EnhancedSolver/2D-seq/include_ICC.mk b/BasicSolver/2D-seq/include_ICX.mk
similarity index 65%
rename from EnhancedSolver/2D-seq/include_ICC.mk
rename to BasicSolver/2D-seq/include_ICX.mk
index d0c2a1b..3eed5ed 100644
--- a/EnhancedSolver/2D-seq/include_ICC.mk
+++ b/BasicSolver/2D-seq/include_ICX.mk
@@ -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 =
diff --git a/BasicSolver/2D-seq/src/main.c b/BasicSolver/2D-seq/src/main.c
index 5f617fa..96fd9aa 100644
--- a/BasicSolver/2D-seq/src/main.c
+++ b/BasicSolver/2D-seq/src/main.c
@@ -14,6 +14,26 @@
 #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;
diff --git a/BasicSolver/2D-seq/src/progress.c b/BasicSolver/2D-seq/src/progress.c
index bcf6e5f..7b3f126 100644
--- a/BasicSolver/2D-seq/src/progress.c
+++ b/BasicSolver/2D-seq/src/progress.c
@@ -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(EXIT_FAILURE);
-    }
-
-    return fp;
-
-}
-
-void writeResidual(FILE* fp, double ts, double res)
-{
-    fprintf(fp, "%f, %f\n", ts, res);
-}
+}
\ No newline at end of file
diff --git a/BasicSolver/2D-seq/src/progress.h b/BasicSolver/2D-seq/src/progress.h
index a79ecfe..314e921 100644
--- a/BasicSolver/2D-seq/src/progress.h
+++ b/BasicSolver/2D-seq/src/progress.h
@@ -10,7 +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
diff --git a/BasicSolver/2D-seq/src/solver-mg.c b/BasicSolver/2D-seq/src/solver-mg.c
index acd3d3b..395d536 100644
--- a/BasicSolver/2D-seq/src/solver-mg.c
+++ b/BasicSolver/2D-seq/src/solver-mg.c
@@ -71,7 +71,7 @@ static void setBoundaryCondition(double* p, int imax, int jmax)
     }
 }
 
-static double smooth(Solver* s, double* p, double* rhs, int level, int imax, int jmax)
+static void smooth(Solver* s, double* p, double* rhs, int level, int imax, int jmax)
 {
     double dx2    = s->grid->dx * s->grid->dx;
     double dy2    = s->grid->dy * s->grid->dy;
diff --git a/BasicSolver/3D-mpi/config.mk b/BasicSolver/3D-mpi/config.mk
index 0dbe440..9781cb4 100644
--- a/BasicSolver/3D-mpi/config.mk
+++ b/BasicSolver/3D-mpi/config.mk
@@ -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
diff --git a/EnhancedSolver/3D-mpi/include_ICC.mk b/BasicSolver/3D-mpi/include_ICX.mk
similarity index 66%
rename from EnhancedSolver/3D-mpi/include_ICC.mk
rename to BasicSolver/3D-mpi/include_ICX.mk
index 1ffac3a..fac06d2 100644
--- a/EnhancedSolver/3D-mpi/include_ICC.mk
+++ b/BasicSolver/3D-mpi/include_ICX.mk
@@ -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 -xHost -qopt-zmm-usage=high -std=c99 $(OPENMP) -Wno-unused-command-line-argument
 LFLAGS   = $(OPENMP)
 DEFINES  += -D_GNU_SOURCE# -DDEBUG
 INCLUDES =
diff --git a/BasicSolver/3D-mpi/src/solver-mg.c b/BasicSolver/3D-mpi/src/solver-mg.c
index 27b1b18..394d41d 100644
--- a/BasicSolver/3D-mpi/src/solver-mg.c
+++ b/BasicSolver/3D-mpi/src/solver-mg.c
@@ -181,7 +181,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;
@@ -325,6 +325,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,
diff --git a/BasicSolver/3D-mpi/src/solver.c b/BasicSolver/3D-mpi/src/solver.c
deleted file mode 100644
index 121b4dc..0000000
--- a/BasicSolver/3D-mpi/src/solver.c
+++ /dev/null
@@ -1,853 +0,0 @@
-/*
- * Copyright (C)  NHR@FAU, University Erlangen-Nuremberg.
- * All rights reserved. This file is part of nusif-solver.
- * Use of this source code is governed by a MIT style
- * license that can be found in the LICENSE file.
- */
-#include <float.h>
-#include <math.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include "allocate.h"
-#include "comm.h"
-#include "parameter.h"
-#include "solver.h"
-#include "util.h"
-
-#define P(i, j, k)                                                                       \
-    p[(k) * (imaxLocal + 2) * (jmaxLocal + 2) + (j) * (imaxLocal + 2) + (i)]
-#define F(i, j, k)                                                                       \
-    f[(k) * (imaxLocal + 2) * (jmaxLocal + 2) + (j) * (imaxLocal + 2) + (i)]
-#define G(i, j, k)                                                                       \
-    g[(k) * (imaxLocal + 2) * (jmaxLocal + 2) + (j) * (imaxLocal + 2) + (i)]
-#define H(i, j, k)                                                                       \
-    h[(k) * (imaxLocal + 2) * (jmaxLocal + 2) + (j) * (imaxLocal + 2) + (i)]
-#define U(i, j, k)                                                                       \
-    u[(k) * (imaxLocal + 2) * (jmaxLocal + 2) + (j) * (imaxLocal + 2) + (i)]
-#define V(i, j, k)                                                                       \
-    v[(k) * (imaxLocal + 2) * (jmaxLocal + 2) + (j) * (imaxLocal + 2) + (i)]
-#define W(i, j, k)                                                                       \
-    w[(k) * (imaxLocal + 2) * (jmaxLocal + 2) + (j) * (imaxLocal + 2) + (i)]
-#define RHS(i, j, k)                                                                     \
-    rhs[(k) * (imaxLocal + 2) * (jmaxLocal + 2) + (j) * (imaxLocal + 2) + (i)]
-
-static void printConfig(Solver* s)
-{
-    if (commIsMaster(&s->comm)) {
-        printf("Parameters for #%s#\n", s->problem);
-        printf("BC Left:%d Right:%d Bottom:%d Top:%d Front:%d Back:%d\n",
-            s->bcLeft,
-            s->bcRight,
-            s->bcBottom,
-            s->bcTop,
-            s->bcFront,
-            s->bcBack);
-        printf("\tReynolds number: %.2f\n", s->re);
-        printf("\tGx Gy: %.2f %.2f %.2f\n", s->gx, s->gy, s->gz);
-        printf("Geometry data:\n");
-        printf("\tDomain box size (x, y, z): %.2f, %.2f, %.2f\n",
-            s->grid.xlength,
-            s->grid.ylength,
-            s->grid.zlength);
-        printf("\tCells (x, y, z): %d, %d, %d\n",
-            s->grid.imax,
-            s->grid.jmax,
-            s->grid.kmax);
-        printf("\tCell size (dx, dy, dz): %f, %f, %f\n",
-            s->grid.dx,
-            s->grid.dy,
-            s->grid.dz);
-        printf("Timestep parameters:\n");
-        printf("\tDefault stepsize: %.2f, Final time %.2f\n", s->dt, s->te);
-        printf("\tdt bound: %.6f\n", s->dtBound);
-        printf("\tTau factor: %.2f\n", s->tau);
-        printf("Iterative parameters:\n");
-        printf("\tMax iterations: %d\n", s->itermax);
-        printf("\tepsilon (stopping tolerance) : %f\n", s->eps);
-        printf("\tgamma factor: %f\n", s->gamma);
-        printf("\tomega (SOR relaxation): %f\n", s->omega);
-    }
-    commPrintConfig(&s->comm);
-}
-
-void initSolver(Solver* s, Parameter* params)
-{
-    s->problem  = params->name;
-    s->bcLeft   = params->bcLeft;
-    s->bcRight  = params->bcRight;
-    s->bcBottom = params->bcBottom;
-    s->bcTop    = params->bcTop;
-    s->bcFront  = params->bcFront;
-    s->bcBack   = params->bcBack;
-
-    s->grid.imax    = params->imax;
-    s->grid.jmax    = params->jmax;
-    s->grid.kmax    = params->kmax;
-    s->grid.xlength = params->xlength;
-    s->grid.ylength = params->ylength;
-    s->grid.zlength = params->zlength;
-    s->grid.dx      = params->xlength / params->imax;
-    s->grid.dy      = params->ylength / params->jmax;
-    s->grid.dz      = params->zlength / params->kmax;
-
-    s->eps     = params->eps;
-    s->omega   = params->omg;
-    s->itermax = params->itermax;
-    s->re      = params->re;
-    s->gx      = params->gx;
-    s->gy      = params->gy;
-    s->gz      = params->gz;
-    s->dt      = params->dt;
-    s->te      = params->te;
-    s->tau     = params->tau;
-    s->gamma   = params->gamma;
-
-    /* allocate arrays */
-    int imaxLocal = s->comm.imaxLocal;
-    int jmaxLocal = s->comm.jmaxLocal;
-    int kmaxLocal = s->comm.kmaxLocal;
-    size_t size   = (imaxLocal + 2) * (jmaxLocal + 2) * (kmaxLocal + 2);
-
-    s->u   = allocate(64, size * sizeof(double));
-    s->v   = allocate(64, size * sizeof(double));
-    s->w   = allocate(64, size * sizeof(double));
-    s->p   = allocate(64, size * sizeof(double));
-    s->rhs = allocate(64, size * sizeof(double));
-    s->f   = allocate(64, size * sizeof(double));
-    s->g   = allocate(64, size * sizeof(double));
-    s->h   = allocate(64, size * sizeof(double));
-
-    for (int i = 0; i < size; i++) {
-        s->u[i]   = params->u_init;
-        s->v[i]   = params->v_init;
-        s->w[i]   = params->w_init;
-        s->p[i]   = params->p_init;
-        s->rhs[i] = 0.0;
-        s->f[i]   = 0.0;
-        s->g[i]   = 0.0;
-        s->h[i]   = 0.0;
-    }
-
-    double dx = s->grid.dx;
-    double dy = s->grid.dy;
-    double dz = s->grid.dz;
-
-    double invSqrSum = 1.0 / (dx * dx) + 1.0 / (dy * dy) + 1.0 / (dz * dz);
-    s->dtBound       = 0.5 * s->re * 1.0 / invSqrSum;
-
-#ifdef VERBOSE
-    printConfig(s);
-#endif /* VERBOSE */
-}
-
-void computeRHS(Solver* s)
-{
-    int imaxLocal = s->comm.imaxLocal;
-    int jmaxLocal = s->comm.jmaxLocal;
-    int kmaxLocal = s->comm.kmaxLocal;
-
-    double idx = 1.0 / s->grid.dx;
-    double idy = 1.0 / s->grid.dy;
-    double idz = 1.0 / s->grid.dz;
-    double idt = 1.0 / s->dt;
-
-    double* rhs = s->rhs;
-    double* f   = s->f;
-    double* g   = s->g;
-    double* h   = s->h;
-
-    commShift(&s->comm, f, g, h);
-
-    for (int k = 1; k < kmaxLocal + 1; k++) {
-        for (int j = 1; j < jmaxLocal + 1; j++) {
-            for (int i = 1; i < imaxLocal + 1; i++) {
-                RHS(i, j, k) = ((F(i, j, k) - F(i - 1, j, k)) * idx +
-                                   (G(i, j, k) - G(i, j - 1, k)) * idy +
-                                   (H(i, j, k) - H(i, j, k - 1)) * idz) *
-                               idt;
-            }
-        }
-    }
-}
-
-void solve(Solver* s)
-{
-    int imaxLocal = s->comm.imaxLocal;
-    int jmaxLocal = s->comm.jmaxLocal;
-    int kmaxLocal = s->comm.kmaxLocal;
-
-    int imax = s->grid.imax;
-    int jmax = s->grid.jmax;
-    int kmax = s->grid.kmax;
-
-    double eps  = s->eps;
-    int itermax = s->itermax;
-    double dx2  = s->grid.dx * s->grid.dx;
-    double dy2  = s->grid.dy * s->grid.dy;
-    double dz2  = s->grid.dz * s->grid.dz;
-    double idx2 = 1.0 / dx2;
-    double idy2 = 1.0 / dy2;
-    double idz2 = 1.0 / dz2;
-
-    double factor = s->omega * 0.5 * (dx2 * dy2 * dz2) /
-                    (dy2 * dz2 + dx2 * dz2 + dx2 * dy2);
-    double* p    = s->p;
-    double* rhs  = s->rhs;
-    double epssq = eps * eps;
-    int it       = 0;
-    double res   = 1.0;
-    int pass, ksw, jsw, isw;
-
-    while ((res >= epssq) && (it < itermax)) {
-        ksw = 1;
-
-        for (pass = 0; pass < 2; pass++) {
-            jsw = ksw;
-            commExchange(&s->comm, p);
-
-        for (int k = 1; k < kmaxLocal + 1; k++) {
-                isw = jsw;
-            for (int j = 1; j < jmaxLocal + 1; j++) {
-                    for (int i = isw; i < imaxLocal + 1; i += 2) {
-
-                        double r =
-                            RHS(i, j, k) -
-                            ((P(i + 1, j, k) - 2.0 * P(i, j, k) + P(i - 1, j, k)) * idx2 +
-                                   (P(i, j + 1, k) - 2.0 * P(i, j, k) + P(i, j - 1, k)) *
-                                       idy2 +
-                                   (P(i, j, k + 1) - 2.0 * P(i, j, k) + P(i, j, k - 1)) *
-                                       idz2);
-
-                    P(i, j, k) -= (factor * r);
-                    res += (r * r);
-                }
-                    isw = 3 - isw;
-            }
-                jsw = 3 - jsw;
-            }
-            ksw = 3 - ksw;
-        }
-
-        if (commIsBoundary(&s->comm, FRONT)) {
-            for (int j = 1; j < jmaxLocal + 1; j++) {
-                for (int i = 1; i < imaxLocal + 1; i++) {
-                    P(i, j, 0) = P(i, j, 1);
-                }
-            }
-        }
-
-        if (commIsBoundary(&s->comm, BACK)) {
-            for (int j = 1; j < jmaxLocal + 1; j++) {
-                for (int i = 1; i < imaxLocal + 1; i++) {
-                    P(i, j, kmaxLocal + 1) = P(i, j, kmaxLocal);
-                }
-            }
-        }
-
-        if (commIsBoundary(&s->comm, BOTTOM)) {
-            for (int k = 1; k < kmaxLocal + 1; k++) {
-                for (int i = 1; i < imaxLocal + 1; i++) {
-                    P(i, 0, k) = P(i, 1, k);
-                }
-            }
-        }
-
-        if (commIsBoundary(&s->comm, TOP)) {
-            for (int k = 1; k < kmaxLocal + 1; k++) {
-                for (int i = 1; i < imaxLocal + 1; i++) {
-                    P(i, jmaxLocal + 1, k) = P(i, jmaxLocal, k);
-                }
-            }
-        }
-
-        if (commIsBoundary(&s->comm, LEFT)) {
-            for (int k = 1; k < kmaxLocal + 1; k++) {
-                for (int j = 1; j < jmaxLocal + 1; j++) {
-                    P(0, j, k) = P(1, j, k);
-                }
-            }
-        }
-
-        if (commIsBoundary(&s->comm, RIGHT)) {
-            for (int k = 1; k < kmaxLocal + 1; k++) {
-                for (int j = 1; j < jmaxLocal + 1; j++) {
-                    P(imaxLocal + 1, j, k) = P(imaxLocal, j, k);
-                }
-            }
-        }
-
-        commReduction(&res, SUM);
-        res = res / (double)(imax * jmax * kmax);
-#ifdef DEBUG
-        if (commIsMaster(&s->comm)) {
-            printf("%d Residuum: %e\n", it, res);
-        }
-#endif
-        commExchange(&s->comm, p);
-        it++;
-    }
-
-#ifdef VERBOSE
-    if (commIsMaster(&s->comm)) {
-        printf("Solver took %d iterations to reach %f\n", it, sqrt(res));
-    }
-#endif
-}
-
-static double maxElement(Solver* s, double* m)
-{
-    int size = (s->comm.imaxLocal + 2) * (s->comm.jmaxLocal + 2) *
-               (s->comm.kmaxLocal + 2);
-    double maxval = DBL_MIN;
-
-    for (int i = 0; i < size; i++) {
-        maxval = MAX(maxval, fabs(m[i]));
-    }
-    commReduction(&maxval, MAX);
-    return maxval;
-}
-
-void normalizePressure(Solver* s)
-{
-    int imaxLocal = s->comm.imaxLocal;
-    int jmaxLocal = s->comm.jmaxLocal;
-    int kmaxLocal = s->comm.kmaxLocal;
-
-    double* p   = s->p;
-    double avgP = 0.0;
-
-    for (int k = 1; k < kmaxLocal + 1; k++) {
-        for (int j = 1; j < jmaxLocal + 1; j++) {
-            for (int i = 1; i < imaxLocal + 1; i++) {
-                avgP += P(i, j, k);
-            }
-        }
-    }
-    commReduction(&avgP, SUM);
-    avgP /= (s->grid.imax * s->grid.jmax * s->grid.kmax);
-
-    for (int k = 1; k < kmaxLocal + 1; k++) {
-        for (int j = 1; j < jmaxLocal + 1; j++) {
-            for (int i = 1; i < imaxLocal + 1; i++) {
-                P(i, j, k) = P(i, j, k) - avgP;
-            }
-        }
-    }
-}
-
-void computeTimestep(Solver* s)
-{
-    double dt = s->dtBound;
-    double dx = s->grid.dx;
-    double dy = s->grid.dy;
-    double dz = s->grid.dz;
-
-    double umax = maxElement(s, s->u);
-    double vmax = maxElement(s, s->v);
-    double wmax = maxElement(s, s->w);
-
-    if (umax > 0) {
-        dt = (dt > dx / umax) ? dx / umax : dt;
-    }
-    if (vmax > 0) {
-        dt = (dt > dy / vmax) ? dy / vmax : dt;
-    }
-    if (wmax > 0) {
-        dt = (dt > dz / wmax) ? dz / wmax : dt;
-    }
-
-    s->dt = dt * s->tau;
-}
-
-void setBoundaryConditions(Solver* s)
-{
-    int imaxLocal = s->comm.imaxLocal;
-    int jmaxLocal = s->comm.jmaxLocal;
-    int kmaxLocal = s->comm.kmaxLocal;
-
-    double* u = s->u;
-    double* v = s->v;
-    double* w = s->w;
-
-    if (commIsBoundary(&s->comm, TOP)) {
-        switch (s->bcTop) {
-        case NOSLIP:
-            for (int k = 1; k < kmaxLocal + 1; k++) {
-                for (int i = 1; i < imaxLocal + 1; i++) {
-                    U(i, jmaxLocal + 1, k) = -U(i, jmaxLocal, k);
-                    V(i, jmaxLocal, k)     = 0.0;
-                    W(i, jmaxLocal + 1, k) = -W(i, jmaxLocal, k);
-                }
-            }
-            break;
-        case SLIP:
-            for (int k = 1; k < kmaxLocal + 1; k++) {
-                for (int i = 1; i < imaxLocal + 1; i++) {
-                    U(i, jmaxLocal + 1, k) = U(i, jmaxLocal, k);
-                    V(i, jmaxLocal, k)     = 0.0;
-                    W(i, jmaxLocal + 1, k) = W(i, jmaxLocal, k);
-                }
-            }
-            break;
-        case OUTFLOW:
-            for (int k = 1; k < kmaxLocal + 1; k++) {
-                for (int i = 1; i < imaxLocal + 1; i++) {
-                    U(i, jmaxLocal + 1, k) = U(i, jmaxLocal, k);
-                    V(i, jmaxLocal, k)     = V(i, jmaxLocal - 1, k);
-                    W(i, jmaxLocal + 1, k) = W(i, jmaxLocal, k);
-                }
-            }
-            break;
-        case PERIODIC:
-            break;
-        }
-    }
-
-    if (commIsBoundary(&s->comm, BOTTOM)) {
-        switch (s->bcBottom) {
-        case NOSLIP:
-            for (int k = 1; k < kmaxLocal + 1; k++) {
-                for (int i = 1; i < imaxLocal + 1; i++) {
-                    U(i, 0, k) = -U(i, 1, k);
-                    V(i, 0, k) = 0.0;
-                    W(i, 0, k) = -W(i, 1, k);
-                }
-            }
-            break;
-        case SLIP:
-            for (int k = 1; k < kmaxLocal + 1; k++) {
-                for (int i = 1; i < imaxLocal + 1; i++) {
-                    U(i, 0, k) = U(i, 1, k);
-                    V(i, 0, k) = 0.0;
-                    W(i, 0, k) = W(i, 1, k);
-                }
-            }
-            break;
-        case OUTFLOW:
-            for (int k = 1; k < kmaxLocal + 1; k++) {
-                for (int i = 1; i < imaxLocal + 1; i++) {
-                    U(i, 0, k) = U(i, 1, k);
-                    V(i, 0, k) = V(i, 1, k);
-                    W(i, 0, k) = W(i, 1, k);
-                }
-            }
-            break;
-        case PERIODIC:
-            break;
-        }
-    }
-
-    if (commIsBoundary(&s->comm, LEFT)) {
-        switch (s->bcLeft) {
-        case NOSLIP:
-            for (int k = 1; k < kmaxLocal + 1; k++) {
-                for (int j = 1; j < jmaxLocal + 1; j++) {
-                    U(0, j, k) = 0.0;
-                    V(0, j, k) = -V(1, j, k);
-                    W(0, j, k) = -W(1, j, k);
-                }
-            }
-            break;
-        case SLIP:
-            for (int k = 1; k < kmaxLocal + 1; k++) {
-                for (int j = 1; j < jmaxLocal + 1; j++) {
-                    U(0, j, k) = 0.0;
-                    V(0, j, k) = V(1, j, k);
-                    W(0, j, k) = W(1, j, k);
-                }
-            }
-            break;
-        case OUTFLOW:
-            for (int k = 1; k < kmaxLocal + 1; k++) {
-                for (int j = 1; j < jmaxLocal + 1; j++) {
-                    U(0, j, k) = U(1, j, k);
-                    V(0, j, k) = V(1, j, k);
-                    W(0, j, k) = W(1, j, k);
-                }
-            }
-            break;
-        case PERIODIC:
-            break;
-        }
-    }
-
-    if (commIsBoundary(&s->comm, RIGHT)) {
-        switch (s->bcRight) {
-        case NOSLIP:
-            for (int k = 1; k < kmaxLocal + 1; k++) {
-                for (int j = 1; j < jmaxLocal + 1; j++) {
-                    U(imaxLocal, j, k)     = 0.0;
-                    V(imaxLocal + 1, j, k) = -V(imaxLocal, j, k);
-                    W(imaxLocal + 1, j, k) = -W(imaxLocal, j, k);
-                }
-            }
-            break;
-        case SLIP:
-            for (int k = 1; k < kmaxLocal + 1; k++) {
-                for (int j = 1; j < jmaxLocal + 1; j++) {
-                    U(imaxLocal, j, k)     = 0.0;
-                    V(imaxLocal + 1, j, k) = V(imaxLocal, j, k);
-                    W(imaxLocal + 1, j, k) = W(imaxLocal, j, k);
-                }
-            }
-            break;
-        case OUTFLOW:
-            for (int k = 1; k < kmaxLocal + 1; k++) {
-                for (int j = 1; j < jmaxLocal + 1; j++) {
-                    U(imaxLocal, j, k)     = U(imaxLocal - 1, j, k);
-                    V(imaxLocal + 1, j, k) = V(imaxLocal, j, k);
-                    W(imaxLocal + 1, j, k) = W(imaxLocal, j, k);
-                }
-            }
-            break;
-        case PERIODIC:
-            break;
-        }
-    }
-
-    if (commIsBoundary(&s->comm, FRONT)) {
-        switch (s->bcFront) {
-        case NOSLIP:
-            for (int j = 1; j < jmaxLocal + 1; j++) {
-                for (int i = 1; i < imaxLocal + 1; i++) {
-                    U(i, j, 0) = -U(i, j, 1);
-                    V(i, j, 0) = -V(i, j, 1);
-                    W(i, j, 0) = 0.0;
-                }
-            }
-            break;
-        case SLIP:
-            for (int j = 1; j < jmaxLocal + 1; j++) {
-                for (int i = 1; i < imaxLocal + 1; i++) {
-                    U(i, j, 0) = U(i, j, 1);
-                    V(i, j, 0) = V(i, j, 1);
-                    W(i, j, 0) = 0.0;
-                }
-            }
-            break;
-        case OUTFLOW:
-            for (int j = 1; j < jmaxLocal + 1; j++) {
-                for (int i = 1; i < imaxLocal + 1; i++) {
-                    U(i, j, 0) = U(i, j, 1);
-                    V(i, j, 0) = V(i, j, 1);
-                    W(i, j, 0) = W(i, j, 1);
-                }
-            }
-            break;
-        case PERIODIC:
-            break;
-        }
-    }
-
-    if (commIsBoundary(&s->comm, BACK)) {
-        switch (s->bcBack) {
-        case NOSLIP:
-            for (int j = 1; j < jmaxLocal + 1; j++) {
-                for (int i = 1; i < imaxLocal + 1; i++) {
-                    U(i, j, kmaxLocal + 1) = -U(i, j, kmaxLocal);
-                    V(i, j, kmaxLocal + 1) = -V(i, j, kmaxLocal);
-                    W(i, j, kmaxLocal)     = 0.0;
-                }
-            }
-            break;
-        case SLIP:
-            for (int j = 1; j < jmaxLocal + 1; j++) {
-                for (int i = 1; i < imaxLocal + 1; i++) {
-                    U(i, j, kmaxLocal + 1) = U(i, j, kmaxLocal);
-                    V(i, j, kmaxLocal + 1) = V(i, j, kmaxLocal);
-                    W(i, j, kmaxLocal)     = 0.0;
-                }
-            }
-            break;
-        case OUTFLOW:
-            for (int j = 1; j < jmaxLocal + 1; j++) {
-                for (int i = 1; i < imaxLocal + 1; i++) {
-                    U(i, j, kmaxLocal + 1) = U(i, j, kmaxLocal);
-                    V(i, j, kmaxLocal + 1) = V(i, j, kmaxLocal);
-                    W(i, j, kmaxLocal)     = W(i, j, kmaxLocal - 1);
-                }
-            }
-            break;
-        case PERIODIC:
-            break;
-        }
-    }
-}
-
-void setSpecialBoundaryCondition(Solver* s)
-{
-    int imaxLocal = s->comm.imaxLocal;
-    int jmaxLocal = s->comm.jmaxLocal;
-    int kmaxLocal = s->comm.kmaxLocal;
-
-    double* u = s->u;
-
-    if (strcmp(s->problem, "dcavity") == 0) {
-        if (commIsBoundary(&s->comm, TOP)) {
-            for (int k = 1; k < kmaxLocal; k++) {
-                for (int i = 1; i < imaxLocal; i++) {
-                    U(i, jmaxLocal + 1, k) = 2.0 - U(i, jmaxLocal, k);
-                }
-            }
-        }
-    } else if (strcmp(s->problem, "canal") == 0) {
-        if (commIsBoundary(&s->comm, LEFT)) {
-            for (int k = 1; k < kmaxLocal + 1; k++) {
-                for (int j = 1; j < jmaxLocal + 1; j++) {
-                    U(0, j, k) = 2.0;
-                }
-            }
-        }
-    }
-}
-
-void computeFG(Solver* s)
-{
-    int imaxLocal = s->comm.imaxLocal;
-    int jmaxLocal = s->comm.jmaxLocal;
-    int kmaxLocal = s->comm.kmaxLocal;
-
-    double* u = s->u;
-    double* v = s->v;
-    double* w = s->w;
-    double* f = s->f;
-    double* g = s->g;
-    double* h = s->h;
-
-    double gx = s->gx;
-    double gy = s->gy;
-    double gz = s->gz;
-    double dt = s->dt;
-
-    double gamma     = s->gamma;
-    double inverseRe = 1.0 / s->re;
-    double inverseDx = 1.0 / s->grid.dx;
-    double inverseDy = 1.0 / s->grid.dy;
-    double inverseDz = 1.0 / s->grid.dz;
-    double du2dx, dv2dy, dw2dz;
-    double duvdx, duwdx, duvdy, dvwdy, duwdz, dvwdz;
-    double du2dx2, du2dy2, du2dz2;
-    double dv2dx2, dv2dy2, dv2dz2;
-    double dw2dx2, dw2dy2, dw2dz2;
-
-    commExchange(&s->comm, u);
-    commExchange(&s->comm, v);
-    commExchange(&s->comm, w);
-
-    for (int k = 1; k < kmaxLocal + 1; k++) {
-        for (int j = 1; j < jmaxLocal + 1; j++) {
-            for (int i = 1; i < imaxLocal + 1; i++) {
-                du2dx = inverseDx * 0.25 *
-                            ((U(i, j, k) + U(i + 1, j, k)) *
-                                    (U(i, j, k) + U(i + 1, j, k)) -
-                                (U(i, j, k) + U(i - 1, j, k)) *
-                                    (U(i, j, k) + U(i - 1, j, k))) +
-                        gamma * inverseDx * 0.25 *
-                            (fabs(U(i, j, k) + U(i + 1, j, k)) *
-                                    (U(i, j, k) - U(i + 1, j, k)) +
-                                fabs(U(i, j, k) + U(i - 1, j, k)) *
-                                    (U(i, j, k) - U(i - 1, j, k)));
-
-                duvdy = inverseDy * 0.25 *
-                            ((V(i, j, k) + V(i + 1, j, k)) *
-                                    (U(i, j, k) + U(i, j + 1, k)) -
-                                (V(i, j - 1, k) + V(i + 1, j - 1, k)) *
-                                    (U(i, j, k) + U(i, j - 1, k))) +
-                        gamma * inverseDy * 0.25 *
-                            (fabs(V(i, j, k) + V(i + 1, j, k)) *
-                                    (U(i, j, k) - U(i, j + 1, k)) +
-                                fabs(V(i, j - 1, k) + V(i + 1, j - 1, k)) *
-                                    (U(i, j, k) - U(i, j - 1, k)));
-
-                duwdz = inverseDz * 0.25 *
-                            ((W(i, j, k) + W(i + 1, j, k)) *
-                                    (U(i, j, k) + U(i, j, k + 1)) -
-                                (W(i, j, k - 1) + W(i + 1, j, k - 1)) *
-                                    (U(i, j, k) + U(i, j, k - 1))) +
-                        gamma * inverseDz * 0.25 *
-                            (fabs(W(i, j, k) + W(i + 1, j, k)) *
-                                    (U(i, j, k) - U(i, j, k + 1)) +
-                                fabs(W(i, j, k - 1) + W(i + 1, j, k - 1)) *
-                                    (U(i, j, k) - U(i, j, k - 1)));
-
-                du2dx2 = inverseDx * inverseDx *
-                         (U(i + 1, j, k) - 2.0 * U(i, j, k) + U(i - 1, j, k));
-                du2dy2 = inverseDy * inverseDy *
-                         (U(i, j + 1, k) - 2.0 * U(i, j, k) + U(i, j - 1, k));
-                du2dz2 = inverseDz * inverseDz *
-                         (U(i, j, k + 1) - 2.0 * U(i, j, k) + U(i, j, k - 1));
-                F(i, j, k) = U(i, j, k) + dt * (inverseRe * (du2dx2 + du2dy2 + du2dz2) -
-                                                   du2dx - duvdy - duwdz + gx);
-
-                duvdx = inverseDx * 0.25 *
-                            ((U(i, j, k) + U(i, j + 1, k)) *
-                                    (V(i, j, k) + V(i + 1, j, k)) -
-                                (U(i - 1, j, k) + U(i - 1, j + 1, k)) *
-                                    (V(i, j, k) + V(i - 1, j, k))) +
-                        gamma * inverseDx * 0.25 *
-                            (fabs(U(i, j, k) + U(i, j + 1, k)) *
-                                    (V(i, j, k) - V(i + 1, j, k)) +
-                                fabs(U(i - 1, j, k) + U(i - 1, j + 1, k)) *
-                                    (V(i, j, k) - V(i - 1, j, k)));
-
-                dv2dy = inverseDy * 0.25 *
-                            ((V(i, j, k) + V(i, j + 1, k)) *
-                                    (V(i, j, k) + V(i, j + 1, k)) -
-                                (V(i, j, k) + V(i, j - 1, k)) *
-                                    (V(i, j, k) + V(i, j - 1, k))) +
-                        gamma * inverseDy * 0.25 *
-                            (fabs(V(i, j, k) + V(i, j + 1, k)) *
-                                    (V(i, j, k) - V(i, j + 1, k)) +
-                                fabs(V(i, j, k) + V(i, j - 1, k)) *
-                                    (V(i, j, k) - V(i, j - 1, k)));
-
-                dvwdz = inverseDz * 0.25 *
-                            ((W(i, j, k) + W(i, j + 1, k)) *
-                                    (V(i, j, k) + V(i, j, k + 1)) -
-                                (W(i, j, k - 1) + W(i, j + 1, k - 1)) *
-                                    (V(i, j, k) + V(i, j, k + 1))) +
-                        gamma * inverseDz * 0.25 *
-                            (fabs(W(i, j, k) + W(i, j + 1, k)) *
-                                    (V(i, j, k) - V(i, j, k + 1)) +
-                                fabs(W(i, j, k - 1) + W(i, j + 1, k - 1)) *
-                                    (V(i, j, k) - V(i, j, k + 1)));
-
-                dv2dx2 = inverseDx * inverseDx *
-                         (V(i + 1, j, k) - 2.0 * V(i, j, k) + V(i - 1, j, k));
-                dv2dy2 = inverseDy * inverseDy *
-                         (V(i, j + 1, k) - 2.0 * V(i, j, k) + V(i, j - 1, k));
-                dv2dz2 = inverseDz * inverseDz *
-                         (V(i, j, k + 1) - 2.0 * V(i, j, k) + V(i, j, k - 1));
-                G(i, j, k) = V(i, j, k) + dt * (inverseRe * (dv2dx2 + dv2dy2 + dv2dz2) -
-                                                   duvdx - dv2dy - dvwdz + gy);
-
-                duwdx = inverseDx * 0.25 *
-                            ((U(i, j, k) + U(i, j, k + 1)) *
-                                    (W(i, j, k) + W(i + 1, j, k)) -
-                                (U(i - 1, j, k) + U(i - 1, j, k + 1)) *
-                                    (W(i, j, k) + W(i - 1, j, k))) +
-                        gamma * inverseDx * 0.25 *
-                            (fabs(U(i, j, k) + U(i, j, k + 1)) *
-                                    (W(i, j, k) - W(i + 1, j, k)) +
-                                fabs(U(i - 1, j, k) + U(i - 1, j, k + 1)) *
-                                    (W(i, j, k) - W(i - 1, j, k)));
-
-                dvwdy = inverseDy * 0.25 *
-                            ((V(i, j, k) + V(i, j, k + 1)) *
-                                    (W(i, j, k) + W(i, j + 1, k)) -
-                                (V(i, j - 1, k + 1) + V(i, j - 1, k)) *
-                                    (W(i, j, k) + W(i, j - 1, k))) +
-                        gamma * inverseDy * 0.25 *
-                            (fabs(V(i, j, k) + V(i, j, k + 1)) *
-                                    (W(i, j, k) - W(i, j + 1, k)) +
-                                fabs(V(i, j - 1, k + 1) + V(i, j - 1, k)) *
-                                    (W(i, j, k) - W(i, j - 1, k)));
-
-                dw2dz = inverseDz * 0.25 *
-                            ((W(i, j, k) + W(i, j, k + 1)) *
-                                    (W(i, j, k) + W(i, j, k + 1)) -
-                                (W(i, j, k) + W(i, j, k - 1)) *
-                                    (W(i, j, k) + W(i, j, k - 1))) +
-                        gamma * inverseDz * 0.25 *
-                            (fabs(W(i, j, k) + W(i, j, k + 1)) *
-                                    (W(i, j, k) - W(i, j, k + 1)) +
-                                fabs(W(i, j, k) + W(i, j, k - 1)) *
-                                    (W(i, j, k) - W(i, j, k - 1)));
-
-                dw2dx2 = inverseDx * inverseDx *
-                         (W(i + 1, j, k) - 2.0 * W(i, j, k) + W(i - 1, j, k));
-                dw2dy2 = inverseDy * inverseDy *
-                         (W(i, j + 1, k) - 2.0 * W(i, j, k) + W(i, j - 1, k));
-                dw2dz2 = inverseDz * inverseDz *
-                         (W(i, j, k + 1) - 2.0 * W(i, j, k) + W(i, j, k - 1));
-                H(i, j, k) = W(i, j, k) + dt * (inverseRe * (dw2dx2 + dw2dy2 + dw2dz2) -
-                                                   duwdx - dvwdy - dw2dz + gz);
-            }
-        }
-    }
-
-    /* ----------------------------- boundary of F ---------------------------
-     */
-    if (commIsBoundary(&s->comm, LEFT)) {
-        for (int k = 1; k < kmaxLocal + 1; k++) {
-            for (int j = 1; j < jmaxLocal + 1; j++) {
-                F(0, j, k) = U(0, j, k);
-            }
-        }
-    }
-
-    if (commIsBoundary(&s->comm, RIGHT)) {
-        for (int k = 1; k < kmaxLocal + 1; k++) {
-            for (int j = 1; j < jmaxLocal + 1; j++) {
-                F(imaxLocal, j, k) = U(imaxLocal, j, k);
-            }
-        }
-    }
-
-    /* ----------------------------- boundary of G ---------------------------
-     */
-    if (commIsBoundary(&s->comm, BOTTOM)) {
-        for (int k = 1; k < kmaxLocal + 1; k++) {
-            for (int i = 1; i < imaxLocal + 1; i++) {
-                G(i, 0, k) = V(i, 0, k);
-            }
-        }
-    }
-
-    if (commIsBoundary(&s->comm, TOP)) {
-        for (int k = 1; k < kmaxLocal + 1; k++) {
-            for (int i = 1; i < imaxLocal + 1; i++) {
-                G(i, jmaxLocal, k) = V(i, jmaxLocal, k);
-            }
-        }
-    }
-
-    /* ----------------------------- boundary of H ---------------------------
-     */
-    if (commIsBoundary(&s->comm, FRONT)) {
-        for (int j = 1; j < jmaxLocal + 1; j++) {
-            for (int i = 1; i < imaxLocal + 1; i++) {
-                H(i, j, 0) = W(i, j, 0);
-            }
-        }
-    }
-
-    if (commIsBoundary(&s->comm, BACK)) {
-        for (int j = 1; j < jmaxLocal + 1; j++) {
-            for (int i = 1; i < imaxLocal + 1; i++) {
-                H(i, j, kmaxLocal) = W(i, j, kmaxLocal);
-            }
-        }
-    }
-}
-
-void adaptUV(Solver* s)
-{
-    int imaxLocal = s->comm.imaxLocal;
-    int jmaxLocal = s->comm.jmaxLocal;
-    int kmaxLocal = s->comm.kmaxLocal;
-
-    double* p = s->p;
-    double* u = s->u;
-    double* v = s->v;
-    double* w = s->w;
-    double* f = s->f;
-    double* g = s->g;
-    double* h = s->h;
-
-    double factorX = s->dt / s->grid.dx;
-    double factorY = s->dt / s->grid.dy;
-    double factorZ = s->dt / s->grid.dz;
-
-    for (int k = 1; k < kmaxLocal + 1; k++) {
-        for (int j = 1; j < jmaxLocal + 1; j++) {
-            for (int i = 1; i < imaxLocal + 1; i++) {
-                U(i, j, k) = F(i, j, k) - (P(i + 1, j, k) - P(i, j, k)) * factorX;
-                V(i, j, k) = G(i, j, k) - (P(i, j + 1, k) - P(i, j, k)) * factorY;
-                W(i, j, k) = H(i, j, k) - (P(i, j, k + 1) - P(i, j, k)) * factorZ;
-            }
-        }
-    }
-}
diff --git a/BasicSolver/3D-seq/config.mk b/BasicSolver/3D-seq/config.mk
index 2cf33f9..fd54650 100644
--- a/BasicSolver/3D-seq/config.mk
+++ b/BasicSolver/3D-seq/config.mk
@@ -1,5 +1,5 @@
-# Supported: GCC, CLANG, ICC
-TAG ?= ICC
+# Supported: GCC, CLANG, ICX
+TAG ?= ICX
 ENABLE_OPENMP ?= false
 # Supported: rb, mg
 SOLVER ?= mg
diff --git a/BasicSolver/2D-seq/include_ICC.mk b/BasicSolver/3D-seq/include_ICX.mk
similarity index 61%
rename from BasicSolver/2D-seq/include_ICC.mk
rename to BasicSolver/3D-seq/include_ICX.mk
index 94b8e20..3eed5ed 100644
--- a/BasicSolver/2D-seq/include_ICC.mk
+++ b/BasicSolver/3D-seq/include_ICX.mk
@@ -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 =
diff --git a/BasicSolver/3D-seq/src/main.c b/BasicSolver/3D-seq/src/main.c
index f453fdd..a014aae 100644
--- a/BasicSolver/3D-seq/src/main.c
+++ b/BasicSolver/3D-seq/src/main.c
@@ -18,6 +18,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)
 {
diff --git a/BasicSolver/3D-seq/src/progress.c b/BasicSolver/3D-seq/src/progress.c
index 3523426..7b3f126 100644
--- a/BasicSolver/3D-seq/src/progress.c
+++ b/BasicSolver/3D-seq/src/progress.c
@@ -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(EXIT_FAILURE);
-    }
-
-    return fp;
-
-}
-
-void writeResidual(FILE* fp, double ts, double res)
-{
-    fprintf(fp, "%f, %f\n", ts, res);
 }
\ No newline at end of file
diff --git a/BasicSolver/3D-seq/src/progress.h b/BasicSolver/3D-seq/src/progress.h
index 240c279..c6a0613 100644
--- a/BasicSolver/3D-seq/src/progress.h
+++ b/BasicSolver/3D-seq/src/progress.h
@@ -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
diff --git a/BasicSolver/3D-seq/src/solver-mg.c b/BasicSolver/3D-seq/src/solver-mg.c
index 743292c..aa9c612 100644
--- a/BasicSolver/3D-seq/src/solver-mg.c
+++ b/BasicSolver/3D-seq/src/solver-mg.c
@@ -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;
diff --git a/BasicSolver/3D-seq/src/timing.c b/BasicSolver/3D-seq/src/timing.c
index 78b01c4..32d3e07 100644
--- a/BasicSolver/3D-seq/src/timing.c
+++ b/BasicSolver/3D-seq/src/timing.c
@@ -20,3 +20,5 @@ double getTimeResolution(void)
     clock_getres(CLOCK_MONOTONIC, &ts);
     return (double)ts.tv_sec + (double)ts.tv_nsec * 1.e-9;
 }
+
+
diff --git a/EnhancedSolver/2D-mpi/config.mk b/EnhancedSolver/2D-mpi/config.mk
index 0b7938e..3e5795a 100644
--- a/EnhancedSolver/2D-mpi/config.mk
+++ b/EnhancedSolver/2D-mpi/config.mk
@@ -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
diff --git a/EnhancedSolver/2D-mpi/include_ICC.mk b/EnhancedSolver/2D-mpi/include_ICX.mk
similarity index 66%
rename from EnhancedSolver/2D-mpi/include_ICC.mk
rename to EnhancedSolver/2D-mpi/include_ICX.mk
index 6bedf55..7b2e6ee 100644
--- a/EnhancedSolver/2D-mpi/include_ICC.mk
+++ b/EnhancedSolver/2D-mpi/include_ICX.mk
@@ -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 =
diff --git a/EnhancedSolver/2D-mpi/src/comm-v1.c b/EnhancedSolver/2D-mpi/src/comm-v1.c
index 9be7e88..98d3a66 100644
--- a/EnhancedSolver/2D-mpi/src/comm-v1.c
+++ b/EnhancedSolver/2D-mpi/src/comm-v1.c
@@ -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;
diff --git a/EnhancedSolver/2D-mpi/src/main.c b/EnhancedSolver/2D-mpi/src/main.c
index 1f3f79c..b832a81 100644
--- a/EnhancedSolver/2D-mpi/src/main.c
+++ b/EnhancedSolver/2D-mpi/src/main.c
@@ -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
diff --git a/EnhancedSolver/2D-mpi/src/progress.c b/EnhancedSolver/2D-mpi/src/progress.c
index 78944bd..33a7fc7 100644
--- a/EnhancedSolver/2D-mpi/src/progress.c
+++ b/EnhancedSolver/2D-mpi/src/progress.c
@@ -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);
 }
\ No newline at end of file
diff --git a/EnhancedSolver/2D-mpi/src/progress.h b/EnhancedSolver/2D-mpi/src/progress.h
index 9508797..840481a 100644
--- a/EnhancedSolver/2D-mpi/src/progress.h
+++ b/EnhancedSolver/2D-mpi/src/progress.h
@@ -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
diff --git a/EnhancedSolver/2D-mpi/src/solver-mg.c b/EnhancedSolver/2D-mpi/src/solver-mg.c
index 920c9e7..27eaa17 100644
--- a/EnhancedSolver/2D-mpi/src/solver-mg.c
+++ b/EnhancedSolver/2D-mpi/src/solver-mg.c
@@ -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);
 
diff --git a/EnhancedSolver/2D-seq/config.mk b/EnhancedSolver/2D-seq/config.mk
index af8912f..5c1c5fe 100644
--- a/EnhancedSolver/2D-seq/config.mk
+++ b/EnhancedSolver/2D-seq/config.mk
@@ -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
diff --git a/EnhancedSolver/3D-seq/include_ICC.mk b/EnhancedSolver/2D-seq/include_ICX.mk
similarity index 61%
rename from EnhancedSolver/3D-seq/include_ICC.mk
rename to EnhancedSolver/2D-seq/include_ICX.mk
index 94b8e20..3eed5ed 100644
--- a/EnhancedSolver/3D-seq/include_ICC.mk
+++ b/EnhancedSolver/2D-seq/include_ICX.mk
@@ -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 =
diff --git a/EnhancedSolver/2D-seq/src/main.c b/EnhancedSolver/2D-seq/src/main.c
index 34deea4..acb93c7 100644
--- a/EnhancedSolver/2D-seq/src/main.c
+++ b/EnhancedSolver/2D-seq/src/main.c
@@ -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;
diff --git a/EnhancedSolver/2D-seq/src/progress.c b/EnhancedSolver/2D-seq/src/progress.c
index 54a1dbc..d5393c4 100644
--- a/EnhancedSolver/2D-seq/src/progress.c
+++ b/EnhancedSolver/2D-seq/src/progress.c
@@ -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);
-}
\ No newline at end of file
diff --git a/EnhancedSolver/2D-seq/src/progress.h b/EnhancedSolver/2D-seq/src/progress.h
index 240c279..c6a0613 100644
--- a/EnhancedSolver/2D-seq/src/progress.h
+++ b/EnhancedSolver/2D-seq/src/progress.h
@@ -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
diff --git a/EnhancedSolver/3D-mpi/config.mk b/EnhancedSolver/3D-mpi/config.mk
index 0dbe440..9781cb4 100644
--- a/EnhancedSolver/3D-mpi/config.mk
+++ b/EnhancedSolver/3D-mpi/config.mk
@@ -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
diff --git a/BasicSolver/3D-mpi/include_ICC.mk b/EnhancedSolver/3D-mpi/include_ICX.mk
similarity index 66%
rename from BasicSolver/3D-mpi/include_ICC.mk
rename to EnhancedSolver/3D-mpi/include_ICX.mk
index 0575de6..40fdb40 100644
--- a/BasicSolver/3D-mpi/include_ICC.mk
+++ b/EnhancedSolver/3D-mpi/include_ICX.mk
@@ -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 -qopt-zmm-usage=high -std=c99 $(OPENMP) -xHost -Wno-unused-command-line-argument
 LFLAGS   = $(OPENMP)
 DEFINES  += -D_GNU_SOURCE# -DDEBUG
 INCLUDES =
diff --git a/EnhancedSolver/3D-mpi/src/main.c b/EnhancedSolver/3D-mpi/src/main.c
index cfd2bf6..df5f0d6 100644
--- a/EnhancedSolver/3D-mpi/src/main.c
+++ b/EnhancedSolver/3D-mpi/src/main.c
@@ -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
diff --git a/EnhancedSolver/3D-mpi/src/progress.c b/EnhancedSolver/3D-mpi/src/progress.c
index 8249ed1..6586cd5 100644
--- a/EnhancedSolver/3D-mpi/src/progress.c
+++ b/EnhancedSolver/3D-mpi/src/progress.c
@@ -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); }
\ No newline at end of file
diff --git a/EnhancedSolver/3D-mpi/src/progress.h b/EnhancedSolver/3D-mpi/src/progress.h
index d612ebe..7b7c66d 100644
--- a/EnhancedSolver/3D-mpi/src/progress.h
+++ b/EnhancedSolver/3D-mpi/src/progress.h
@@ -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
diff --git a/EnhancedSolver/3D-mpi/src/solver-mg.c b/EnhancedSolver/3D-mpi/src/solver-mg.c
index 7324735..4fcfc05 100644
--- a/EnhancedSolver/3D-mpi/src/solver-mg.c
+++ b/EnhancedSolver/3D-mpi/src/solver-mg.c
@@ -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);
 
diff --git a/EnhancedSolver/3D-seq/config.mk b/EnhancedSolver/3D-seq/config.mk
index 2cf33f9..fd54650 100644
--- a/EnhancedSolver/3D-seq/config.mk
+++ b/EnhancedSolver/3D-seq/config.mk
@@ -1,5 +1,5 @@
-# Supported: GCC, CLANG, ICC
-TAG ?= ICC
+# Supported: GCC, CLANG, ICX
+TAG ?= ICX
 ENABLE_OPENMP ?= false
 # Supported: rb, mg
 SOLVER ?= mg
diff --git a/BasicSolver/3D-seq/include_ICC.mk b/EnhancedSolver/3D-seq/include_ICX.mk
similarity index 61%
rename from BasicSolver/3D-seq/include_ICC.mk
rename to EnhancedSolver/3D-seq/include_ICX.mk
index 94b8e20..3eed5ed 100644
--- a/BasicSolver/3D-seq/include_ICC.mk
+++ b/EnhancedSolver/3D-seq/include_ICX.mk
@@ -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 =
diff --git a/EnhancedSolver/3D-seq/src/main.c b/EnhancedSolver/3D-seq/src/main.c
index 08be93c..fab5852 100644
--- a/EnhancedSolver/3D-seq/src/main.c
+++ b/EnhancedSolver/3D-seq/src/main.c
@@ -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)
 {
diff --git a/EnhancedSolver/3D-seq/src/progress.c b/EnhancedSolver/3D-seq/src/progress.c
index 3523426..7588401 100644
--- a/EnhancedSolver/3D-seq/src/progress.c
+++ b/EnhancedSolver/3D-seq/src/progress.c
@@ -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);
-}
\ No newline at end of file
diff --git a/EnhancedSolver/3D-seq/src/progress.h b/EnhancedSolver/3D-seq/src/progress.h
index 240c279..314e921 100644
--- a/EnhancedSolver/3D-seq/src/progress.h
+++ b/EnhancedSolver/3D-seq/src/progress.h
@@ -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
diff --git a/EnhancedSolver/3D-seq/src/solver-mg.c b/EnhancedSolver/3D-seq/src/solver-mg.c
index 743292c..aa9c612 100644
--- a/EnhancedSolver/3D-seq/src/solver-mg.c
+++ b/EnhancedSolver/3D-seq/src/solver-mg.c
@@ -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;