Merge branch 'feature/sycl'

OP-DSL · Nov 14, 2024 · a69fe28 · a69fe28
2 parents ea05811 + c9646fb
commit a69fe28
Show file tree

Hide file tree

Showing 12 changed files with 233 additions and 300 deletions.
diff --git a/app_fempic_cg/Makefile b/app_fempic_cg/Makefile
@@ -62,6 +62,9 @@ PETSC_LIB  = -Wl,-rpath,$(PETSC_INSTALL_PATH)/lib -L$(PETSC_INSTALL_PATH)/lib -l
 
 CUDA_INC   = -I$(CUDA_INSTALL_PATH)/include
 CUDA_LIB   = -L$(CUDA_INSTALL_PATH)/lib64 -lcudart -lcuda
+# for demos with gcc
+# CUDA_INC   = -I$(CUDA_INSTALL_PATH)/include -I$(MPI_INSTALL_PATH)/include
+# CUDA_LIB   = -L$(CUDA_INSTALL_PATH)/lib64 -lcudart -lcuda -I$(MPI_INSTALL_PATH)/lib -lmpi
 
 # CUDA_INC   = -I$(CUDA_INSTALL_PATH)/include -I$(MPI_INSTALL_PATH)/include
 # CUDA_LIB   = -L$(CUDA_INSTALL_PATH)/lib64 -lcudart -lcuda -I$(MPI_INSTALL_PATH)/lib -lmpi

diff --git a/app_fempic_cg/field_solver.h b/app_fempic_cg/field_solver.h
@@ -55,12 +55,10 @@ class FESolver {
     void compute_node_potential(const opp_dat n_bnd_pot_dat, opp_dat node_potential_dat);
 
     void pre_assembly(const opp_dat n_bnd_pot);
-    void summarize(std::ostream &out);  
-
+
+    void duplicate_vec(Vec* vec_mimic, Vec* vec_new);
     void add_ke(std::map<int, std::map<int, double>>& sparse_K, int e, double ke[4][4]);
     void add_fe(Vec *Fvec, int e, double fe[4]);
-    double evaluate_na(int a, double xi, double eta, double zeta);
-    void get_nax(double nx[3], int e, int a);
     void initialze_matrix(std::map<int, std::map<int, double>>& sparse_K);
     void compute_nx(const opp_dat n_pos);
     void sanity_check();