summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorErich Eckner <git@eckner.net>2015-12-09 13:02:35 +0100
committerErich Eckner <git@eckner.net>2015-12-09 13:02:35 +0100
commit717abb8ce8198c5b86a4f10a1a26230be5ca9a93 (patch)
tree438653f7d1a2ca5f205fe2d4d40d695779d2185a
parent597779f1a3e3c0c187ec845c63fae07582c9f7c9 (diff)
downloadPlasmapropagation-717abb8ce8198c5b86a4f10a1a26230be5ca9a93.tar.xz
compilerswitches.inc neu, in .gitignore und per updateunit verwendet
-rw-r--r--.gitignore1
-rw-r--r--Physikunit.pas13
-rw-r--r--Plasmapropagation.lpi18
-rw-r--r--Plasmapropagation.lpr5
-rw-r--r--Plasmapropagation.lps156
5 files changed, 104 insertions, 89 deletions
diff --git a/.gitignore b/.gitignore
index 5b1de54..d128547 100644
--- a/.gitignore
+++ b/.gitignore
@@ -16,3 +16,4 @@ lib
epost
*~
Log*
+Compilerswitches.inc
diff --git a/Physikunit.pas b/Physikunit.pas
index bbd63f1..f7ab68f 100644
--- a/Physikunit.pas
+++ b/Physikunit.pas
@@ -6,18 +6,7 @@ unit Physikunit;
{$ERROR This program can be compiled only on/for Unix/Linux based systems.}
{$ENDIF}
-{$MACRO on}
-
-// nach einer LiKo negative Dichten entfernen:
-{$DEFINE DichteNichtnegativieren:=perSkalieren} // insgesamt runter skalieren um negative Dichten aufzufüllen
-{ $DEFINE DichteNichtnegativieren:=perEinzelklau} // negative Dichten aus zufälligen Phasenraumpunkten auffüllen
-{ $DEFINE dnZwischenRKSchritten} // nach jeder LiKo Dichten nicht negativ machen
-
-{ $DEFINE negativeDichteueberwachung} // prüfen, ob die Dichten negativ werden
-
-{ $DEFINE exzessiveArrayBereichsTests} // zeitaufwändige(!) Array-Bereichstest für fftw
-
-{ $DEFINE laengenSindZweierpotenzen} // Laengen auf Zweierpotenzen runden (ggf. günstiger für fft)
+{$INCLUDE Compilerswitches.inc}
interface
diff --git a/Plasmapropagation.lpi b/Plasmapropagation.lpi
index d9909e2..1d0cd6e 100644
--- a/Plasmapropagation.lpi
+++ b/Plasmapropagation.lpi
@@ -33,7 +33,7 @@
<LaunchingApplication PathPlusParams="/usr/bin/screen -T 'Lazarus Run Output' -e $(LazarusDir)/tools/runwait.sh $(TargetCmdLine)"/>
</local>
</RunParams>
- <Units Count="6">
+ <Units Count="10">
<Unit0>
<Filename Value="Plasmapropagation.lpr"/>
<IsPartOfProject Value="True"/>
@@ -58,6 +58,22 @@
<Filename Value="linearkombinationen.inc"/>
<IsPartOfProject Value="True"/>
</Unit5>
+ <Unit6>
+ <Filename Value="Compilerswitches.inc"/>
+ <IsPartOfProject Value="True"/>
+ </Unit6>
+ <Unit7>
+ <Filename Value="../units/refreshexecutable.pas"/>
+ <IsPartOfProject Value="True"/>
+ </Unit7>
+ <Unit8>
+ <Filename Value="../units/compilerswitchupdateunit.pas"/>
+ <IsPartOfProject Value="True"/>
+ </Unit8>
+ <Unit9>
+ <Filename Value="../units/compilerswitchupdateunit.rc"/>
+ <IsPartOfProject Value="True"/>
+ </Unit9>
</Units>
</ProjectOptions>
<CompilerOptions>
diff --git a/Plasmapropagation.lpr b/Plasmapropagation.lpr
index 478901f..0e59243 100644
--- a/Plasmapropagation.lpr
+++ b/Plasmapropagation.lpr
@@ -2,13 +2,16 @@ program Plasmapropagation;
{$mode objfpc}{$H+}
+{$INCLUDE Compilerswitches.inc}
+
uses
{$IFDEF UNIX}{$IFDEF UseCThreads}
cthreads,
{$ENDIF}{$ENDIF}
Classes, SysUtils, CustApp,
{ you can add units after this }
- math, Physikunit, protokollunit, lowlevelunit, fftw;
+ math, Physikunit, protokollunit, lowlevelunit, fftw,
+ compilerswitchupdateunit;
type
diff --git a/Plasmapropagation.lps b/Plasmapropagation.lps
index cdb7b0d..f84ba69 100644
--- a/Plasmapropagation.lps
+++ b/Plasmapropagation.lps
@@ -3,23 +3,21 @@
<ProjectSession>
<Version Value="9"/>
<BuildModes Active="Default"/>
- <Units Count="22">
+ <Units Count="28">
<Unit0>
<Filename Value="Plasmapropagation.lpr"/>
<IsPartOfProject Value="True"/>
- <TopLine Value="29"/>
- <CursorPos Y="33"/>
+ <IsVisibleTab Value="True"/>
+ <CursorPos X="50" Y="13"/>
<UsageCount Value="200"/>
<Loaded Value="True"/>
</Unit0>
<Unit1>
<Filename Value="Physikunit.pas"/>
<IsPartOfProject Value="True"/>
- <IsVisibleTab Value="True"/>
- <EditorIndex Value="1"/>
- <TopLine Value="1658"/>
- <CursorPos X="14" Y="1676"/>
- <FoldState Value=" T7iBMO3 T3ma0{D5 pjYmB0R[944k20R6]9RkT0}h3]A1o60{j4]AgnA0V2 pkJlF0L31]UpYtZ0H5P"/>
+ <EditorIndex Value="2"/>
+ <CursorPos X="2" Y="9"/>
+ <FoldState Value=" T7i0MO3 T3mP0{D5 pjYmB0R[944k20R6]9RkT0}h3]A1o60{j4]AgnA0V2 pkJlF0L31]UpYtZ0H59"/>
<UsageCount Value="200"/>
<Loaded Value="True"/>
</Unit1>
@@ -33,7 +31,7 @@
<Unit3>
<Filename Value="input.plap"/>
<IsPartOfProject Value="True"/>
- <EditorIndex Value="3"/>
+ <EditorIndex Value="4"/>
<CursorPos X="19" Y="12"/>
<UsageCount Value="200"/>
<Loaded Value="True"/>
@@ -44,7 +42,7 @@
<IsPartOfProject Value="True"/>
<EditorIndex Value="-1"/>
<TopLine Value="226"/>
- <UsageCount Value="176"/>
+ <UsageCount Value="178"/>
</Unit4>
<Unit5>
<Filename Value="linearkombinationen.inc"/>
@@ -52,11 +50,11 @@
<EditorIndex Value="-1"/>
<TopLine Value="52"/>
<CursorPos X="11" Y="6"/>
- <UsageCount Value="139"/>
+ <UsageCount Value="141"/>
</Unit5>
<Unit6>
<Filename Value="input.epost"/>
- <EditorIndex Value="4"/>
+ <EditorIndex Value="5"/>
<TopLine Value="58"/>
<CursorPos X="23" Y="40"/>
<UsageCount Value="100"/>
@@ -72,19 +70,18 @@
</Unit7>
<Unit8>
<Filename Value="../units/lowlevelunit.pas"/>
- <EditorIndex Value="2"/>
+ <EditorIndex Value="3"/>
<TopLine Value="866"/>
<CursorPos X="96" Y="886"/>
- <UsageCount Value="16"/>
+ <UsageCount Value="17"/>
<Loaded Value="True"/>
</Unit8>
<Unit9>
<Filename Value="../units/mystringlistunit.pas"/>
<EditorIndex Value="-1"/>
- <TopLine Value="367"/>
- <CursorPos X="17" Y="390"/>
- <FoldState Value=" T3i3075 piZjD0WQ"/>
- <UsageCount Value="8"/>
+ <TopLine Value="101"/>
+ <CursorPos X="14" Y="117"/>
+ <UsageCount Value="10"/>
</Unit9>
<Unit10>
<Filename Value="rk14.inc"/>
@@ -167,126 +164,135 @@
<CursorPos X="46" Y="982"/>
<UsageCount Value="6"/>
</Unit21>
+ <Unit22>
+ <Filename Value="Compilerswitches.inc"/>
+ <IsPartOfProject Value="True"/>
+ <EditorIndex Value="1"/>
+ <CursorPos X="3" Y="19"/>
+ <UsageCount Value="22"/>
+ <Loaded Value="True"/>
+ </Unit22>
+ <Unit23>
+ <Filename Value="../units/gitupdateunit.pas"/>
+ <EditorIndex Value="-1"/>
+ <TopLine Value="9"/>
+ <CursorPos X="3" Y="13"/>
+ <UsageCount Value="11"/>
+ </Unit23>
+ <Unit24>
+ <Filename Value="../units/refreshexecutable.pas"/>
+ <IsPartOfProject Value="True"/>
+ <EditorIndex Value="-1"/>
+ <TopLine Value="18"/>
+ <CursorPos X="14" Y="21"/>
+ <UsageCount Value="22"/>
+ </Unit24>
+ <Unit25>
+ <Filename Value="../units/refreshexecutableunit.pas"/>
+ <EditorIndex Value="-1"/>
+ <TopLine Value="16"/>
+ <CursorPos X="32" Y="16"/>
+ <UsageCount Value="11"/>
+ </Unit25>
+ <Unit26>
+ <Filename Value="../units/compilerswitchupdateunit.pas"/>
+ <IsPartOfProject Value="True"/>
+ <EditorIndex Value="-1"/>
+ <CursorPos Y="32"/>
+ <UsageCount Value="21"/>
+ </Unit26>
+ <Unit27>
+ <Filename Value="../units/compilerswitchupdateunit.rc"/>
+ <IsPartOfProject Value="True"/>
+ <EditorIndex Value="-1"/>
+ <CursorPos X="80"/>
+ <UsageCount Value="21"/>
+ <DefaultSyntaxHighlighter Value="None"/>
+ </Unit27>
</Units>
- <JumpHistory Count="30" HistoryIndex="29">
+ <JumpHistory Count="21" HistoryIndex="20">
<Position1>
<Filename Value="Physikunit.pas"/>
- <Caret Line="2085" Column="13" TopLine="1460"/>
+ <Caret Line="1364" TopLine="1055"/>
</Position1>
<Position2>
<Filename Value="Physikunit.pas"/>
- <Caret Line="1412" Column="93" TopLine="1392"/>
+ <Caret Line="1557" TopLine="1536"/>
</Position2>
<Position3>
<Filename Value="Physikunit.pas"/>
- <Caret Line="1449" Column="117" TopLine="1428"/>
+ <Caret Line="1407" Column="13" TopLine="1379"/>
</Position3>
<Position4>
<Filename Value="Physikunit.pas"/>
- <Caret Line="2047" Column="32" TopLine="2029"/>
+ <Caret Line="1372" Column="47" TopLine="1327"/>
</Position4>
<Position5>
<Filename Value="Physikunit.pas"/>
- <Caret Line="1353" Column="27" TopLine="1313"/>
+ <Caret Line="2130" Column="35" TopLine="1679"/>
</Position5>
<Position6>
<Filename Value="Physikunit.pas"/>
- <Caret Line="10" Column="36"/>
</Position6>
<Position7>
<Filename Value="Physikunit.pas"/>
- <Caret Line="1558" Column="39" TopLine="1579"/>
+ <Caret Line="212" Column="15" TopLine="179"/>
</Position7>
<Position8>
<Filename Value="Physikunit.pas"/>
- <Caret Line="1350" Column="41" TopLine="1228"/>
+ <Caret Line="2121" Column="41" TopLine="1429"/>
</Position8>
<Position9>
<Filename Value="Physikunit.pas"/>
- <Caret Line="1386" Column="12" TopLine="1356"/>
</Position9>
<Position10>
<Filename Value="Physikunit.pas"/>
- <Caret Line="1360" Column="31" TopLine="1322"/>
+ <Caret Line="228" Column="23" TopLine="188"/>
</Position10>
<Position11>
<Filename Value="Physikunit.pas"/>
- <Caret Line="1399" TopLine="1364"/>
+ <Caret Line="216" TopLine="193"/>
</Position11>
<Position12>
<Filename Value="Physikunit.pas"/>
- <Caret Line="1364" TopLine="1055"/>
+ <Caret Line="2100" Column="22" TopLine="1613"/>
</Position12>
<Position13>
<Filename Value="Physikunit.pas"/>
- <Caret Line="1557" TopLine="1536"/>
+ <Caret Line="215" Column="32" TopLine="193"/>
</Position13>
<Position14>
<Filename Value="Physikunit.pas"/>
- <Caret Line="1407" Column="13" TopLine="1379"/>
+ <Caret Line="2165" TopLine="1548"/>
</Position14>
<Position15>
<Filename Value="Physikunit.pas"/>
- <Caret Line="1372" Column="47" TopLine="1327"/>
+ <Caret Line="1561" Column="20" TopLine="1548"/>
</Position15>
<Position16>
<Filename Value="Physikunit.pas"/>
- <Caret Line="2130" Column="35" TopLine="1679"/>
+ <Caret Line="19" Column="10"/>
</Position16>
<Position17>
<Filename Value="Physikunit.pas"/>
+ <Caret Line="1562" Column="26" TopLine="1528"/>
</Position17>
<Position18>
<Filename Value="Physikunit.pas"/>
- <Caret Line="212" Column="15" TopLine="179"/>
+ <Caret Line="19" Column="3"/>
</Position18>
<Position19>
<Filename Value="Physikunit.pas"/>
- <Caret Line="2121" Column="41" TopLine="1429"/>
+ <Caret Line="1669" Column="25" TopLine="1649"/>
</Position19>
<Position20>
<Filename Value="Physikunit.pas"/>
+ <Caret Line="1676" Column="14" TopLine="1658"/>
</Position20>
<Position21>
- <Filename Value="Physikunit.pas"/>
- <Caret Line="228" Column="23" TopLine="188"/>
+ <Filename Value="Plasmapropagation.lpr"/>
+ <Caret Line="11" Column="92"/>
</Position21>
- <Position22>
- <Filename Value="Physikunit.pas"/>
- <Caret Line="216" TopLine="193"/>
- </Position22>
- <Position23>
- <Filename Value="Physikunit.pas"/>
- <Caret Line="2100" Column="22" TopLine="1613"/>
- </Position23>
- <Position24>
- <Filename Value="Physikunit.pas"/>
- <Caret Line="215" Column="32" TopLine="193"/>
- </Position24>
- <Position25>
- <Filename Value="Physikunit.pas"/>
- <Caret Line="2165" TopLine="1548"/>
- </Position25>
- <Position26>
- <Filename Value="Physikunit.pas"/>
- <Caret Line="1561" Column="20" TopLine="1548"/>
- </Position26>
- <Position27>
- <Filename Value="Physikunit.pas"/>
- <Caret Line="19" Column="10"/>
- </Position27>
- <Position28>
- <Filename Value="Physikunit.pas"/>
- <Caret Line="1562" Column="26" TopLine="1528"/>
- </Position28>
- <Position29>
- <Filename Value="Physikunit.pas"/>
- <Caret Line="19" Column="3"/>
- </Position29>
- <Position30>
- <Filename Value="Physikunit.pas"/>
- <Caret Line="1669" Column="25" TopLine="1649"/>
- </Position30>
</JumpHistory>
</ProjectSession>
</CONFIG>