Skip to content
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

Revert "Solver improve engine database" #59

Open
wants to merge 1 commit into
base: solver_redo
Choose a base branch
from
Open

Revert "Solver improve engine database" #59

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
11 changes: 8 additions & 3 deletions GameData/AJE/AJE.version
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,17 @@
"VERSION" : {
"MAJOR" : 2,
"MINOR" : 7,
"PATCH" : 2,
"PATCH" : 1,
"BUILD" : 0
},
"KSP_VERSION" : {
"KSP_VERSION_MIN" : {
"MAJOR" : 1,
"MINOR" : 1,
"PATCH" : 3
"PATCH" : 2
},
"KSP_VERSION_MAX" : {
"MAJOR" : 1,
"MINOR" : 1,
"PATCH" : 2
}
}
Binary file modified GameData/AJE/Plugins/AJE.dll
View file
Open in desktop
Binary file not shown.
Binary file modified GameData/SolverEngines/Plugins/SolverEngines.dll
View file
Open in desktop
Binary file not shown.
7 changes: 1 addition & 6 deletions GameData/SolverEngines/Readme_SolverEngines.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,16 +29,11 @@ See AJE or RealFuels for examples of how to implement SolverEngines in practice.

Changelog:

V2.3
* Revert AssemblyVersion to 2.1.0.0 since latest releases of AJE and RF depend on it

v2.2
* Recompile against KSP 1.1.3

v2.1
* Update for KSP 1.1.2

v2.0

* Updated for KSP 1.1
* Support variable thrust per transform as in ModuleEngines

Expand Down
11 changes: 8 additions & 3 deletions GameData/SolverEngines/SolverEngines.version
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,18 @@
},
"VERSION" : {
"MAJOR" : 2,
"MINOR" : 3,
"MINOR" : 1,
"PATCH" : 0,
"BUILD" : 0
},
"KSP_VERSION" : {
"KSP_VERSION_MIN" : {
"MAJOR" : 1,
"MINOR" : 1,
"PATCH" : 2
},
"KSP_VERSION_MAX" : {
"MAJOR" : 1,
"MINOR" : 1,
"PATCH" : 3
"PATCH" : 2
}
}
4 changes: 4 additions & 0 deletions Source/AJE.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,18 +53,22 @@
</ItemGroup>
<ItemGroup>
<Reference Include="Assembly-CSharp">
<HintPath>..\..\..\..\..\..\Games\KSP_win1\KSP_x64_Data\Managed\Assembly-CSharp.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="KSPUtil">
<HintPath>..\..\..\..\..\..\Games\KSP_win1\KSP_x64_Data\Managed\KSPUtil.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="SolverEngines">
<HintPath>..\..\SolverEngines\GameData\SolverEngines\Plugins\SolverEngines.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="System">
<Private>False</Private>
</Reference>
<Reference Include="UnityEngine">
<HintPath>..\..\..\..\..\..\Games\KSP_win1\KSP_x64_Data\Managed\UnityEngine.dll</HintPath>
<Private>False</Private>
</Reference>
</ItemGroup>
Expand Down
12 changes: 6 additions & 6 deletions Source/AJEJet.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,11 @@
using UnityEngine;
using System.Reflection;
using SolverEngines;
using SolverEngines.EngineFitting;

namespace AJE
{

public class ModuleEnginesAJEJet : ModuleEnginesSolver, IModuleInfo, IEngineStatus, IFittableEngine
public class ModuleEnginesAJEJet : ModuleEnginesSolver, IModuleInfo, IEngineStatus
{
[EngineFitResult]
[KSPField(isPersistant = false, guiActive = false)]
Expand Down Expand Up @@ -269,15 +268,13 @@ public float GetStaticWetNozzleArea()

#region Engine Fitting

public bool CanFitEngine => true;

public void PushFitParamsToSolver()
public override void PushFitParamsToSolver()
{
(engineSolver as SolverJet).SetFitParams(Area, FHV, TAB, minThrottle, turbineAreaRatio);
PushAreaToInlet();
}

public void DoEngineFit()
public override void DoEngineFit()
{
SolverJet jetEngine = engineSolver as SolverJet;
jetEngine.FitEngine(dryThrust * 1000d, drySFC, wetThrust * 1000d, idleNPR, defaultTPR : defaultTPR);
Expand Down Expand Up @@ -398,6 +395,9 @@ public override string GetInfo()

private void SetStaticSimulation()
{
CreateEngineIfNecessary();

FitEngineIfNecessary();
ambientTherm = new EngineThermodynamics();
ambientTherm.FromStandardConditions(true);

Expand Down
5 changes: 3 additions & 2 deletions Source/Properties/AssemblyInfo.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,8 @@
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("2.7.2.0")]
[assembly: AssemblyFileVersion("2.7.2.0")]
[assembly: AssemblyVersion("2.7.1.0")]
[assembly: AssemblyFileVersion("2.7.1.0")]

// Keep this the same
[assembly: KSPAssemblyDependency("SolverEngines", 2, 1)]