Skip to content

WIP: Implement arbitrary field sequences #14

Open
TobiasKlemme wants to merge 13 commits intoNeumann-A:devfrom
TobiasKlemme:dev
Open

WIP: Implement arbitrary field sequences #14
TobiasKlemme wants to merge 13 commits intoNeumann-A:devfrom
TobiasKlemme:dev

Conversation

@TobiasKlemme
Copy link
Contributor

implemented sequence field

Comment on lines 22 to 50
#include "Constant.hpp"
#include "Field.hpp"
#include "Lissajous.hpp"
#include "ModulatedSinc.hpp"
#include "Rectangular.hpp"
#include "Sinc.hpp"
#include "Sinusoidal.hpp"
#include "Triangular.hpp"
#include "Zero.hpp"


#ifndef INC_SEQUENCEFIELDS_H
#define INC_SEQUENCEFIELDS_H
template <typename prec>
class ZeroField;
template <typename prec>
class ConstantField;
template <typename prec>
class LissajousField;
template <typename prec>
class RectangularField;
template <typename prec>
class SinusoidalField;
template <typename prec>
class TriangularField;
template <typename prec>
class SincField;
template <typename prec>
class ModulatedSincField;
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why do you need the forward definitions and the includes ?

Comment on lines 33 to 34
#ifndef INC_SEQUENCEFIELDS_H
#define INC_SEQUENCEFIELDS_H
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

why is this here ?

Comment on lines 107 to 110
#ifndef INC_SEQUENCEFieldSelector_H
#define INC_SEQUENCEFieldSelector_H
///---------------------------------------------------------------------------------------------------
#pragma once
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

????? C&P errors?

Comment on lines 104 to 105
#endif // INC_FieldList_H
// end of Fields\FieldList.h
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

comment?

SimulationManager() = default;
public:
STOPHYSIM_EXPORT SimulationManager(const Parameters &SimManSet)
STOPHYSIM_EXPORT SimulationManager(const Settings::SimulationManagerSettings<prec> &SimManSet)
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

why is this changed?

Comment on lines 35 to 37
Application SimManager{ std::move(input.getAppParams()) };
Settings::SimulationManagerSettings<PREC> test{input.getAppParams()};
Application SimManager{ test };

Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

????

// fields.push_back(fieldv2);

Properties::Fields::Lissajous<PREC> fieldprops{ {},Pos,ampl,freq, phases };
Properties::Fields::Sequence<PREC> fieldprops2{{},3,fields };
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Changes in this file necessary ? Or was this just testing?

@Neumann-A Neumann-A changed the title Dev WIP: Implement arbitrary field sequences Jun 22, 2022
SYSMATFILEGENMAKRO(field_enum_property_mapping<IField::Field_Rectangular>::type)
SYSMATFILEGENMAKRO(field_enum_property_mapping<IField::Field_Sinc>::type)
SYSMATFILEGENMAKRO(field_enum_property_mapping<IField::Field_Modsinc>::type)
//SYSMATFILEGENMAKRO(field_enum_property_mapping<IField::Field_Sequence>::type)
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why is this commented?

Fields/RectangularField.h
Fields/SincField.h
Fields/ModulatedSincField.h
Fields/SequenceField.h
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

change to hpp file

TobiasKlemme and others added 3 commits June 22, 2022 13:57
Co-authored-by: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com>
Co-authored-by: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com>
@Neumann-A
Copy link
Owner

@TobiasKlemme: Könntest du bitte ein Issue öffnen mit dem Fehler von dem du mir berichtet hattest und die Configs in das Issue anhängen? Ich hatte lokal versucht den Fehler zu reproduzieren, konnte aber keinen Fehler finden.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants