summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Physikunit.pas31
-rw-r--r--Plasmapropagation.lps187
-rw-r--r--linearkombination.inc96
3 files changed, 202 insertions, 112 deletions
diff --git a/Physikunit.pas b/Physikunit.pas
index 6f9f60c..2c6b8ce 100644
--- a/Physikunit.pas
+++ b/Physikunit.pas
@@ -97,8 +97,13 @@ type
procedure liKo(in1,in2,in3,in4,in5,in6,in7,in8,in9,in10,in11,in12,in13,in14: tWertePunkt; fak2,fak3,fak4,fak5,fak6,fak7,fak8,fak9,fak10,fak11,fak12,fak13,fak14: extended); overload;
procedure liKo(in1,in2,in3,in4,in5,in6,in7,in8,in9,in10,in11,in12,in13,in14,in15: tWertePunkt; fak2,fak3,fak4,fak5,fak6,fak7,fak8,fak9,fak10,fak11,fak12,fak13,fak14,fak15: extended); overload;
procedure liKo(in1,in2,in3,in4,in5,in6,in7,in8,in9,in10,in11,in12,in13,in14,in15,in16: tWertePunkt; fak2,fak3,fak4,fak5,fak6,fak7,fak8,fak9,fak10,fak11,fak12,fak13,fak14,fak15,fak16: extended); overload;
+ procedure liKo(in1,in2,in3,in4,in5,in6,in7,in8,in9,in10,in11,in12,in13,in14,in15,in16,in17: tWertePunkt; fak2,fak3,fak4,fak5,fak6,fak7,fak8,fak9,fak10,fak11,fak12,fak13,fak14,fak15,fak16,fak17: extended); overload;
+ procedure liKo(in1,in2,in3,in4,in5,in6,in7,in8,in9,in10,in11,in12,in13,in14,in15,in16,in17,in18: tWertePunkt; fak2,fak3,fak4,fak5,fak6,fak7,fak8,fak9,fak10,fak11,fak12,fak13,fak14,fak15,fak16,fak17,fak18: extended); overload;
+ procedure liKo(in1,in2,in3,in4,in5,in6,in7,in8,in9,in10,in11,in12,in13,in14,in15,in16,in17,in18,in19: tWertePunkt; fak2,fak3,fak4,fak5,fak6,fak7,fak8,fak9,fak10,fak11,fak12,fak13,fak14,fak15,fak16,fak17,fak18,fak19: extended); overload;
procedure liKo(in1,in2,in3,in4,in5,in6,in7,in8,in9,in10,in11,in12,in13,in14,in15,in16,in17,in18,in19,in20,in21,in22: tWertePunkt; fak2,fak3,fak4,fak5,fak6,fak7,fak8,fak9,fak10,fak11,fak12,fak13,fak14,fak15,fak16,fak17,fak18,fak19,fak20,fak21,fak22: extended); overload;
procedure liKo(in1,in2,in3,in4,in5,in6,in7,in8,in9,in10,in11,in12,in13,in14,in15,in16,in17,in18,in19,in20,in21,in22,in23: tWertePunkt; fak2,fak3,fak4,fak5,fak6,fak7,fak8,fak9,fak10,fak11,fak12,fak13,fak14,fak15,fak16,fak17,fak18,fak19,fak20,fak21,fak22,fak23: extended); overload;
+ procedure liKo(in1,in2,in3,in4,in5,in6,in7,in8,in9,in10,in11,in12,in13,in14,in15,in16,in17,in18,in19,in20,in21,in22,in23,in24,in25,in26,in27,in28,in29,in30,in31: tWertePunkt; fak2,fak3,fak4,fak5,fak6,fak7,fak8,fak9,fak10,fak11,fak12,fak13,fak14,fak15,fak16,fak17,fak18,fak19,fak20,fak21,fak22,fak23,fak24,fak25,fak26,fak27,fak28,fak29,fak30,fak31: extended); overload;
+ procedure liKo(in1,in2,in3,in4,in5,in6,in7,in8,in9,in10,in11,in12,in13,in14,in15,in16,in17,in18,in19,in20,in21,in22,in23,in24,in25,in26,in27,in28,in29,in30,in31,in32: tWertePunkt; fak2,fak3,fak4,fak5,fak6,fak7,fak8,fak9,fak10,fak11,fak12,fak13,fak14,fak15,fak16,fak17,fak18,fak19,fak20,fak21,fak22,fak23,fak24,fak25,fak26,fak27,fak28,fak29,fak30,fak31,fak32: extended); overload;
function maxDT: extended;
end;
@@ -131,8 +136,13 @@ type
procedure liKo(in1,in2,in3,in4,in5,in6,in7,in8,in9,in10,in11,in12,in13,in14: tFelder; fak2,fak3,fak4,fak5,fak6,fak7,fak8,fak9,fak10,fak11,fak12,fak13,fak14: extended); overload;
procedure liKo(in1,in2,in3,in4,in5,in6,in7,in8,in9,in10,in11,in12,in13,in14,in15: tFelder; fak2,fak3,fak4,fak5,fak6,fak7,fak8,fak9,fak10,fak11,fak12,fak13,fak14,fak15: extended); overload;
procedure liKo(in1,in2,in3,in4,in5,in6,in7,in8,in9,in10,in11,in12,in13,in14,in15,in16: tFelder; fak2,fak3,fak4,fak5,fak6,fak7,fak8,fak9,fak10,fak11,fak12,fak13,fak14,fak15,fak16: extended); overload;
+ procedure liKo(in1,in2,in3,in4,in5,in6,in7,in8,in9,in10,in11,in12,in13,in14,in15,in16,in17: tFelder; fak2,fak3,fak4,fak5,fak6,fak7,fak8,fak9,fak10,fak11,fak12,fak13,fak14,fak15,fak16,fak17: extended); overload;
+ procedure liKo(in1,in2,in3,in4,in5,in6,in7,in8,in9,in10,in11,in12,in13,in14,in15,in16,in17,in18: tFelder; fak2,fak3,fak4,fak5,fak6,fak7,fak8,fak9,fak10,fak11,fak12,fak13,fak14,fak15,fak16,fak17,fak18: extended); overload;
+ procedure liKo(in1,in2,in3,in4,in5,in6,in7,in8,in9,in10,in11,in12,in13,in14,in15,in16,in17,in18,in19: tFelder; fak2,fak3,fak4,fak5,fak6,fak7,fak8,fak9,fak10,fak11,fak12,fak13,fak14,fak15,fak16,fak17,fak18,fak19: extended); overload;
procedure liKo(in1,in2,in3,in4,in5,in6,in7,in8,in9,in10,in11,in12,in13,in14,in15,in16,in17,in18,in19,in20,in21,in22: tFelder; fak2,fak3,fak4,fak5,fak6,fak7,fak8,fak9,fak10,fak11,fak12,fak13,fak14,fak15,fak16,fak17,fak18,fak19,fak20,fak21,fak22: extended); overload;
procedure liKo(in1,in2,in3,in4,in5,in6,in7,in8,in9,in10,in11,in12,in13,in14,in15,in16,in17,in18,in19,in20,in21,in22,in23: tFelder; fak2,fak3,fak4,fak5,fak6,fak7,fak8,fak9,fak10,fak11,fak12,fak13,fak14,fak15,fak16,fak17,fak18,fak19,fak20,fak21,fak22,fak23: extended); overload;
+ procedure liKo(in1,in2,in3,in4,in5,in6,in7,in8,in9,in10,in11,in12,in13,in14,in15,in16,in17,in18,in19,in20,in21,in22,in23,in24,in25,in26,in27,in28,in29,in30,in31: tFelder; fak2,fak3,fak4,fak5,fak6,fak7,fak8,fak9,fak10,fak11,fak12,fak13,fak14,fak15,fak16,fak17,fak18,fak19,fak20,fak21,fak22,fak23,fak24,fak25,fak26,fak27,fak28,fak29,fak30,fak31: extended); overload;
+ procedure liKo(in1,in2,in3,in4,in5,in6,in7,in8,in9,in10,in11,in12,in13,in14,in15,in16,in17,in18,in19,in20,in21,in22,in23,in24,in25,in26,in27,in28,in29,in30,in31,in32: tFelder; fak2,fak3,fak4,fak5,fak6,fak7,fak8,fak9,fak10,fak11,fak12,fak13,fak14,fak15,fak16,fak17,fak18,fak19,fak20,fak21,fak22,fak23,fak24,fak25,fak26,fak27,fak28,fak29,fak30,fak31,fak32: extended); overload;
function maxDT: extended;
end;
@@ -637,10 +647,20 @@ end;
{$INCLUDE linearkombination.inc}
{$DEFINE lkA16}
{$INCLUDE linearkombination.inc}
+{$DEFINE lkA17}
+{$INCLUDE linearkombination.inc}
+{$DEFINE lkA18}
+{$INCLUDE linearkombination.inc}
+{$DEFINE lkA19}
+{$INCLUDE linearkombination.inc}
{$DEFINE lkA22}
{$INCLUDE linearkombination.inc}
{$DEFINE lkA23}
{$INCLUDE linearkombination.inc}
+{$DEFINE lkA31}
+{$INCLUDE linearkombination.inc}
+{$DEFINE lkA32}
+{$INCLUDE linearkombination.inc}
{ tFelder }
@@ -940,7 +960,8 @@ begin
); // y(t+dt) = y(t) + (y' + 2(ya' + yb') + yc') dt/6
end;
zfRungeKuttaZehn: begin // Quelle: http://sce.uhcl.edu/rungekutta/rk108.txt
- felders[2].liKo(felders[aktuelleFelder],felders[aktuelleFelder],dT*0.1);
+ {$INCLUDE rk108.inc}
+(* felders[2].liKo(felders[aktuelleFelder],felders[aktuelleFelder],dT*0.1);
felders[2].berechneAbleitungen(dT/2,dX,iDT,iDX,pDNMax);
if pruefeMaxDT(2,mDT,dT) then
@@ -1152,9 +1173,11 @@ begin
-dT/30,
-dT/40,
-dT/30
- );
+ ); *)
end;
zfRungeKuttaZwoelf: begin // Quelle: http://sce.uhcl.edu/rungekutta/rk1210.txt
+ {$INCLUDE rk1210.inc}
+ (*
felders[2].liKo(felders[aktuelleFelder],felders[aktuelleFelder],dT*0.2);
felders[2].berechneAbleitungen(dT/2,dX,iDT,iDX,pDNMax);
@@ -1476,7 +1499,6 @@ begin
if pruefeMaxDT(25,mDT,dT) then
continue;
-
felders[1-aktuelleFelder].liKo(
felders[aktuelleFelder],
felders[aktuelleFelder],
@@ -1521,9 +1543,10 @@ begin
-0.03125 * dT,
-0.0234375 * dT,
0.0238095238095238095238095238095238095238095238095238095238095 * dT
- );
+ ); *)
end;
zfRungeKuttaVierzehn: begin // Quelle: http://sce.uhcl.edu/rungekutta/rk1412.txt
+ {$INCLUDE rk1412.inc}
end;
end{of case};
diff --git a/Plasmapropagation.lps b/Plasmapropagation.lps
index 3a563d0..c4b6d2b 100644
--- a/Plasmapropagation.lps
+++ b/Plasmapropagation.lps
@@ -3,12 +3,12 @@
<ProjectSession>
<Version Value="9"/>
<BuildModes Active="Default"/>
- <Units Count="13">
+ <Units Count="16">
<Unit0>
<Filename Value="Plasmapropagation.lpr"/>
<IsPartOfProject Value="True"/>
<CursorPos X="34" Y="11"/>
- <UsageCount Value="173"/>
+ <UsageCount Value="177"/>
<Loaded Value="True"/>
</Unit0>
<Unit1>
@@ -16,12 +16,12 @@
<IsPartOfProject Value="True"/>
<IsVisibleTab Value="True"/>
<EditorIndex Value="1"/>
- <TopLine Value="691"/>
- <CursorPos X="46" Y="802"/>
- <FoldState Value=" T3lM0-4 pigkU0A5 pjDjb084]9Ija09[943kG07[944jN0#nP p0xM0U2 pogpb0D2 T0~dPc071V"/>
- <UsageCount Value="114"/>
+ <TopLine Value="110"/>
+ <CursorPos X="179" Y="145"/>
+ <FoldState Value=" T3lW0-4 pigkU0A5 pjDjb084]9Ija09[943kQ07[944jN0#nS p0xP0U2 pogpb0D2A"/>
+ <UsageCount Value="118"/>
<Bookmarks Count="1">
- <Item0 Y="1530"/>
+ <Item0 Y="1553"/>
</Bookmarks>
<Loaded Value="True"/>
</Unit1>
@@ -31,205 +31,224 @@
<EditorIndex Value="-1"/>
<TopLine Value="20"/>
<CursorPos X="22" Y="31"/>
- <UsageCount Value="76"/>
+ <UsageCount Value="80"/>
</Unit2>
<Unit3>
<Filename Value="input.plap"/>
<IsPartOfProject Value="True"/>
- <EditorIndex Value="3"/>
+ <EditorIndex Value="4"/>
<CursorPos X="18" Y="4"/>
- <UsageCount Value="75"/>
+ <UsageCount Value="79"/>
<Loaded Value="True"/>
<DefaultSyntaxHighlighter Value="None"/>
</Unit3>
<Unit4>
+ <Filename Value="linearkombination.inc"/>
+ <IsPartOfProject Value="True"/>
+ <EditorIndex Value="3"/>
+ <TopLine Value="195"/>
+ <CursorPos X="48" Y="220"/>
+ <UsageCount Value="27"/>
+ <Loaded Value="True"/>
+ </Unit4>
+ <Unit5>
<Filename Value="input.epost"/>
- <EditorIndex Value="4"/>
+ <EditorIndex Value="5"/>
<CursorPos X="32" Y="21"/>
- <UsageCount Value="70"/>
+ <UsageCount Value="72"/>
<Loaded Value="True"/>
<DefaultSyntaxHighlighter Value="None"/>
- </Unit4>
- <Unit5>
+ </Unit5>
+ <Unit6>
<Filename Value="../units/matheunit.pas"/>
<EditorIndex Value="-1"/>
<TopLine Value="53"/>
<CursorPos Y="53"/>
<FoldState Value=" T3i905B pj0jV034 piaj60U2-"/>
<UsageCount Value="19"/>
- </Unit5>
- <Unit6>
+ </Unit6>
+ <Unit7>
<Filename Value="../units/lowlevelunit.pas"/>
<EditorIndex Value="-1"/>
<TopLine Value="4"/>
<CursorPos X="86" Y="23"/>
<UsageCount Value="9"/>
- </Unit6>
- <Unit7>
+ </Unit7>
+ <Unit8>
<Filename Value="../units/mystringlistunit.pas"/>
<EditorIndex Value="-1"/>
<TopLine Value="367"/>
<CursorPos X="17" Y="390"/>
<FoldState Value=" T3i3075 piZjD0WQ"/>
<UsageCount Value="10"/>
- </Unit7>
- <Unit8>
+ </Unit8>
+ <Unit9>
<Filename Value="../epost/werteunit.pas"/>
<EditorIndex Value="-1"/>
<TopLine Value="950"/>
<CursorPos X="30" Y="1054"/>
<UsageCount Value="7"/>
- </Unit8>
- <Unit9>
+ </Unit9>
+ <Unit10>
<Filename Value="../epost/typenunit.pas"/>
<EditorIndex Value="-1"/>
<TopLine Value="347"/>
<CursorPos X="62" Y="358"/>
<UsageCount Value="7"/>
- </Unit9>
- <Unit10>
+ </Unit10>
+ <Unit11>
<Filename Value="../units/systemunit.pas"/>
<EditorIndex Value="-1"/>
<CursorPos X="3" Y="79"/>
<UsageCount Value="7"/>
- </Unit10>
- <Unit11>
+ </Unit11>
+ <Unit12>
<Filename Value="/usr/lib/fpc/src/rtl/inc/objpash.inc"/>
<EditorIndex Value="-1"/>
<TopLine Value="232"/>
<CursorPos X="23" Y="192"/>
<UsageCount Value="7"/>
- </Unit11>
- <Unit12>
- <Filename Value="linearkombination.inc"/>
- <IsPartOfProject Value="True"/>
+ </Unit12>
+ <Unit13>
+ <Filename Value="rk14.inc"/>
+ <EditorIndex Value="-1"/>
+ <UsageCount Value="10"/>
+ </Unit13>
+ <Unit14>
+ <Filename Value="rk1210.inc"/>
+ <EditorIndex Value="-1"/>
+ <TopLine Value="492"/>
+ <CursorPos X="28" Y="565"/>
+ <UsageCount Value="10"/>
+ </Unit14>
+ <Unit15>
+ <Filename Value="rk1412.inc"/>
<EditorIndex Value="2"/>
- <TopLine Value="26"/>
- <CursorPos X="21" Y="182"/>
- <UsageCount Value="23"/>
+ <TopLine Value="897"/>
+ <CursorPos X="4" Y="917"/>
+ <UsageCount Value="10"/>
<Loaded Value="True"/>
- </Unit12>
+ </Unit15>
</Units>
<JumpHistory Count="30" HistoryIndex="29">
<Position1>
- <Filename Value="Physikunit.pas"/>
- <Caret Line="124" Column="171" TopLine="97"/>
+ <Filename Value="linearkombination.inc"/>
+ <Caret Line="140" Column="19" TopLine="108"/>
</Position1>
<Position2>
- <Filename Value="linearkombination.inc"/>
- <Caret Line="3" Column="36"/>
+ <Filename Value="Physikunit.pas"/>
+ <Caret Line="616" Column="14" TopLine="523"/>
</Position2>
<Position3>
<Filename Value="Physikunit.pas"/>
- <Caret Line="708" Column="47" TopLine="362"/>
+ <Caret Line="123" Column="105" TopLine="94"/>
</Position3>
<Position4>
- <Filename Value="linearkombination.inc"/>
- <Caret Line="5" Column="16"/>
+ <Filename Value="Physikunit.pas"/>
+ <Caret Line="1299" Column="80" TopLine="1287"/>
</Position4>
<Position5>
- <Filename Value="Physikunit.pas"/>
- <Caret Line="590" Column="32" TopLine="377"/>
+ <Filename Value="linearkombination.inc"/>
+ <Caret Line="146" Column="20" TopLine="114"/>
</Position5>
<Position6>
<Filename Value="Physikunit.pas"/>
- <Caret Line="596" Column="14" TopLine="286"/>
+ <Caret Line="622" Column="15" TopLine="502"/>
</Position6>
<Position7>
<Filename Value="Physikunit.pas"/>
- <Caret Line="590" TopLine="355"/>
+ <Caret Line="1319" Column="80" TopLine="1311"/>
</Position7>
<Position8>
- <Filename Value="linearkombination.inc"/>
- <Caret Line="48" Column="55" TopLine="13"/>
+ <Filename Value="Physikunit.pas"/>
+ <Caret Line="630" Column="15" TopLine="617"/>
</Position8>
<Position9>
- <Filename Value="linearkombination.inc"/>
- <Caret Line="82" Column="89" TopLine="45"/>
+ <Filename Value="Physikunit.pas"/>
+ <Caret Line="1443" Column="79" TopLine="1443"/>
</Position9>
<Position10>
- <Filename Value="Physikunit.pas"/>
- <Caret Line="608" Column="15" TopLine="523"/>
+ <Filename Value="linearkombination.inc"/>
+ <Caret Line="101" Column="39" TopLine="62"/>
</Position10>
<Position11>
<Filename Value="linearkombination.inc"/>
- <Caret Line="79" Column="45" TopLine="45"/>
+ <Caret Line="18" Column="50"/>
</Position11>
<Position12>
- <Filename Value="linearkombination.inc"/>
- <Caret Line="28"/>
+ <Filename Value="Physikunit.pas"/>
+ <Caret Line="638" Column="15" TopLine="596"/>
</Position12>
<Position13>
- <Filename Value="Plasmapropagation.lpr"/>
- <Caret Line="11" Column="40" TopLine="11"/>
+ <Filename Value="Physikunit.pas"/>
+ <Caret Line="1519" TopLine="1497"/>
</Position13>
<Position14>
<Filename Value="Physikunit.pas"/>
- <Caret Line="1255" TopLine="1233"/>
+ <Caret Line="134" Column="248" TopLine="110"/>
</Position14>
<Position15>
<Filename Value="Physikunit.pas"/>
- <Caret Line="1498" Column="77" TopLine="1465"/>
+ <Caret Line="1526" Column="14" TopLine="1500"/>
</Position15>
<Position16>
<Filename Value="Physikunit.pas"/>
- <Caret Line="1281" Column="80" TopLine="1269"/>
+ <Caret Line="2009" TopLine="1969"/>
</Position16>
<Position17>
- <Filename Value="linearkombination.inc"/>
- <Caret Line="140" Column="19" TopLine="108"/>
+ <Filename Value="Physikunit.pas"/>
+ <Caret Line="1526" Column="27" TopLine="1492"/>
</Position17>
<Position18>
- <Filename Value="Physikunit.pas"/>
- <Caret Line="616" Column="14" TopLine="523"/>
+ <Filename Value="rk1412.inc"/>
</Position18>
<Position19>
- <Filename Value="Physikunit.pas"/>
- <Caret Line="123" Column="105" TopLine="94"/>
+ <Filename Value="rk1412.inc"/>
+ <Caret Line="292" Column="70" TopLine="277"/>
</Position19>
<Position20>
- <Filename Value="Physikunit.pas"/>
- <Caret Line="1299" Column="80" TopLine="1287"/>
+ <Filename Value="linearkombination.inc"/>
+ <Caret Line="21" Column="33"/>
</Position20>
<Position21>
- <Filename Value="linearkombination.inc"/>
- <Caret Line="146" Column="20" TopLine="114"/>
+ <Filename Value="Physikunit.pas"/>
+ <Caret Line="1529" TopLine="1511"/>
</Position21>
<Position22>
- <Filename Value="Physikunit.pas"/>
- <Caret Line="622" Column="15" TopLine="502"/>
+ <Filename Value="linearkombination.inc"/>
+ <Caret Line="4" Column="23"/>
</Position22>
<Position23>
- <Filename Value="Physikunit.pas"/>
- <Caret Line="1319" Column="80" TopLine="1311"/>
+ <Filename Value="rk1412.inc"/>
+ <Caret Line="464" Column="26" TopLine="430"/>
</Position23>
<Position24>
<Filename Value="Physikunit.pas"/>
- <Caret Line="630" Column="15" TopLine="617"/>
+ <Caret Line="644" Column="15" TopLine="618"/>
</Position24>
<Position25>
- <Filename Value="Physikunit.pas"/>
- <Caret Line="1443" Column="79" TopLine="1443"/>
+ <Filename Value="rk1412.inc"/>
+ <Caret Line="490" Column="5" TopLine="472"/>
</Position25>
<Position26>
- <Filename Value="linearkombination.inc"/>
- <Caret Line="101" Column="39" TopLine="62"/>
+ <Filename Value="rk1412.inc"/>
+ <Caret Line="580" Column="57" TopLine="567"/>
</Position26>
<Position27>
<Filename Value="linearkombination.inc"/>
- <Caret Line="18" Column="50"/>
+ <Caret Line="134" TopLine="94"/>
</Position27>
<Position28>
- <Filename Value="Physikunit.pas"/>
- <Caret Line="638" Column="15" TopLine="596"/>
+ <Filename Value="linearkombination.inc"/>
+ <Caret Line="133" Column="39" TopLine="100"/>
</Position28>
<Position29>
- <Filename Value="Physikunit.pas"/>
- <Caret Line="1519" TopLine="1497"/>
+ <Filename Value="rk1412.inc"/>
+ <Caret Line="916" Column="4" TopLine="885"/>
</Position29>
<Position30>
<Filename Value="Physikunit.pas"/>
- <Caret Line="134" Column="248" TopLine="110"/>
+ <Caret Line="658" Column="13" TopLine="621"/>
</Position30>
</JumpHistory>
</ProjectSession>
diff --git a/linearkombination.inc b/linearkombination.inc
index 2d6a27d..0f6ceca 100644
--- a/linearkombination.inc
+++ b/linearkombination.inc
@@ -15,9 +15,14 @@ procedure tWertePunkt.liKo(in1,in2
{$IFDEF lkA14},in13,in14
{$IFDEF lkA15},in15
{$IFDEF lkA16},in16
-{$IFDEF lkA22},in17,in18,in19,in20,in21,in22
+{$IFDEF lkA17},in17
+{$IFDEF lkA18},in18
+{$IFDEF lkA19},in19
+{$IFDEF lkA22},in20,in21,in22
{$IFDEF lkA23},in23
-{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}: tWertePunkt;
+{$IFDEF lkA31},in24,in25,in26,in27,in28,in29,in30,in31
+{$IFDEF lkA32},in32
+{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}: tWertePunkt;
fak2
{$IFDEF lkA3},fak3
{$IFDEF lkA4},fak4
@@ -32,9 +37,14 @@ fak2
{$IFDEF lkA14},fak13,fak14
{$IFDEF lkA15},fak15
{$IFDEF lkA16},fak16
-{$IFDEF lkA22},fak17,fak18,fak19,fak20,fak21,fak22
+{$IFDEF lkA17},fak17
+{$IFDEF lkA18},fak18
+{$IFDEF lkA19},fak19
+{$IFDEF lkA22},fak20,fak21,fak22
{$IFDEF lkA23},fak23
-{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}: extended);
+{$IFDEF lkA31},fak24,fak25,fak26,fak27,fak28,fak29,fak30,fak31
+{$IFDEF lkA32},fak32
+{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}: extended);
var
emF: tEMFeldInhalt;
maF: tMaterieFeldInhalt;
@@ -62,15 +72,24 @@ begin
+ fak13 * in13.emWerte[emF,true]
+ fak14 * in14.emWerte[emF,true] {$IFDEF lkA15}
+ fak15 * in15.emWerte[emF,true] {$IFDEF lkA16}
- + fak16 * in16.emWerte[emF,true] {$IFDEF lkA22}
- + fak17 * in17.emWerte[emF,true]
- + fak18 * in18.emWerte[emF,true]
- + fak19 * in19.emWerte[emF,true]
+ + fak16 * in16.emWerte[emF,true] {$IFDEF lkA17}
+ + fak17 * in17.emWerte[emF,true] {$IFDEF lkA18}
+ + fak18 * in18.emWerte[emF,true] {$IFDEF lkA19}
+ + fak19 * in19.emWerte[emF,true] {$IFDEF lkA22}
+ fak20 * in20.emWerte[emF,true]
+ fak21 * in21.emWerte[emF,true]
+ fak22 * in22.emWerte[emF,true] {$IFDEF lkA23}
- + fak23 * in23.emWerte[emF,true]
- {$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF};
+ + fak23 * in23.emWerte[emF,true] {$IFDEF lkA31}
+ + fak24 * in24.emWerte[emF,true]
+ + fak25 * in25.emWerte[emF,true]
+ + fak26 * in26.emWerte[emF,true]
+ + fak27 * in27.emWerte[emF,true]
+ + fak28 * in28.emWerte[emF,true]
+ + fak29 * in29.emWerte[emF,true]
+ + fak30 * in30.emWerte[emF,true]
+ + fak31 * in31.emWerte[emF,true] {$IFDEF lkA32}
+ + fak32 * in32.emWerte[emF,true]
+ {$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF};
(* tMaterieFeldInhalt = (
mfN,mfDPsiDX,
@@ -95,15 +114,24 @@ begin
+ fak13 * in13.matWerte[i,maF,true]
+ fak14 * in14.matWerte[i,maF,true] {$IFDEF lkA15}
+ fak15 * in15.matWerte[i,maF,true] {$IFDEF lkA16}
- + fak16 * in16.matWerte[i,maF,true] {$IFDEF lkA22}
- + fak17 * in17.matWerte[i,maF,true]
- + fak18 * in18.matWerte[i,maF,true]
- + fak19 * in19.matWerte[i,maF,true]
+ + fak16 * in16.matWerte[i,maF,true] {$IFDEF lkA17}
+ + fak17 * in17.matWerte[i,maF,true] {$IFDEF lkA18}
+ + fak18 * in18.matWerte[i,maF,true] {$IFDEF lkA19}
+ + fak19 * in19.matWerte[i,maF,true] {$IFDEF lkA22}
+ fak20 * in20.matWerte[i,maF,true]
+ fak21 * in21.matWerte[i,maF,true]
+ fak22 * in22.matWerte[i,maF,true] {$IFDEF lkA23}
- + fak23 * in23.matWerte[i,maF,true]
- {$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF};
+ + fak23 * in23.matWerte[i,maF,true] {$IFDEF lkA31}
+ + fak24 * in24.matWerte[i,maF,true]
+ + fak25 * in25.matWerte[i,maF,true]
+ + fak26 * in26.matWerte[i,maF,true]
+ + fak27 * in27.matWerte[i,maF,true]
+ + fak28 * in28.matWerte[i,maF,true]
+ + fak29 * in29.matWerte[i,maF,true]
+ + fak30 * in30.matWerte[i,maF,true]
+ + fak31 * in31.matWerte[i,maF,true] {$IFDEF lkA32}
+ + fak32 * in32.matWerte[i,maF,true]
+ {$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF};
end;
// Werte werden auf (in1 + \sum_i faki * ini') gesetzt
@@ -122,9 +150,14 @@ procedure tFelder.liKo(in1,in2
{$IFDEF lkA14},in13,in14
{$IFDEF lkA15},in15
{$IFDEF lkA16},in16
-{$IFDEF lkA22},in17,in18,in19,in20,in21,in22
+{$IFDEF lkA17},in17
+{$IFDEF lkA18},in18
+{$IFDEF lkA19},in19
+{$IFDEF lkA22},in20,in21,in22
{$IFDEF lkA23},in23
-{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}: tFelder;
+{$IFDEF lkA31},in24,in25,in26,in27,in28,in29,in30,in31
+{$IFDEF lkA32},in32
+{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}: tFelder;
fak2
{$IFDEF lkA3},fak3
{$IFDEF lkA4},fak4
@@ -139,9 +172,14 @@ fak2
{$IFDEF lkA14},fak13,fak14
{$IFDEF lkA15},fak15
{$IFDEF lkA16},fak16
-{$IFDEF lkA22},fak17,fak18,fak19,fak20,fak21,fak22
+{$IFDEF lkA17},fak17
+{$IFDEF lkA18},fak18
+{$IFDEF lkA19},fak19
+{$IFDEF lkA22},fak20,fak21,fak22
{$IFDEF lkA23},fak23
-{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}: extended);
+{$IFDEF lkA31},fak24,fak25,fak26,fak27,fak28,fak29,fak30,fak31
+{$IFDEF lkA32},fak32
+{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}: extended);
var
i: longint;
begin
@@ -161,9 +199,14 @@ begin
{$IFDEF lkA14},in13.inhalt[i],in14.inhalt[i]
{$IFDEF lkA15},in15.inhalt[i]
{$IFDEF lkA16},in16.inhalt[i]
- {$IFDEF lkA22},in17.inhalt[i],in18.inhalt[i],in19.inhalt[i],in20.inhalt[i],in21.inhalt[i],in22.inhalt[i]
+ {$IFDEF lkA17},in17.inhalt[i]
+ {$IFDEF lkA18},in18.inhalt[i]
+ {$IFDEF lkA19},in19.inhalt[i]
+ {$IFDEF lkA22},in20.inhalt[i],in21.inhalt[i],in22.inhalt[i]
{$IFDEF lkA23},in23.inhalt[i]
- {$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF},
+ {$IFDEF lkA31},in24.inhalt[i],in25.inhalt[i],in26.inhalt[i],in27.inhalt[i],in28.inhalt[i],in29.inhalt[i],in30.inhalt[i],in31.inhalt[i]
+ {$IFDEF lkA32},in32.inhalt[i]
+ {$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF},
fak2
{$IFDEF lkA3},fak3
{$IFDEF lkA4},fak4
@@ -178,9 +221,14 @@ begin
{$IFDEF lkA14},fak13,fak14
{$IFDEF lkA15},fak15
{$IFDEF lkA16},fak16
- {$IFDEF lkA22},fak17,fak18,fak19,fak20,fak21,fak22
+ {$IFDEF lkA17},fak17
+ {$IFDEF lkA18},fak18
+ {$IFDEF lkA19},fak19
+ {$IFDEF lkA22},fak20,fak21,fak22
{$IFDEF lkA23},fak23
- {$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF});
+ {$IFDEF lkA31},fak24,fak25,fak26,fak27,fak28,fak29,fak30,fak31
+ {$IFDEF lkA32},fak32
+ {$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF});
end;
generated by cgit v1.2.3-70-g09d2 (git 2.47.0) at 2024-11-21 21:51:42 +0000