Skip to content

Jrmales/modal ps ds restart hardening #30

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
jaredmales merged 2 commits into from
Mar 22, 2026
Merged

Jrmales/modal ps ds restart hardening #30

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
3258ca7
fixes to turb prop
jaredmales Mar 21, 2026
d2c3bf1
circularBuffer: add fixed-size SPSC mode
jaredmales Mar 21, 2026
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: 2 additions & 5 deletions include/ao/sim/turbAtmosphere.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -736,7 +736,7 @@ int turbAtmosphere<aoSystemT, verboseT>::shift( improc::milkImage<realT> &milkPh
{
}

// Don't use OMP if no multiple layers b/c it seems to make it use multiple threads in some awful way
// Don't use OMP if not multiple layers b/c it seems to make it use multiple threads in some awful way
if( m_layers.size() > 1 )
{
// clang-format off
Expand All @@ -748,10 +748,7 @@ int turbAtmosphere<aoSystemT, verboseT>::shift( improc::milkImage<realT> &milkPh
}
else
{
for( size_t j = 0; j < m_layers.size(); ++j )
{
m_layers[j].shift( dt );
}
m_layers[0].shift( dt );
}

milkPhase.setWrite();
Expand Down
19 changes: 14 additions & 5 deletions include/ao/sim/turbLayer.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -293,23 +293,32 @@ void turbLayer<aoSystemT, verboseT>::shift( realT dt )
ddx = m_x0 + m_dx * dt;
ddy = m_y0 + m_dy * dt;

wdx = (int)trunc( ddx );
wdx = static_cast<int>( std::floor( ddx ) );
ddx -= wdx;

wdy = (int)trunc( ddy );
wdy = static_cast<int>( std::floor( ddy ) );
ddy -= wdy;

wdx %= m_scrnSz;
wdy %= m_scrnSz;
wdx %= static_cast<int>( m_scrnSz );
wdy %= static_cast<int>( m_scrnSz );

if( wdx < 0 )
wdx += m_scrnSz;
if( wdy < 0 )
wdy += m_scrnSz;

if( dt == 0 )
{
m_shiftPhase = m_phase;
// Prime both the whole-pixel and shifted buffers so the first
// subsequent sub-pixel shift has valid input data.
improc::imageShiftWP( m_shiftPhaseWP, m_phase, wdx, wdy );
m_shiftPhase = m_shiftPhaseWP;
}
else
{
// Check for a new whole-pixel shift
if( wdx != m_last_wdx || wdy != m_last_wdy )
if( wdx != m_last_wdx || wdy != m_last_wdy || m_last_wdx == m_scrnSz + 1 || m_last_wdy == m_scrnSz + 1 )
{
// Need a whole pixel shift (this also extracts the m_wfSz + m_buffSz subarray)
improc::imageShiftWP( m_shiftPhaseWP, m_phase, wdx, wdy );
Expand Down
Loading
Loading