From 0c2343a338fb147c8f57a0cc7b5bbbf1cd8abd0f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gr=C3=A9goire=20Henry?= Date: Thu, 14 Dec 2023 14:07:19 +0100 Subject: [PATCH] Add Moon cfg --- .github/workflows/release.yml | 2 +- Cargo.lock | 2 +- Cargo.toml | 2 +- compile/installer.iss | 6 ++--- examples/moon/cfg/cfg.yaml | 44 +++++++++++++++++++++++++++++++++++ 5 files changed, 50 insertions(+), 6 deletions(-) create mode 100644 examples/moon/cfg/cfg.yaml diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 8573f2c..3a9c7f0 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -100,7 +100,7 @@ jobs: mv bundle $BUNDLE_NAME if [ "${{ matrix.os }}" == "windows-latest" ]; then - iscc compile/installer.iss /DVERSION=${{ github.ref_name }} /DSETUP_NAME=${{ env.RELEASE_FILE }} /DBUNDLE_PATH=bundle /DASSETS_PATH=assets + iscc compile/installer.iss /DVERSION=${{ github.ref_name }} /F"${{ env.RELEASE_FILE }}" else tar cvzf $RELEASE_FILE $BUNDLE_NAME fi diff --git a/Cargo.lock b/Cargo.lock index 470a034..95b3ed0 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1510,7 +1510,7 @@ dependencies = [ [[package]] name = "kalast" -version = "0.4.0-beta18" +version = "0.4.0-beta20" dependencies = [ "chrono", "color-eyre", diff --git a/Cargo.toml b/Cargo.toml index 6c85113..bb2cd7f 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "kalast" -version = "0.4.0-beta19" +version = "0.4.0-beta20" authors = ["Grégoire Henry "] edition = "2021" description = "Thermophysical Model for Binary Asteroids" diff --git a/compile/installer.iss b/compile/installer.iss index 0708d59..5496a98 100644 --- a/compile/installer.iss +++ b/compile/installer.iss @@ -16,10 +16,10 @@ DefaultDirName=C:\Program Files\{#NAME} DefaultGroupName={#NAME} DisableWelcomePage=no OutputDir=. -OutputBaseFilename={#SETUP_NAME} +; OutputBaseFilename={#SETUP_NAME} Compression=lzma SolidCompression=yes -WizardImageFile={#ASSETS_PATH}\vbanner-intro.bmp +WizardImageFile=assets\vbanner-intro.bmp WizardImageStretch=yes [Icons] @@ -29,4 +29,4 @@ Name: "{group}\{#NAME}"; Filename: "{app}\{#NAME}.exe"; WorkingDir: "{app}"; Ico Name: "english"; MessagesFile: "compiler:Default.isl" [Files] -Source: "{#BUNDLE_PATH}\*"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs \ No newline at end of file +Source: "bundle\*"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs \ No newline at end of file diff --git a/examples/moon/cfg/cfg.yaml b/examples/moon/cfg/cfg.yaml new file mode 100644 index 0000000..0b52c7e --- /dev/null +++ b/examples/moon/cfg/cfg.yaml @@ -0,0 +1,44 @@ +window: + colormap: + name: inferno + vmax: 500.0 + scalar: temperature + +simulation: + routines: thermal + step: 600 + duration: 300672000 + export: + step: 600 + duration: 2505600 + period: 30067200 + + +scene: + sun: + position: + !cartesian [1.5e11, 0.0, 0.0] + camera: + position: + !cartesian [5.0, 0.0, 0.0] + +bodies: + - id: didymos + mesh: + shape: sphere + material: + albedo: 0.1 + emissivity: 0.9 + thermal_inertia: 100.0 + density: 1800.0 + heat_capacity: 600.0 + spin: + period: 2505600 + obliquity: 1.5 + interior: + type: linear + size: 40 + a: 2e-2 + color: data + record: + columns: [114] \ No newline at end of file