NOTE: Renamed LINDUCTION to LMAGNETIC throughout the project.

2019-07-01 13:40:24 +03:00
parent 0c63d55fd7
commit d9be66f65f
9 changed files with 28 additions and 28 deletions
--- a/acc/mhd_solver/stencil_process.sps
+++ b/acc/mhd_solver/stencil_process.sps
@@ -1,4 +1,4 @@
-#define LINDUCTION (1)
+#define LMAGNETIC (1)
 #define LENTROPY (1)
 #define LTEMPERATURE (0)
 #define LGRAVITY (0)
@@ -247,7 +247,7 @@ in Vector uu = (int3) {VTXBUF_UUX, VTXBUF_UUY, VTXBUF_UUZ};
 out Vector out_uu = (int3) {VTXBUF_UUX,VTXBUF_UUY,VTXBUF_UUZ};


-#if LINDUCTION
+#if LMAGNETIC
 in Vector aa = (int3) {VTXBUF_AX,VTXBUF_AY,VTXBUF_AZ};
 out Vector out_aa = (int3) {VTXBUF_AX,VTXBUF_AY,VTXBUF_AZ};
 #endif
@@ -266,7 +266,7 @@ Kernel void
 solve(Scalar dt) {
    out_lnrho = rk3(out_lnrho, lnrho, continuity(uu, lnrho), dt);

-    #if LINDUCTION
+    #if LMAGNETIC
    out_aa = rk3(out_aa, aa, induction(uu, aa), dt);
    #endif

--- a/acc/pseudodisk/stencil_process_gravx.sps
+++ b/acc/pseudodisk/stencil_process_gravx.sps
@@ -1,4 +1,4 @@
-#define LINDUCTION (1)
+#define LMAGNETIC (1)
 #define LENTROPY (1)


@@ -200,7 +200,7 @@ in Vector uu = (int3) {VTXBUF_UUX, VTXBUF_UUY, VTXBUF_UUZ};
 out Vector out_uu = (int3) {VTXBUF_UUX,VTXBUF_UUY,VTXBUF_UUZ};


-#if LINDUCTION
+#if LMAGNETIC
 in Vector aa = (int3) {VTXBUF_AX,VTXBUF_AY,VTXBUF_AZ};
 out Vector out_aa = (int3) {VTXBUF_AX,VTXBUF_AY,VTXBUF_AZ};
 #endif
@@ -214,7 +214,7 @@ Kernel void
 solve(Scalar dt) {
    WRITE(out_lnrho, RK3(out_lnrho, lnrho, continuity(uu, lnrho), dt));

-    #if LINDUCTION
+    #if LMAGNETIC
        WRITE(out_aa,    RK3(out_aa, aa, induction(uu, aa), dt));
    #endif

--- a/acc/pseudodisk/stencil_process_isotherm_gravx.sps
+++ b/acc/pseudodisk/stencil_process_isotherm_gravx.sps
@@ -117,7 +117,7 @@ out Scalar out_lnrho = VTXBUF_LNRHO;
 in Vector uu = (int3) {VTXBUF_UUX, VTXBUF_UUY, VTXBUF_UUZ};
 out Vector out_uu = (int3) {VTXBUF_UUX,VTXBUF_UUY,VTXBUF_UUZ};

-#if LINDUCTION
+#if LMAGNETIC
 in Vector aa = (int3) {VTXBUF_AX,VTXBUF_AY,VTXBUF_AZ};
 out Vector out_aa = (int3) {VTXBUF_AX,VTXBUF_AY,VTXBUF_AZ};
 #endif
@@ -126,7 +126,7 @@ Kernel void
 solve(Scalar dt) {
  WRITE(out_lnrho, RK3(out_lnrho, lnrho, continuity(uu, lnrho), dt));

-  #if LINDUCTION
+  #if LMAGNETIC
  WRITE(out_aa,    RK3(out_aa, aa, induction(uu, aa), dt));
  #endif

--- a/acc/pseudodisk/stencil_process_isotherm_linegrav.sps
+++ b/acc/pseudodisk/stencil_process_isotherm_linegrav.sps
@@ -122,7 +122,7 @@ out Scalar out_lnrho = VTXBUF_LNRHO;
 in Vector uu = (int3) {VTXBUF_UUX, VTXBUF_UUY, VTXBUF_UUZ};
 out Vector out_uu = (int3) {VTXBUF_UUX,VTXBUF_UUY,VTXBUF_UUZ};

-#if LINDUCTION
+#if LMAGNETIC
 in Vector aa = (int3) {VTXBUF_AX,VTXBUF_AY,VTXBUF_AZ};
 out Vector out_aa = (int3) {VTXBUF_AX,VTXBUF_AY,VTXBUF_AZ};
 #endif
@@ -131,7 +131,7 @@ Kernel void
 solve(Scalar dt) {
  WRITE(out_lnrho, RK3(out_lnrho, lnrho, continuity(uu, lnrho), dt));

-  #if LINDUCTION
+  #if LMAGNETIC
  WRITE(out_aa,    RK3(out_aa, aa, induction(uu, aa), dt));
  #endif

--- a/acc/pseudodisk/stencil_process_linegrav.sps
+++ b/acc/pseudodisk/stencil_process_linegrav.sps
@@ -1,4 +1,4 @@
-#define LINDUCTION (1)
+#define LMAGNETIC (1)
 #define LENTROPY (1)


@@ -205,7 +205,7 @@ in Vector uu = (int3) {VTXBUF_UUX, VTXBUF_UUY, VTXBUF_UUZ};
 out Vector out_uu = (int3) {VTXBUF_UUX,VTXBUF_UUY,VTXBUF_UUZ};


-#if LINDUCTION
+#if LMAGNETIC
 in Vector aa = (int3) {VTXBUF_AX,VTXBUF_AY,VTXBUF_AZ};
 out Vector out_aa = (int3) {VTXBUF_AX,VTXBUF_AY,VTXBUF_AZ};
 #endif
@@ -219,7 +219,7 @@ Kernel void
 solve(Scalar dt) {
    WRITE(out_lnrho, RK3(out_lnrho, lnrho, continuity(uu, lnrho), dt));

-    #if LINDUCTION
+    #if LMAGNETIC
        WRITE(out_aa,    RK3(out_aa, aa, induction(uu, aa), dt));
    #endif

--- a/acc/samples/common_header.h
+++ b/acc/samples/common_header.h
@@ -76,7 +76,7 @@ extern "C" {
 // L-prefix inherited from the old Astaroth, no idea what it means
 // MV: L means a Logical switch variale, something having true of false value.
 #define LFORCING (0) // Note: forcing is disabled currently in the files generated by acc (compiler of our DSL)
-#define LINDUCTION (1)
+#define LMAGNETIC (1)
 #define LENTROPY (1)
 #define LTEMPERATURE (0)

@@ -185,13 +185,13 @@ extern "C" {
        FUNC(VTXBUF_UUZ), \
        // FUNC(VTXBUF_DYE),

-#if LINDUCTION
-#define AC_FOR_INDUCTION_VTXBUF_HANDLES(FUNC)\
+#if LMAGNETIC
+#define AC_FOR_MAGNETIC_VTXBUF_HANDLES(FUNC)\
        FUNC(VTXBUF_AX), \
        FUNC(VTXBUF_AY), \
        FUNC(VTXBUF_AZ),
 #else
-#define AC_FOR_INDUCTION_VTXBUF_HANDLES(FUNC)
+#define AC_FOR_MAGNETIC_VTXBUF_HANDLES(FUNC)
 #endif

 #if LENTROPY
@@ -210,7 +210,7 @@ extern "C" {

 #define AC_FOR_VTXBUF_HANDLES(FUNC)\
        AC_FOR_HYDRO_VTXBUF_HANDLES(FUNC)\
-        AC_FOR_INDUCTION_VTXBUF_HANDLES(FUNC)\
+        AC_FOR_MAGNETIC_VTXBUF_HANDLES(FUNC)\
        AC_FOR_ENTROPY_VTXBUF_HANDLES(FUNC)\
        AC_FOR_TEMPERATURE_VTXBUF_HANDLES(FUNC)
 // clang-format on
--- a/include/astaroth.h
+++ b/include/astaroth.h
@@ -73,7 +73,7 @@ extern "C" {
    #define NGHOST (STENCIL_ORDER / 2)
    #define LDENSITY (1)
    #define LHYDRO (1)
-    #define LINDUCTION (1) // %JP: TO BE RENAMED TO LMAGNETIC TODO
+    #define LMAGNETIC (1)
    #define LENTROPY (1)
    #define LTEMPERATURE (0)
    #define LFORCING (1)
@@ -194,13 +194,13 @@ extern "C" {
 #define AC_FOR_HYDRO_VTXBUF_HANDLES(FUNC)
 #endif

-#ifdef LINDUCTION
-#define AC_FOR_INDUCTION_VTXBUF_HANDLES(FUNC) \
+#ifdef LMAGNETIC
+#define AC_FOR_MAGNETIC_VTXBUF_HANDLES(FUNC) \
        FUNC(VTXBUF_AX), \
        FUNC(VTXBUF_AY), \
        FUNC(VTXBUF_AZ),
 #else
-#define AC_FOR_INDUCTION_VTXBUF_HANDLES(FUNC)
+#define AC_FOR_MAGNETIC_VTXBUF_HANDLES(FUNC)
 #endif

 #ifdef LENTROPY
@@ -222,7 +222,7 @@ extern "C" {
 #define AC_FOR_VTXBUF_HANDLES(FUNC) AC_FOR_HYDRO_VTXBUF_HANDLES(FUNC) \
                                    AC_FOR_DENSITY_VTXBUF_HANDLES(FUNC) \
                                    AC_FOR_ENTROPY_VTXBUF_HANDLES(FUNC) \
-                                    AC_FOR_INDUCTION_VTXBUF_HANDLES(FUNC) \
+                                    AC_FOR_MAGNETIC_VTXBUF_HANDLES(FUNC) \
 // clang-format on

 /*
--- a/include/user.h
+++ b/include/user.h
@@ -1,3 +1,4 @@
+// clang-format off
 #ifdef PENCIL_ASTAROTH

  #include "../cparam.inc_c.h"
@@ -12,11 +13,10 @@
    #define AC_DOUBLE_PRECISION 0
  #endif

-  #define LINDUCTION (LMAGNETIC) // TODO set default to 0 before including user.h
  #define LENTROPY (1) // TODO above
  #define LFORCING (1) // TODO above
  #define STENCIL_ORDER (6) // nghost is not 1, 2 or 3 (as it is not fetched from fortran yet). This causes the compilation to fail. TODO remove this line

  #define USER_PROVIDED_DEFINES
 #endif
-
+// clang-format on
--- a/src/standalone/model/model_rk3.cc
+++ b/src/standalone/model/model_rk3.cc
@@ -745,7 +745,7 @@ solve_alpha_step(const int step_number, const ModelScalar dt, const int i, const
    ModelScalar rate_of_change[NUM_VTXBUF_HANDLES] = {0};
    rate_of_change[VTXBUF_LNRHO]                   = continuity(uu, lnrho);

-#if LINDUCTION
+#if LMAGNETIC
    const ModelVectorData aa  = read_data(i, j, k, in.vertex_buffer,
                                         (int3){VTXBUF_AX, VTXBUF_AY, VTXBUF_AZ});
    const ModelVector aa_res  = induction(uu, aa);