diff --git a/AMSS_NCKU_source/makefile b/AMSS_NCKU_source/makefile index b1646b1..84fd4c0 100644 --- a/AMSS_NCKU_source/makefile +++ b/AMSS_NCKU_source/makefile @@ -60,12 +60,12 @@ endif .for.o: $(f77) -c $< -o $@ -.cu.o: - $(Cu) $(CUDA_APP_FLAGS) -c $< -o $@ $(CUDA_LIB_PATH) - -# CUDA rewrite of BSSN RHS (drop-in replacement for bssn_rhs_c + stencil helpers) -bssn_rhs_cuda.o: bssn_rhs_cuda.cu bssn_rhs.h macrodef.h - $(Cu) $(CUDA_APP_FLAGS) -c $< -o $@ $(CUDA_LIB_PATH) +.cu.o: + $(Cu) $(CUDA_APP_FLAGS) -c $< -o $@ $(CUDA_LIB_PATH) + +# CUDA rewrite of BSSN RHS (drop-in replacement for bssn_rhs_c + stencil helpers) +bssn_rhs_cuda.o: bssn_rhs_cuda.cu bssn_rhs.h macrodef.h + $(Cu) $(CUDA_APP_FLAGS) -c $< -o $@ $(CUDA_LIB_PATH) # CUDA rewrite of Z4C Cartesian RHS z4c_rhs_cuda.o: z4c_rhs_cuda.cu z4c_rhs_cuda.h bssn_rhs.h macrodef.h ricci_gamma.h diff --git a/AMSS_NCKU_source/surface_integral.C b/AMSS_NCKU_source/surface_integral.C index 5de4369..3459e54 100644 --- a/AMSS_NCKU_source/surface_integral.C +++ b/AMSS_NCKU_source/surface_integral.C @@ -499,9 +499,9 @@ void surface_integral::surf_Wave(double rex, int lev, cgh *GH, var *Rpsi4, var * delete[] IP_out; DG_List->clearList(); } -void surface_integral::surf_Wave(double rex, int lev, cgh *GH, var *Rpsi4, var *Ipsi4, - int spinw, int maxl, int NN, double *RP, double *IP, - monitor *Monitor, MPI_Comm Comm_here) // NN is the length of RP and IP +void surface_integral::surf_Wave(double rex, int lev, cgh *GH, var *Rpsi4, var *Ipsi4, + int spinw, int maxl, int NN, double *RP, double *IP, + monitor *Monitor, MPI_Comm Comm_here) // NN is the length of RP and IP { // misc::tillherecheck(GH->Commlev[lev],GH->start_rank[lev],"start surface_integral::surf_Wave"); @@ -735,10 +735,10 @@ void surface_integral::surf_Wave(double rex, int lev, cgh *GH, var *Rpsi4, var * delete[] IP_out; DG_List->clearList(); } -//|---------------------------------------------------------------- -// for shell patch -//|---------------------------------------------------------------- -void surface_integral::surf_Wave(double rex, int lev, ShellPatch *GH, var *Rpsi4, var *Ipsi4, +//|---------------------------------------------------------------- +// for shell patch +//|---------------------------------------------------------------- +void surface_integral::surf_Wave(double rex, int lev, ShellPatch *GH, var *Rpsi4, var *Ipsi4, int spinw, int maxl, int NN, double *RP, double *IP, monitor *Monitor) // NN is the length of RP and IP { diff --git a/AMSS_NCKU_source/surface_integral.h b/AMSS_NCKU_source/surface_integral.h index 1b2d287..41af6e4 100644 --- a/AMSS_NCKU_source/surface_integral.h +++ b/AMSS_NCKU_source/surface_integral.h @@ -46,10 +46,10 @@ public: surface_integral(int iSymmetry); ~surface_integral(); - void surf_Wave(double rex, int lev, cgh *GH, var *Rpsi4, var *Ipsi4, - int spinw, int maxl, int NN, double *RP, double *IP, - monitor *Monitor); // NN is the length of RP and IP - // this routine can only deal with the symmetry of Psi4 + void surf_Wave(double rex, int lev, cgh *GH, var *Rpsi4, var *Ipsi4, + int spinw, int maxl, int NN, double *RP, double *IP, + monitor *Monitor); // NN is the length of RP and IP + // this routine can only deal with the symmetry of Psi4 void surf_Wave(double rex, int lev, ShellPatch *GH, var *Rpsi4, var *Ipsi4, int spinw, int maxl, int NN, double *RP, double *IP, monitor *Monitor);