[Acoustics] Update acoustics solver

solvers/acoustics/acoustics.hpp

@@ -36,55 +36,56 @@ SOFTWARE.
 
 #define DACOUSTICS LIBP_DIR"/solvers/acoustics/"
 
+using namespace libp;
+
 class acousticsSettings_t: public settings_t {
 public:
-  acousticsSettings_t(MPI_Comm& _comm);
+  acousticsSettings_t(comm_t _comm);
   void report();
   void parseFromFile(platformSettings_t& platformSettings,
                      meshSettings_t& meshSettings,
-                     const string filename);
+                     const std::string filename);
 };
 
 class acoustics_t: public solver_t {
 public:
-  mesh_t &mesh;
+  mesh_t mesh;
 
   int Nfields;
 
-  TimeStepper::timeStepper_t* timeStepper;
+  timeStepper_t timeStepper;
 
-  halo_t* traceHalo;
+  ogs::halo_t traceHalo;
 
-  dfloat *q;
-  occa::memory o_q;
+  memory<dfloat> q;
+  deviceMemory<dfloat> o_q;
 
-  occa::memory o_Mq;
+  deviceMemory<dfloat> o_Mq;
 
-  occa::kernel volumeKernel;
-  occa::kernel surfaceKernel;
+  kernel_t volumeKernel;
+  kernel_t surfaceKernel;
 
-  occa::kernel initialConditionKernel;
+  kernel_t initialConditionKernel;
 
-  acoustics_t() = delete;
+  acoustics_t() = default;
   acoustics_t(platform_t &_platform, mesh_t &_mesh,
-              acousticsSettings_t& _settings):
-    solver_t(_platform, _settings), mesh(_mesh) {}
-
-  ~acoustics_t();
+              acousticsSettings_t& _settings) {
+    Setup(_platform, _mesh, _settings);
+  }
 
   //setup
-  static acoustics_t& Setup(platform_t& platform, mesh_t& mesh,
-                            acousticsSettings_t& settings);
+  void Setup(platform_t& _platform, mesh_t& _mesh,
+             acousticsSettings_t& _settings);
 
   void Run();
 
   void Report(dfloat time, int tstep);
 
-  void PlotFields(dfloat* Q, char *fileName);
+  void PlotFields(memory<dfloat> Q, const std::string fileName);
 
-  void rhsf(occa::memory& o_q, occa::memory& o_rhs, const dfloat time);
+  void rhsf(deviceMemory<dfloat>& o_q, deviceMemory<dfloat>& o_rhs, const dfloat time);
 
   dfloat MaxWaveSpeed();
 };
 
-#endif
+#endif

solvers/acoustics/acousticsMain.cpp

@@ -29,39 +29,40 @@ SOFTWARE.
 int main(int argc, char **argv){
 
   // start up MPI
-  MPI_Init(&argc, &argv);
+  comm_t::Init(argc, argv);
 
-  MPI_Comm comm = MPI_COMM_WORLD;
+  LIBP_ABORT("Usage: ./acousticsMain setupfile", argc!=2);
 
-  if(argc!=2)
-    LIBP_ABORT(string("Usage: ./acousticsMain setupfile"));
+  { /*Scope so everything is destructed before MPI_Finalize */
+    comm_t comm(comm_t::world().Dup());
 
-  //create default settings
-  platformSettings_t platformSettings(comm);
-  meshSettings_t meshSettings(comm);
-  acousticsSettings_t acousticsSettings(comm);
+    //create default settings
+    platformSettings_t platformSettings(comm);
+    meshSettings_t meshSettings(comm);
+    acousticsSettings_t acousticsSettings(comm);
 
-  //load settings from file
-  acousticsSettings.parseFromFile(platformSettings, meshSettings,
-                            argv[1]);
+    //load settings from file
+    acousticsSettings.parseFromFile(platformSettings, meshSettings,
+                              argv[1]);
 
-  // set up platform
-  platform_t platform(platformSettings);
+    // set up platform
+    platform_t platform(platformSettings);
 
-  platformSettings.report();
-  meshSettings.report();
-  acousticsSettings.report();
+    platformSettings.report();
+    meshSettings.report();
+    acousticsSettings.report();
 
-  // set up mesh
-  mesh_t& mesh = mesh_t::Setup(platform, meshSettings, comm);
+    // set up mesh
+    mesh_t mesh(platform, meshSettings, comm);
 
-  // set up acoustics solver
-  acoustics_t& acoustics = acoustics_t::Setup(platform, mesh, acousticsSettings);
+    // set up acoustics solver
+    acoustics_t acoustics(platform, mesh, acousticsSettings);
 
-  // run
-  acoustics.Run();
+    // run
+    acoustics.Run();
+  }
 
   // close down MPI
-  MPI_Finalize();
+  comm_t::Finalize();
   return LIBP_SUCCESS;
 }

solvers/acoustics/makefile

@@ -77,11 +77,8 @@ include ../../make.top
 endif
 endif
 
-#gslib
-GS_DIR=${LIBP_TPL_DIR}/gslib
-
 #libraries
-ACOUSTICS_LIBP_LIBS=timeStepper mesh ogs linAlg core
+ACOUSTICS_LIBP_LIBS=timeStepper mesh parAdogs ogs linAlg core
 
 #includes
 INCLUDES=${LIBP_INCLUDES} \
@@ -92,11 +89,10 @@ DEFINES =${LIBP_DEFINES} \
          -DLIBP_DIR='"${LIBP_DIR}"'
 
 #.cpp compilation flags
-ACOUSTICS_CXXFLAGS=${LIBP_MPICXXFLAGS} ${DEFINES} ${INCLUDES}
+ACOUSTICS_CXXFLAGS=${LIBP_CXXFLAGS} ${DEFINES} ${INCLUDES}
 
 #link libraries
 LIBS=-L${LIBP_LIBS_DIR} $(addprefix -l,$(ACOUSTICS_LIBP_LIBS)) \
-     -L$(GS_DIR)/lib -lgs \
      ${LIBP_LIBS}
 
 #link flags
@@ -144,10 +140,10 @@ endif
 # rule for .cpp files
 %.o: %.cpp $(DEPS) | libp_libs
 ifneq (,${verbose})
-	$(LIBP_MPICXX) -o $*.o -c $*.cpp $(ACOUSTICS_CXXFLAGS)
+	$(LIBP_CXX) -o $*.o -c $*.cpp $(ACOUSTICS_CXXFLAGS)
 else
 	@printf "%b" "$(OBJ_COLOR)Compiling $(@F)$(NO_COLOR)\n";
-	@$(LIBP_MPICXX) -o $*.o -c $*.cpp $(ACOUSTICS_CXXFLAGS)
+	@$(LIBP_CXX) -o $*.o -c $*.cpp $(ACOUSTICS_CXXFLAGS)
 endif
 
 #cleanup
@@ -158,8 +154,7 @@ clean-libs: clean
 	${MAKE} -C ${LIBP_LIBS_DIR} clean
 
 clean-kernels: clean-libs
-# 	$(shell ${OCCA_DIR}/bin/occa clear all -y)
-	rm -rf ~/.occa/
+	rm -rf ${LIBP_DIR}/.occa/
 
 realclean: clean
 	${MAKE} -C ${LIBP_LIBS_DIR} realclean
@@ -177,4 +172,4 @@ info:
 	@true
 
 test: acousticsMain
-	@${MAKE} -C $(LIBP_TEST_DIR) --no-print-directory  test-acoustics
+	@${MAKE} -C $(LIBP_TEST_DIR) --no-print-directory  test-acoustics

solvers/acoustics/okl/acousticsSurfaceHex3D.okl

@@ -151,8 +151,6 @@ void surfaceTerms(const int e,
       }
     }
 
-    @barrier("global");
-
     // face 1 & 3
     for(int es=0;es<p_NblockS;++es;@inner(2)){
       for(int k=0;k<p_Nq;++k;@inner(1)){
@@ -172,8 +170,6 @@ void surfaceTerms(const int e,
       }
     }
 
-    @barrier("global");
-
     // face 2 & 4
     for(int es=0;es<p_NblockS;++es;@inner(2)){
       for(int k=0;k<p_Nq;++k;@inner(1)){

solvers/acoustics/okl/acousticsSurfaceQuad2D.okl

@@ -136,8 +136,6 @@ void surfaceTerms(const int e,
       }
     }
 
-    @barrier("local");
-
     // for all face nodes of all elements
     // face 0 & 2
     for(int es=0;es<p_NblockS;++es;@inner(1)){
@@ -158,8 +156,6 @@ void surfaceTerms(const int e,
       }
     }
 
-    @barrier("local");
-
     // face 1 & 3
     for(int es=0;es<p_NblockS;++es;@inner(1)){
       for(int j=0;j<p_Nq;++j;@inner(0)){
@@ -179,8 +175,6 @@ void surfaceTerms(const int e,
       }
     }
 
-    @barrier("local");
-
     // for each node in the element
     for(int es=0;es<p_NblockS;++es;@inner(1)){
       for(int i=0;i<p_Nq;++i;@inner(0)){

solvers/acoustics/okl/acousticsSurfaceTet3D.okl

@@ -138,9 +138,6 @@ void upwind(const dfloat nx,
       }
     }
 
-    // wait for all @shared memory writes of the previous inner loop to complete
-    @barrier("local");
-
     // for each node in the element
     for(int es=0;es<p_NblockS;++es;@inner(1)){
       for(int n=0;n<p_maxNodes;++n;@inner(0)){

solvers/acoustics/okl/acousticsSurfaceTri2D.okl

@@ -131,9 +131,6 @@ void upwind(const dfloat nx,
       }
     }
 
-    // wait for all @shared memory writes of the previous inner loop to complete
-    @barrier("local");
-
     // for each node in the element
     for(int es=0;es<p_NblockS;++es;@inner(1)){
       for(int n=0;n<p_maxNodes;++n;@inner(0)){

solvers/acoustics/okl/acousticsVolumeHex3D.okl

@@ -108,8 +108,6 @@ SOFTWARE.
       }
     }
 
-    @barrier("local");
-
     for(int k=0;k<p_Nq;++k;@inner(2)){
       for(int j=0;j<p_Nq;++j;@inner(1)){
         for(int i=0;i<p_Nq;++i;@inner(0)){

solvers/acoustics/okl/acousticsVolumeQuad2D.okl

@@ -81,8 +81,6 @@ SOFTWARE.
       }
     }
 
-    @barrier("local");
-
     for(int j=0;j<p_Nq;++j;@inner(1)){
       for(int i=0;i<p_Nq;++i;@inner(0)){
         const dlong gid = e*p_Np*p_Nvgeo+ j*p_Nq +i;

solvers/acoustics/okl/acousticsVolumeTet3D.okl

@@ -103,8 +103,6 @@ SOFTWARE.
 
     }
 
-    @barrier("local");
-
     for(int n=0;n<p_Np;++n;@inner(0)){
 
       dfloat rhsq0 = 0, rhsq1 = 0, rhsq2 = 0, rhsq3 = 0;
@@ -155,8 +153,6 @@ SOFTWARE.
       s_w[n] = q[qbase+3*p_Np];
     }
 
-    @barrier("local");
-
     for(int n=0;n<p_Np;++n;@inner(0)){
 
       // prefetch geometric factors (constant on triangle)
@@ -246,8 +242,6 @@ SOFTWARE.
         }
     }
 
-    @barrier("local");
-
     for(int n=0;n<p_Np;++n;@inner(0)){
 
       dfloat r_drhodr[p_Nvol], r_drhods[p_Nvol], r_drhodt[p_Nvol];
@@ -372,8 +366,6 @@ SOFTWARE.
       }
     }
 
-    @barrier("local");
-
     for(int et=0;et<p_NblockV;++et;@inner(1)){
       for(int n=0;n<p_Np;++n;@inner(0)){
 

solvers/acoustics/okl/acousticsVolumeTri2D.okl

@@ -72,8 +72,6 @@ SOFTWARE.
       }
     }
 
-    @barrier("local");
-
     for(int n=0;n<p_Np;++n;@inner(0)){
 
       dfloat rhsq0 = 0, rhsq1 = 0, rhsq2 = 0;