From 789429d1c51a0d2b74fcf23a955e831ce3be86d4 Mon Sep 17 00:00:00 2001 From: Jonas Schaub <44881147+JonasSchaub@users.noreply.github.com> Date: Tue, 30 Apr 2024 16:35:40 +0200 Subject: [PATCH] MORTAR v1.2-beta.1 for further testing before official release; --- CITATION.cff | 4 ++-- README.md | 14 +++++++------- Tutorial/MORTAR_Tutorial.pdf | Bin 8351724 -> 8167507 bytes build.gradle | 2 +- .../mortar/model/util/BasicDefinitions.java | 2 +- 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/CITATION.cff b/CITATION.cff index 4b7ac50f..cd32d731 100644 --- a/CITATION.cff +++ b/CITATION.cff @@ -1,6 +1,6 @@ cff-version: 1.2.0 title: MORTAR -version: "1.2.0.0-beta" +version: "1.2.0.0-beta.1" message: "If you use this software, please cite it as below." type: software authors: @@ -26,7 +26,7 @@ authors: given-names: "Achim" orcid: "https://orcid.org/0000-0003-0722-4229" doi: "10.5281/zenodo.6984804" -date-released: 2024-04-15 +date-released: 2024-04-30 url: "https://github.com/FelixBaensch/MORTAR" license: MIT references: diff --git a/README.md b/README.md index 31d2f735..457fd0a9 100644 --- a/README.md +++ b/README.md @@ -65,12 +65,12 @@ Pre-compiled and executable MORTAR distributions can be found attached to the
Windows: A convenient Windows OS installer executable for MORTAR is available
-(click here to
+(click here to
automatically download the installer .exe of the latest version). Download the installer
executable, start, and follow the instructions to install MORTAR. Note that the installation includes a full
Java Runtime Environment (JRE). After installation, create a shortcut to an appropriate MORTAR start batch file on your
Windows desktop. E.g. for MORTAR to use up to 4 gigabyte of RAM, copy a shortcut to batch file "MORTAR.bat" which is
-located in the MORTAR program folder (default "C:\Program Files\MORTAR\MORTARv1.2.0.0-beta\bin" or the path specified at
+located in the MORTAR program folder (default "C:\Program Files\MORTAR\MORTARv1.2.0.0-beta.1\bin" or the path specified at
installation). To start MORTAR, double-click the created shortcut. MORTAR can be uninstalled by the provided
Uninstall.exe executable in the MORTAR program folder or standard Windows functions.
@@ -89,15 +89,15 @@ with your chosen initially allocated memory (-Xms) and maximum value (-Xmx) acco
described below. As an alternative way, they should also work on Windows.
Linux and macOS: Every release has the executable Java ARchive (JAR) "MORTAR-fat-1.2.0.0-beta.jar" +
Linux and macOS: Every release has the executable Java ARchive (JAR) "MORTAR-fat-1.2.0.0-beta.1.jar" attached, which contains the packaged MORTAR code together with all dependencies -(click here +(click here to automatically download the JAR of the latest version). To run MORTAR (with up to 4 GB of RAM available, e.g.), execute the JAR from the command-line using
```shell -java -jar -Xms512m -Xmx4gPlease note that MORTAR only supports x64 (on all three platforms) and AArch64 (on macOS and Linux) architectures in general. -For the latter, a special "fat JAR" named "MORTAR-fat-aarch64-1.2.0.0-beta.jar" is available from the distributions attached to the releases and must be used -(click here to +For the latter, a special "fat JAR" named "MORTAR-fat-aarch64-1.2.0.0-beta.1.jar" is available from the distributions attached to the releases and must be used +(click here to automatically download the AArch64 JAR of the latest version).
Also note that using the Windows Subsystem for Linux (WSL) is not recommended, since a lot of additional configurations have to be made there to run Java GUI applications. diff --git a/Tutorial/MORTAR_Tutorial.pdf b/Tutorial/MORTAR_Tutorial.pdf index bdd0a504a21e86d07536b8cda21b2ca049363942..6244838e410de75d34d94e03b16680d9b5870509 100644 GIT binary patch delta 7233439 zcmYhi1ytSI^9EX+;_h0YxVx7Eg+j4|ySo>cLx3Vhin}`;++B*hyBBwNf4#qZ-~YX= zm6erb=F80NZ|3YhCplh!ftmh&2~+v?2#UK#=130;;Lt)k!IlLdVMPp#(2^vRl6|la zh|A%ZIn*}%g;7Nju6d2k$b@OcXz|g~n;N6OcaGp&t&QKRdT|5;uBcLdS8bfZ$40xj z%TRvyB1#v`(-ugrQh%S>4+RV@5`!KA*pV6!F;V?vW)Pb)p5DF7EwW>mXmN15c+- z40<&L;PdZ%HAc6@O}qtXQ^spBGfR8I=W1%TO&@l7^kfAlI-`}RnKjYm6lUtD=xVDv zvk=MK$WI!b?WYoJILxX2IKqVR?UhVz4<#KM=g3Hz)3~F(p}Ikb)6Ln6?`BcSmA!PzH+}=;eQ_QIi9K)(_BEF
zx*iRAdl{2`**MA-ec49u0Q67e?xZFe*FCHcX{n!mTldoK<-yGBm%xv}BiH(0Qx!D-
zkn)|nY$kJETU(pyenf49NWIyfY28e4y^q;d$m!|nbYaBGOV4lSx_d@#?W2~KaV~E8
z%tQ-_wN}cQvs sj#9?!Yok~>PL(@OJwT-;?_
z32QigpcoNzSf~O
zZDK=1ojzBkFmSS0)7Bw~-}V?5S9iB9>eDI3;hYErBu|rUC%S5Q9WT!P@!9VOTG!T#
zI(_mvm~SFQE?=b7&*a9l>;@lqI7KQ5|FQgCq9v^MVf5`>KWj(6Jh{yJu~VI&s7N(#
zU15I2e(Oy5oQ?R~$e%gVsTOdV$ay)u&sh%QjE~7%5TWSnb)C}nBtnDAsoa<>@lunn
zuDD2Z*t|mR4E>I+tu1pK$0cA8VSqtSNLPct*(=tzc=U$BriQX1bqdlZ+&)0(1HpK^
zk31WoY%F_)G_Zo3@!O_T>>$IQT8A0#5ziWpCjT>0#}-^aQ(s@dn{91x?O}5xT|2|x
zu%fQ0r@Ov1#StF%1tj|v4L-_f*(2A(lqC0RZ1lF*KI&;LC_4e9T*sa-Zz`Tf_ibZ`
zv}pGweWRzRJd0ePkVWsq_D#u~wxU&CAYLXg|2*lpL2X@~B}D6xRZVt%`dDi@@>pAR
zD
7s*$P=?SGAR;|9={-k9
zK&b+f&`}^j=)FS}M5IO_^d=obliuOmsBz|g-tT#TuYZPf_FjAKRjzfdl?e8u$F3&n
zSi+;#&nfWwv2m|&wM08glZFReai!?w4QiA{^Y%d>YN(D&KINiw