refactor: combine mapping of inertial and dynamic forces
+ fix typos
@@ -57,24 +57,14 @@ class LiftDistribution(BaseSolver):
def lift_distribution(self, struct_tstep, aero_tstep):
# Force mapping
forces = mapping.aero2struct_force_mapping(
- aero_tstep.forces,
+ aero_tstep.forces + aero_tstep.dynamic_forces,
self.data.aero.struct2aero_mapping,
aero_tstep.zeta,
- structural_tstep.pos,
- structural_tstep.psi,
+ struct_tstep.pos,
+ struct_tstep.psi,
self.data.structure.node_master_elem,
self.data.structure.connectivities,
- structural_tstep.cag(),
- self.data.aero.aero_dict)
- forces += mapping.aero2struct_force_mapping(
- aero_tstep.dynamic_forces,
- self.data.aero.struct2aero_mapping,
- aero_tstep.zeta,
- structural_tstep.pos,
- structural_tstep.psi,
- self.data.structure.node_master_elem,
- self.data.structure.connectivities,
- structural_tstep.cag(),
+ struct_tstep.cag(),
self.data.aero.aero_dict)
# get aero forces
