Skip to content

Fix issues with Aux_FindExtrema and Aux_FindWeightedAverageCenter's field preparation time #473

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
hyschive merged 2 commits into from
Jun 23, 2025
Merged

Fix issues with Aux_FindExtrema and Aux_FindWeightedAverageCenter's field preparation time #473

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d73260d
Use amr->FlusgTime instead of Time[lv]
hsinhaoHHuang Jun 23, 2025
3c51002
Merge branch 'main' into FixTimeInAuxFind
hsinhaoHHuang Jun 23, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions src/Auxiliary/Aux_FindExtrema.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -208,10 +208,11 @@ void Aux_FindExtrema( Extrema_t *Extrema, const ExtremaMode_t Mode, const int Mi
# ifdef MASSIVE_PARTICLES
if ( Extrema->Field & _PAR_DENS || Extrema->Field & _TOTAL_DENS )
{
Par_CollectParticle2OneLevel( lv, _PAR_MASS|_PAR_POSX|_PAR_POSY|_PAR_POSZ, _PAR_TYPE, PredictPos, Time[lv],
Par_CollectParticle2OneLevel( lv, _PAR_MASS|_PAR_POSX|_PAR_POSY|_PAR_POSZ, _PAR_TYPE, PredictPos,
amr->FluSgTime[lv][ amr->FluSg[lv] ],
SibBufPatch, FaSibBufPatch, JustCountNPar_No, TimingSendPar_No );

Prepare_PatchData_InitParticleDensityArray( lv, Time[lv] );
Prepare_PatchData_InitParticleDensityArray( lv, amr->FluSgTime[lv][ amr->FluSg[lv] ] );
}
# endif

Expand All @@ -221,7 +222,7 @@ void Aux_FindExtrema( Extrema_t *Extrema, const ExtremaMode_t Mode, const int Mi

if ( UsePrepare )
{
Prepare_PatchData( lv, Time[lv], FieldPtr[0][0][0], NULL, 0, NPG, PID0_List+Disp, Field, _NONE,
Prepare_PatchData( lv, amr->FluSgTime[lv][ amr->FluSg[lv] ], FieldPtr[0][0][0], NULL, 0, NPG, PID0_List+Disp, Field, _NONE,
INT_NONE, INT_NONE, UNIT_PATCH, NSIDE_00, IntPhase_No, OPT__BC_FLU, BC_POT_NONE,
MinDens_No, MinPres_No, MinTemp_No, MinEntr_No, DE_Consistency_No );
}
Expand Down
7 changes: 4 additions & 3 deletions src/Auxiliary/Aux_FindWeightedAverageCenter.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -186,10 +186,11 @@ void Aux_FindWeightedAverageCenter( double WeightedAverageCenter[], const double
# ifdef MASSIVE_PARTICLES
if ( WeightingDensityField & _PAR_DENS || WeightingDensityField & _TOTAL_DENS )
{
Par_CollectParticle2OneLevel( lv, _PAR_MASS|_PAR_POSX|_PAR_POSY|_PAR_POSZ, _PAR_TYPE, PredictPos, Time[lv],
Par_CollectParticle2OneLevel( lv, _PAR_MASS|_PAR_POSX|_PAR_POSY|_PAR_POSZ, _PAR_TYPE, PredictPos,
amr->FluSgTime[lv][ amr->FluSg[lv] ],
SibBufPatch, FaSibBufPatch, JustCountNPar_No, TimingSendPar_No );

Prepare_PatchData_InitParticleDensityArray( lv, Time[lv] );
Prepare_PatchData_InitParticleDensityArray( lv, amr->FluSgTime[lv][ amr->FluSg[lv] ] );
}
# endif

Expand All @@ -204,7 +205,7 @@ void Aux_FindWeightedAverageCenter( double WeightedAverageCenter[], const double
// get the weighting density on grids
if ( UsePrepare )
{
Prepare_PatchData( lv, Time[lv], WeightingDensity[0][0][0], NULL, 0, NPG, PID0_List+Disp, WeightingDensityField, _NONE,
Prepare_PatchData( lv, amr->FluSgTime[lv][ amr->FluSg[lv] ], WeightingDensity[0][0][0], NULL, 0, NPG, PID0_List+Disp, WeightingDensityField, _NONE,
INT_NONE, INT_NONE, UNIT_PATCH, NSIDE_00, IntPhase_No, OPT__BC_FLU, BC_POT_NONE,
MinDens_No, MinPres_No, MinTemp_No, MinEntr_No, DE_Consistency_No );
}
Expand Down
Loading