Merge wave and mass extraction interpolation
This commit is contained in:
@@ -7173,33 +7173,36 @@ void bssn_class::AnalysisStuff(int lev, double dT_lev)
|
||||
// misc::tillherecheck(GH->Commlev[lev],GH->start_rank[lev],"before surface integral");
|
||||
#ifdef WithShell
|
||||
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_MassPAng(Rex, lev, GH, phi0, trK0,
|
||||
gxx0, gxy0, gxz0, gyy0, gyz0, gzz0,
|
||||
Axx0, Axy0, Axz0, Ayy0, Ayz0, Azz0,
|
||||
Gmx0, Gmy0, Gmz0, Sfx1, Sfy1, Sfz1, // here we can not touch rhs variables, but 1 variables
|
||||
RoutMAP, ErrorMonitor, !patch_mass_prepared);
|
||||
{
|
||||
Waveshell->surf_WaveMassPAng(Rex, lev, GH,
|
||||
Rpsi4, Ipsi4, 2, maxl, NN, RP, IP,
|
||||
phi0, trK0,
|
||||
gxx0, gxy0, gxz0, gyy0, gyz0, gzz0,
|
||||
Axx0, Axy0, Axz0, Ayy0, Ayz0, Azz0,
|
||||
Gmx0, Gmy0, Gmz0, Sfx1, Sfy1, Sfz1,
|
||||
RoutMAP, ErrorMonitor, !patch_mass_prepared);
|
||||
patch_mass_prepared = true;
|
||||
}
|
||||
else
|
||||
{
|
||||
Waveshell->surf_Wave(Rex, lev, SH, Rpsi4, Ipsi4, 2, maxl, NN, RP, IP, ErrorMonitor);
|
||||
Waveshell->surf_MassPAng(Rex, lev, SH, phi0, trK0,
|
||||
gxx0, gxy0, gxz0, gyy0, gyz0, gzz0,
|
||||
Axx0, Axy0, Axz0, Ayy0, Ayz0, Azz0,
|
||||
Gmx0, Gmy0, Gmz0, Sfx1, Sfy1, Sfz1, // here we can not touch rhs variables, but 1 variables
|
||||
RoutMAP, ErrorMonitor, !shell_mass_prepared);
|
||||
Waveshell->surf_WaveMassPAng(Rex, lev, SH,
|
||||
Rpsi4, Ipsi4, 2, maxl, NN, RP, IP,
|
||||
phi0, trK0,
|
||||
gxx0, gxy0, gxz0, gyy0, gyz0, gzz0,
|
||||
Axx0, Axy0, Axz0, Ayy0, Ayz0, Azz0,
|
||||
Gmx0, Gmy0, Gmz0, Sfx1, Sfy1, Sfz1,
|
||||
RoutMAP, ErrorMonitor, !shell_mass_prepared);
|
||||
shell_mass_prepared = true;
|
||||
}
|
||||
#else
|
||||
#if (PSTR == 0)
|
||||
Waveshell->surf_Wave(Rex, lev, GH, Rpsi4, Ipsi4, 2, maxl, NN, RP, IP, ErrorMonitor);
|
||||
Waveshell->surf_MassPAng(Rex, lev, GH, phi0, trK0,
|
||||
gxx0, gxy0, gxz0, gyy0, gyz0, gzz0,
|
||||
Axx0, Axy0, Axz0, Ayy0, Ayz0, Azz0,
|
||||
Gmx0, Gmy0, Gmz0, Sfx1, Sfy1, Sfz1, // here we can not touch rhs variables, but 1 variables
|
||||
RoutMAP, ErrorMonitor, !patch_mass_prepared);
|
||||
Waveshell->surf_WaveMassPAng(Rex, lev, GH,
|
||||
Rpsi4, Ipsi4, 2, maxl, NN, RP, IP,
|
||||
phi0, trK0,
|
||||
gxx0, gxy0, gxz0, gyy0, gyz0, gzz0,
|
||||
Axx0, Axy0, Axz0, Ayy0, Ayz0, Azz0,
|
||||
Gmx0, Gmy0, Gmz0, Sfx1, Sfy1, Sfz1,
|
||||
RoutMAP, ErrorMonitor, !patch_mass_prepared);
|
||||
patch_mass_prepared = true;
|
||||
#elif (PSTR == 1 || PSTR == 2)
|
||||
Waveshell->surf_Wave(Rex, lev, GH, Rpsi4, Ipsi4, 2, maxl, NN, RP, IP, ErrorMonitor, GH->Commlev[lev]);
|
||||
|
||||
Reference in New Issue
Block a user