static_grav renamed/fixed, light side fixes

Author: alwinm

builds/make.type.rot_proj

@@ -0,0 +1,31 @@
+#-- Default hydro only build with rotated projection
+
+DFLAGS    += -DCUDA
+DFLAGS    += -DMPI_CHOLLA
+DFLAGS    += -DPRECISION=2
+DFLAGS    += -DPPMC
+DFLAGS    += -DHLLC
+
+# Integrator
+DFLAGS    += -DSIMPLE
+#DFLAGS    += -DVL
+
+# Apply a density and temperature floor
+DFLAGS    += -DDENSITY_FLOOR
+DFLAGS    += -DTEMPERATURE_FLOOR
+
+# Solve the Gas Internal Energy usisng a Dual Energy Formalism
+#DFLAGS    += -DDE
+
+# Apply cooling on the GPU from precomputed tables
+#DFLAGS    += -DCOOLING_GPU
+
+# Measure the Timing of the different stages
+#DFLAGS    += -DCPU_TIME
+
+# Select output format
+# Can also add -DSLICES and -DPROJECTIONS
+OUTPUT    ?=  -DOUTPUT -DHDF5
+DFLAGS    += $(OUTPUT)
+
+DFLAGS    += -DROTATED_PROJECTION

builds/make.type.static_grav

@@ -0,0 +1,32 @@
+#-- Default hydro only build with static_grav
+
+DFLAGS    += -DCUDA
+DFLAGS    += -DMPI_CHOLLA
+DFLAGS    += -DPRECISION=2
+DFLAGS    += -DPPMC
+DFLAGS    += -DHLLC
+
+# Integrator
+DFLAGS    += -DSIMPLE
+#DFLAGS    += -DVL
+
+# Apply a density and temperature floor
+DFLAGS    += -DDENSITY_FLOOR
+DFLAGS    += -DTEMPERATURE_FLOOR
+
+# Solve the Gas Internal Energy usisng a Dual Energy Formalism
+#DFLAGS    += -DDE
+
+DFLAGS    += -DSTATIC_GRAV
+
+# Apply cooling on the GPU from precomputed tables
+#DFLAGS    += -DCOOLING_GPU
+
+# Measure the Timing of the different stages
+#DFLAGS    += -DCPU_TIME
+
+# Select output format
+# Can also add -DSLICES and -DPROJECTIONS
+OUTPUT    ?=  -DOUTPUT -DHDF5
+DFLAGS    += $(OUTPUT)
+

src/global/global_cuda.h

@@ -92,17 +92,6 @@ inline void gpuAssert(cudaError_t code, char *file, int line, bool abort=true)
    }
 }
 
-
-
-/*! \fn Real minof3(Real a, Real b, Real c)
- *  \brief Returns the minimum of three floating point numbers. */
-__device__ inline Real minof3(Real a, Real b, Real c)
-{
-  return fmin(a, fmin(b,c));
-}
-
-
-
 /*! \fn int sgn_CUDA
  *  \brief Mathematical sign function. Returns sign of x. */
 __device__ inline int sgn_CUDA(Real x)
@@ -111,11 +100,6 @@ __device__ inline int sgn_CUDA(Real x)
   else return 1;
 }
 
-
-__global__ void test_function();
-
-
-
 #endif //GLOBAL_CUDA_H
 
 #endif //CUDA

src/gravity/gravity_cuda.h

@@ -4,17 +4,16 @@
            functions in hydro_cuda.cu. */
 #ifdef CUDA
 
+#pragma once
+
 #include <stdio.h>
-#include <math.h>
-#include "../utils/gpu.hpp"
-#include "../global/global.h"
-#include "../global/global_cuda.h"
-#include "../gravity/gravity_cuda.h"
+#include <math.h> // provides sqrt log cos sin atan etc.
+#include "../global/global.h" // provides GN etc.
 
 // Work around lack of pow(Real,int) in Hip Clang for Rocm 3.5
 static inline __device__ Real pow2(const Real x) { return x*x; }
 
-__device__ void calc_g_1D(int xid, int x_off, int n_ghost, Real dx, Real xbound, Real *gx)
+inline __device__ void calc_g_1D(int xid, int x_off, int n_ghost, Real dx, Real xbound, Real *gx)
 {
   Real x_pos, r_disk, r_halo;
   x_pos = (x_off + xid - n_ghost + 0.5)*dx + xbound;
@@ -52,7 +51,7 @@ __device__ void calc_g_1D(int xid, int x_off, int n_ghost, Real dx, Real xbound,
 }
 
 
-__device__ void calc_g_2D(int xid, int yid, int x_off, int y_off, int n_ghost, Real dx, Real dy, Real xbound, Real ybound, Real *gx, Real *gy)
+inline __device__ void calc_g_2D(int xid, int yid, int x_off, int y_off, int n_ghost, Real dx, Real dy, Real xbound, Real ybound, Real *gx, Real *gy)
 {
   Real x_pos, y_pos, r, phi;
   // use the subgrid offset and global boundaries to calculate absolute positions on the grid
@@ -108,7 +107,7 @@ __device__ void calc_g_2D(int xid, int yid, int x_off, int y_off, int n_ghost, R
 }
 
 
-__device__ void calc_g_3D(int xid, int yid, int zid, int x_off, int y_off, int z_off, int n_ghost, Real dx, Real dy, Real dz, Real xbound, Real ybound, Real zbound, Real *gx, Real *gy, Real *gz)
+inline __device__ void calc_g_3D(int xid, int yid, int zid, int x_off, int y_off, int z_off, int n_ghost, Real dx, Real dy, Real dz, Real xbound, Real ybound, Real zbound, Real *gx, Real *gy, Real *gz)
 {
   Real x_pos, y_pos, z_pos, r_disk, r_halo;
   // use the subgrid offset and global boundaries to calculate absolute positions on the grid

src/gravity/gravity_cuda.cu src/gravity/static_grav.hsrc/gravity/gravity_cuda.cu renamed to src/gravity/static_grav.h

@@ -10,7 +10,7 @@
 #include "../global/global.h"
 #include "../global/global_cuda.h"
 #include "../hydro/hydro_cuda.h"
-#include "../gravity/gravity_cuda.h"
+#include "../gravity/static_grav.h"
 #include "../utils/hydro_utilities.h"
 #include "../utils/cuda_utilities.h"
 #include "../utils/reduction_utilities.h"

src/hydro/hydro_cuda.cu

@@ -1820,6 +1820,11 @@ void Grid3D::Write_Rotated_Projection_HDF5(hid_t file_id)
     int nx_dset = R.nx;
     int nz_dset = R.nz;
 
+    if (R.nx * R.nz == 0) {
+      chprintf("WARNING: compiled with -DROTATED_PROJECTION but input parameters nxr or nzr = 0\n");
+      return;
+    }
+
     // set the projected dataset size for this process to capture
     // this piece of the simulation volume
     // min and max values were set in the header write
@@ -1920,15 +1925,17 @@ void Grid3D::Write_Rotated_Projection_HDF5(hid_t file_id)
     // Free the dataspace id
     status = H5Sclose(dataspace_xzr_id);
 
+    //free the data
+    free(dataset_buffer_dxzr);
+    free(dataset_buffer_Txzr);
+    free(dataset_buffer_vxxzr);
+    free(dataset_buffer_vyxzr);
+    free(dataset_buffer_vzxzr);
+
   }
-  else printf("Rotated projection write only implemented for 3D data.\n");
-
-  //free the data
-  free(dataset_buffer_dxzr);
-  free(dataset_buffer_Txzr);
-  free(dataset_buffer_vxxzr);
-  free(dataset_buffer_vyxzr);
-  free(dataset_buffer_vzxzr);
+  else chprintf("Rotated projection write only implemented for 3D data.\n");
+
+
 
 }
 #endif //HDF5