Skip to content

Commit

Permalink
Added modular Midpoint and added EulerProp
Browse files Browse the repository at this point in the history
  • Loading branch information
stephenberry committed Aug 29, 2019
1 parent a0c19e5 commit 5b95476
Show file tree
Hide file tree
Showing 3 changed files with 53 additions and 0 deletions.
9 changes: 9 additions & 0 deletions include/ascent/integrators_modular/Euler.h
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,15 @@ namespace asc
{
namespace modular
{
template <class value_t>
struct EulerProp : public Propagator<value_t>
{
void operator()(State& state, const value_t dt) override
{
*state.x += dt * *state.xd;
}
};

template <typename value_t>
struct Euler
{
Expand Down
42 changes: 42 additions & 0 deletions include/ascent/integrators_modular/Midpoint.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
// Copyright (c) 2016-2019 Anyar, Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.

#pragma once

#include "ascent/modular/Module.h"
#include "ascent/integrators_modular/ModularIntegrators.h"

namespace asc
{
namespace modular
{
template <class value_t>
struct MidpointProp : public Propagator<value_t>
{
void operator()(State& state, const value_t dt) override
{
if (state.memory.empty())
{
state.memory.resize(1);
state.memory[0] = 0.0;
}
auto& xd0 = state.memory[0];

auto& xd = *state.xd;
*state.x += 0.5 * dt * (xd0 + xd);
xd0 = xd;
}
};
}
}
2 changes: 2 additions & 0 deletions include/ascent/integrators_modular/RK2.h
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,8 @@ namespace asc
case 1:
x = x0 + dt * xd;
break;
default:
break;
}
}
};
Expand Down

0 comments on commit 5b95476

Please sign in to comment.