64-BitBrainstorm_2026/AMSS-NCKU
8
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge wave and mass extraction interpolation

Browse Source 
(cherry picked from commit f3988ac8ca)
This commit is contained in:
CGH0S7
2026-04-13 13:17:36 +08:00
committed by ianchb
parent cce8a44fc4
commit 11977eb82f
3 changed files with 831 additions and 192 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
AMSS_NCKU_source/bssn_class.C
View File

@@ -7678,32 +7678,35 @@ void bssn_class::AnalysisStuff(int lev, double dT_lev)
#ifdef WithShell #ifdef WithShell
if (lev > 0 || Rex < GH->bbox[0][0][3]) if (lev > 0 || Rex < GH->bbox[0][0][3])
{ {
Waveshell->surf_Wave(Rex, lev, GH, Rpsi4, Ipsi4, 2, maxl, NN, RP, IP, ErrorMonitor); Waveshell->surf_WaveMassPAng(Rex, lev, GH,
Waveshell->surf_MassPAng(Rex, lev, GH, phi0, trK0, Rpsi4, Ipsi4, 2, maxl, NN, RP, IP,
gxx0, gxy0, gxz0, gyy0, gyz0, gzz0, phi0, trK0,
Axx0, Axy0, Axz0, Ayy0, Ayz0, Azz0, gxx0, gxy0, gxz0, gyy0, gyz0, gzz0,
Gmx0, Gmy0, Gmz0, Sfx1, Sfy1, Sfz1, // here we can not touch rhs variables, but 1 variables Axx0, Axy0, Axz0, Ayy0, Ayz0, Azz0,
RoutMAP, ErrorMonitor, !patch_mass_prepared); Gmx0, Gmy0, Gmz0, Sfx1, Sfy1, Sfz1,
RoutMAP, ErrorMonitor, !patch_mass_prepared);
patch_mass_prepared = true; patch_mass_prepared = true;
} }
else else
{ {
Waveshell->surf_Wave(Rex, lev, SH, Rpsi4, Ipsi4, 2, maxl, NN, RP, IP, ErrorMonitor); Waveshell->surf_WaveMassPAng(Rex, lev, SH,
Waveshell->surf_MassPAng(Rex, lev, SH, phi0, trK0, Rpsi4, Ipsi4, 2, maxl, NN, RP, IP,
gxx0, gxy0, gxz0, gyy0, gyz0, gzz0, phi0, trK0,
Axx0, Axy0, Axz0, Ayy0, Ayz0, Azz0, gxx0, gxy0, gxz0, gyy0, gyz0, gzz0,
Gmx0, Gmy0, Gmz0, Sfx1, Sfy1, Sfz1, // here we can not touch rhs variables, but 1 variables Axx0, Axy0, Axz0, Ayy0, Ayz0, Azz0,
RoutMAP, ErrorMonitor, !shell_mass_prepared); Gmx0, Gmy0, Gmz0, Sfx1, Sfy1, Sfz1,
RoutMAP, ErrorMonitor, !shell_mass_prepared);
shell_mass_prepared = true; shell_mass_prepared = true;
} }
#else #else
#if (PSTR == 0) #if (PSTR == 0)
Waveshell->surf_Wave(Rex, lev, GH, Rpsi4, Ipsi4, 2, maxl, NN, RP, IP, ErrorMonitor); Waveshell->surf_WaveMassPAng(Rex, lev, GH,
Waveshell->surf_MassPAng(Rex, lev, GH, phi0, trK0, Rpsi4, Ipsi4, 2, maxl, NN, RP, IP,
gxx0, gxy0, gxz0, gyy0, gyz0, gzz0, phi0, trK0,
Axx0, Axy0, Axz0, Ayy0, Ayz0, Azz0, gxx0, gxy0, gxz0, gyy0, gyz0, gzz0,
Gmx0, Gmy0, Gmz0, Sfx1, Sfy1, Sfz1, // here we can not touch rhs variables, but 1 variables Axx0, Axy0, Axz0, Ayy0, Ayz0, Azz0,
RoutMAP, ErrorMonitor, !patch_mass_prepared); Gmx0, Gmy0, Gmz0, Sfx1, Sfy1, Sfz1,
RoutMAP, ErrorMonitor, !patch_mass_prepared);
patch_mass_prepared = true; patch_mass_prepared = true;
#elif (PSTR == 1 || PSTR == 2) #elif (PSTR == 1 || PSTR == 2)
Waveshell->surf_Wave(Rex, lev, GH, Rpsi4, Ipsi4, 2, maxl, NN, RP, IP, ErrorMonitor, GH->Commlev[lev]); Waveshell->surf_Wave(Rex, lev, GH, Rpsi4, Ipsi4, 2, maxl, NN, RP, IP, ErrorMonitor, GH->Commlev[lev]);

962
AMSS_NCKU_source/surface_integral.C
View File

File diff suppressed because it is too large Load Diff

22
AMSS_NCKU_source/surface_integral.h
View File

@@ -94,9 +94,25 @@ public:
var *Gmx, var *Gmy, var *Gmz, var *Gmx, var *Gmy, var *Gmz,
var *Sfx_rhs, var *Sfy_rhs, var *Sfz_rhs, var *Sfx_rhs, var *Sfy_rhs, var *Sfz_rhs,
double *Rout, monitor *Monitor, bool refresh_mass_fields = true); double *Rout, monitor *Monitor, bool refresh_mass_fields = true);
void surf_Wave(double rex, cgh *GH, ShellPatch *SH, void surf_WaveMassPAng(double rex, int lev, cgh *GH,
var *chi, var *trK, var *Rpsi4, var *Ipsi4, int spinw, int maxl, int NN, double *RP, double *IP,
var *gxx, var *gxy, var *gxz, var *gyy, var *gyz, var *gzz, var *chi, var *trK,
var *gxx, var *gxy, var *gxz, var *gyy, var *gyz, var *gzz,
var *Axx, var *Axy, var *Axz, var *Ayy, var *Ayz, var *Azz,
var *Gmx, var *Gmy, var *Gmz,
var *Sfx_rhs, var *Sfy_rhs, var *Sfz_rhs,
double *Rout, monitor *Monitor, bool refresh_mass_fields = true);
void surf_WaveMassPAng(double rex, int lev, ShellPatch *GH,
var *Rpsi4, var *Ipsi4, int spinw, int maxl, int NN, double *RP, double *IP,
var *chi, var *trK,
var *gxx, var *gxy, var *gxz, var *gyy, var *gyz, var *gzz,
var *Axx, var *Axy, var *Axz, var *Ayy, var *Ayz, var *Azz,
var *Gmx, var *Gmy, var *Gmz,
var *Sfx_rhs, var *Sfy_rhs, var *Sfz_rhs,
double *Rout, monitor *Monitor, bool refresh_mass_fields = true);
void surf_Wave(double rex, cgh *GH, ShellPatch *SH,
var *chi, var *trK,
var *gxx, var *gxy, var *gxz, var *gyy, var *gyz, var *gzz,
var *Axx, var *Axy, var *Axz, var *Ayy, var *Ayz, var *Azz, var *Axx, var *Axy, var *Axz, var *Ayy, var *Ayz, var *Azz,
var *chix, var *chiy, var *chiz, var *chix, var *chiy, var *chiz,
var *trKx, var *trKy, var *trKz, var *trKx, var *trKy, var *trKz,