summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorErich Eckner <git@eckner.net>2015-08-07 11:03:53 +0200
committerErich Eckner <git@eckner.net>2015-08-07 11:03:53 +0200
commit313dc9c91ed794336898054a8e0d328e09875359 (patch)
tree25fcadc874694242db6f2e6ccfbc80b07cd83353
parent924aa698dcd4fb33c925630aeff7b1320e445ab0 (diff)
downloadPlasmapropagation-313dc9c91ed794336898054a8e0d328e09875359.tar.xz
inhaltlichen Bug aus DGL entfernt (?)HEADmaster
-rw-r--r--Physikunit.pas11
-rw-r--r--Plasmapropagation.lps91
-rw-r--r--input.epost26
-rw-r--r--input.plap14
4 files changed, 79 insertions, 63 deletions
diff --git a/Physikunit.pas b/Physikunit.pas
index ab99170..85b6508 100644
--- a/Physikunit.pas
+++ b/Physikunit.pas
@@ -648,12 +648,11 @@ begin
for i:=0 to length(matWerte)-1 do
matWerte[i,mfDPsiDX,true]:=
besitzer.spezLadungen[i] * emWerte[efDPhiDX,false]
-;// - (rN.matWerte[i,mfGamma,false] - lN.matWerte[i,mfGamma,false]) * iDX/2;
+ - (rN.matWerte[i,mfGamma,false] - lN.matWerte[i,mfGamma,false]) * iDX/2;
- // d2A/dt2 = Laplace(A) - Nabla(phi) ...
+ // d2A/dt2 = Laplace(A) ... ( - Nabla(dPhi/dt) wird auf dA/dt aufgeschlagen !!! )
emWerte[efDAXDT,true]:=
- ( rN.emWerte[efAX,false] - 2*emWerte[efAX,false] + lN.emWerte[efAX,false] )*sqr(iDX)
- - emWerte[efDPhiDX,false];
+ ( rN.emWerte[efAX,false] - 2*emWerte[efAX,false] + lN.emWerte[efAX,false] )*sqr(iDX);
emWerte[efDAYDT,true]:=
( rN.emWerte[efAY,false] - 2*emWerte[efAY,false] + lN.emWerte[efAY,false] )*sqr(iDX);
emWerte[efDAZDT,true]:=
@@ -671,8 +670,8 @@ begin
- (besitzer.spezLadungen[i] * matWerte[i,mfN,false] * matWerte[i,mfIGamma,false] * matWerte[i,mfPZ,false]);
end;
- // dA/dt = dA/dt
- emWerte[efAX,true]:=emWerte[efDAXDT,false];// + emWerte[efDAXDT,true]*dT;
+ // dA/dt = dA/dt - Nabla(Phi)
+ emWerte[efAX,true]:=emWerte[efDAXDT,false] - emWerte[efDPhiDX,false];// + emWerte[efDAXDT,true]*dT;
emWerte[efAY,true]:=emWerte[efDAYDT,false];// + emWerte[efDAYDT,true]*dT;
emWerte[efAZ,true]:=emWerte[efDAZDT,false];// + emWerte[efDAZDT,true]*dT;
end;
diff --git a/Plasmapropagation.lps b/Plasmapropagation.lps
index ba80993..6e683c8 100644
--- a/Plasmapropagation.lps
+++ b/Plasmapropagation.lps
@@ -9,20 +9,19 @@
<IsPartOfProject Value="True"/>
<TopLine Value="54"/>
<CursorPos X="37" Y="34"/>
- <UsageCount Value="199"/>
+ <UsageCount Value="200"/>
<Loaded Value="True"/>
</Unit0>
<Unit1>
<Filename Value="Physikunit.pas"/>
<IsPartOfProject Value="True"/>
- <IsVisibleTab Value="True"/>
<EditorIndex Value="1"/>
- <TopLine Value="619"/>
- <CursorPos X="13" Y="648"/>
- <FoldState Value=" T3mD0,5 pjSlM0A[94BjZ0812114]DLnd0B[944jR08013]Bdl20U2 pp6q10G2 T0\9Q/0F171A"/>
- <UsageCount Value="140"/>
+ <TopLine Value="620"/>
+ <CursorPos X="32" Y="673"/>
+ <FoldState Value=" T3mD0,5 pjSlM0A[94BjZ0803114 T0\8Q/0F171M"/>
+ <UsageCount Value="142"/>
<Bookmarks Count="1">
- <Item0 Y="1078"/>
+ <Item0 Y="1077"/>
</Bookmarks>
<Loaded Value="True"/>
</Unit1>
@@ -31,15 +30,15 @@
<IsPartOfProject Value="True"/>
<EditorIndex Value="-1"/>
<CursorPos X="15" Y="46"/>
- <UsageCount Value="102"/>
+ <UsageCount Value="104"/>
</Unit2>
<Unit3>
<Filename Value="input.plap"/>
<IsPartOfProject Value="True"/>
<EditorIndex Value="3"/>
- <TopLine Value="31"/>
- <CursorPos X="26" Y="36"/>
- <UsageCount Value="101"/>
+ <TopLine Value="9"/>
+ <CursorPos Y="29"/>
+ <UsageCount Value="103"/>
<Loaded Value="True"/>
<DefaultSyntaxHighlighter Value="None"/>
</Unit3>
@@ -49,15 +48,16 @@
<EditorIndex Value="2"/>
<TopLine Value="88"/>
<CursorPos X="50" Y="100"/>
- <UsageCount Value="49"/>
+ <UsageCount Value="51"/>
<Loaded Value="True"/>
</Unit4>
<Unit5>
<Filename Value="input.epost"/>
+ <IsVisibleTab Value="True"/>
<EditorIndex Value="4"/>
<TopLine Value="13"/>
- <CursorPos X="5" Y="22"/>
- <UsageCount Value="84"/>
+ <CursorPos X="9" Y="27"/>
+ <UsageCount Value="85"/>
<Loaded Value="True"/>
<DefaultSyntaxHighlighter Value="None"/>
</Unit5>
@@ -146,122 +146,123 @@
<JumpHistory Count="30" HistoryIndex="29">
<Position1>
<Filename Value="Physikunit.pas"/>
+ <Caret Line="126" Column="17" TopLine="93"/>
</Position1>
<Position2>
<Filename Value="Physikunit.pas"/>
- <Caret Line="126" Column="17" TopLine="93"/>
+ <Caret Line="521" Column="50" TopLine="433"/>
</Position2>
<Position3>
<Filename Value="Physikunit.pas"/>
- <Caret Line="521" Column="50" TopLine="433"/>
+ <Caret Line="550" Column="51" TopLine="509"/>
</Position3>
<Position4>
<Filename Value="Physikunit.pas"/>
- <Caret Line="550" Column="51" TopLine="509"/>
+ <Caret Line="551" Column="51" TopLine="510"/>
</Position4>
<Position5>
<Filename Value="Physikunit.pas"/>
- <Caret Line="551" Column="51" TopLine="510"/>
+ <Caret Line="665" Column="28" TopLine="326"/>
</Position5>
<Position6>
<Filename Value="Physikunit.pas"/>
- <Caret Line="665" Column="28" TopLine="326"/>
+ <Caret Line="798" Column="44" TopLine="765"/>
</Position6>
<Position7>
<Filename Value="Physikunit.pas"/>
- <Caret Line="798" Column="44" TopLine="765"/>
+ <Caret Line="799" Column="25" TopLine="766"/>
</Position7>
<Position8>
<Filename Value="Physikunit.pas"/>
- <Caret Line="799" Column="25" TopLine="766"/>
+ <Caret Line="800" Column="34" TopLine="767"/>
</Position8>
<Position9>
<Filename Value="Physikunit.pas"/>
- <Caret Line="800" Column="34" TopLine="767"/>
+ <Caret Line="801" Column="51" TopLine="774"/>
</Position9>
<Position10>
<Filename Value="Physikunit.pas"/>
- <Caret Line="801" Column="51" TopLine="774"/>
+ <Caret Line="67" Column="22" TopLine="47"/>
</Position10>
<Position11>
<Filename Value="Physikunit.pas"/>
- <Caret Line="67" Column="22" TopLine="47"/>
+ <Caret Line="425" Column="4" TopLine="210"/>
</Position11>
<Position12>
<Filename Value="Physikunit.pas"/>
- <Caret Line="425" Column="4" TopLine="210"/>
+ <Caret Line="438" Column="63" TopLine="216"/>
</Position12>
<Position13>
<Filename Value="Physikunit.pas"/>
- <Caret Line="438" Column="63" TopLine="216"/>
+ <Caret Line="801" Column="51" TopLine="768"/>
</Position13>
<Position14>
<Filename Value="Physikunit.pas"/>
- <Caret Line="801" Column="51" TopLine="768"/>
+ <Caret Line="1385" Column="60" TopLine="1232"/>
</Position14>
<Position15>
<Filename Value="Physikunit.pas"/>
- <Caret Line="1385" Column="60" TopLine="1232"/>
+ <Caret Line="789" Column="63" TopLine="773"/>
</Position15>
<Position16>
<Filename Value="Physikunit.pas"/>
- <Caret Line="789" Column="63" TopLine="773"/>
+ <Caret Line="10" Column="28"/>
</Position16>
<Position17>
<Filename Value="Physikunit.pas"/>
- <Caret Line="10" Column="28"/>
+ <Caret Line="1024" Column="31" TopLine="784"/>
</Position17>
<Position18>
<Filename Value="Physikunit.pas"/>
- <Caret Line="1024" Column="31" TopLine="784"/>
+ <Caret Line="1067" Column="29" TopLine="1056"/>
</Position18>
<Position19>
<Filename Value="Physikunit.pas"/>
- <Caret Line="1067" Column="29" TopLine="1056"/>
+ <Caret Line="1019" TopLine="861"/>
</Position19>
<Position20>
<Filename Value="Physikunit.pas"/>
- <Caret Line="1019" TopLine="861"/>
+ <Caret Line="11" Column="3"/>
</Position20>
<Position21>
<Filename Value="Physikunit.pas"/>
- <Caret Line="11" Column="3"/>
+ <Caret Line="1023" Column="5" TopLine="1000"/>
</Position21>
<Position22>
<Filename Value="Physikunit.pas"/>
- <Caret Line="1023" Column="5" TopLine="1000"/>
+ <Caret Line="9" Column="33"/>
</Position22>
<Position23>
<Filename Value="Physikunit.pas"/>
- <Caret Line="9" Column="33"/>
+ <Caret Line="991" Column="36" TopLine="787"/>
</Position23>
<Position24>
- <Filename Value="Physikunit.pas"/>
- <Caret Line="991" Column="36" TopLine="787"/>
+ <Filename Value="input.epost"/>
+ <Caret Line="27" TopLine="5"/>
</Position24>
<Position25>
<Filename Value="input.epost"/>
- <Caret Line="27" TopLine="5"/>
+ <Caret Line="44" Column="15" TopLine="5"/>
</Position25>
<Position26>
<Filename Value="input.epost"/>
- <Caret Line="44" Column="15" TopLine="5"/>
+ <Caret Line="56" Column="27" TopLine="19"/>
</Position26>
<Position27>
<Filename Value="input.epost"/>
- <Caret Line="56" Column="27" TopLine="19"/>
+ <Caret Line="47" TopLine="25"/>
</Position27>
<Position28>
<Filename Value="input.epost"/>
- <Caret Line="47" TopLine="25"/>
+ <Caret Line="57" TopLine="25"/>
</Position28>
<Position29>
- <Filename Value="input.epost"/>
- <Caret Line="57" TopLine="25"/>
+ <Filename Value="Physikunit.pas"/>
+ <Caret Line="989" Column="35" TopLine="903"/>
</Position29>
<Position30>
<Filename Value="Physikunit.pas"/>
- <Caret Line="989" Column="35" TopLine="903"/>
+ <Caret Line="24" Column="13"/>
</Position30>
</JumpHistory>
</ProjectSession>
diff --git a/input.epost b/input.epost
index 39b7444..c6f8d9a 100644
--- a/input.epost
+++ b/input.epost
@@ -22,21 +22,37 @@ Palette
0000ff
Ende
-Threadanzahl: 7
+Threadanzahl: 11
-!Schleife: $symmetrie: symmetrisch asymmetrisch
+parallel lesen
+
+!setze $symFelder: DPSIDX1 DPHIDX AY DAYDT
+!setze $asyFelder: N1
-?$symmetrie = symmetrisch: !Schleife: $Feld: DPHIDX DPSIDX1 # AY DAYDT
-?$symmetrie = asymmetrisch: !Schleife: $Feld: N1 # N2
+!Schleife: $Feld: $asyFelder $symFelder
Daten einlesen
+ Name: $Feld
Genauigkeit: extended
xmax: 5
tmax: 40
SpaceTime-Datei: /home_raid/erich/Dokumente/Prograemmchen/Plasmapropagation/Daten/$Feld-*_test.dat
Ende
-lineares Bild
+!Schleifenende
+
+!setze $symBerFelder: DPSIDX1_N1
+
+Multipliziere DPSIDX1 mal N1
+ Name: DPSIDX1_N1
+Ende
+
+!Schleife: $symmetrie: symmetrisch asymmetrisch
+
+?$symmetrie = symmetrisch: !Schleife: $Feld: $symFelder $symBerFelder
+?$symmetrie = asymmetrisch: !Schleife: $Feld: $asyFelder
+
+lineares Bild $Feld
?$symmetrie = symmetrisch: Palette: rotblau
?$symmetrie = symmetrisch: maximale und minimale Dichten bestimmen (symmetrisch)
?$symmetrie = asymmetrisch: Palette: erweiterter Regenbogen
diff --git a/input.plap b/input.plap
index 94a7c54..83607cf 100644
--- a/input.plap
+++ b/input.plap
@@ -26,7 +26,7 @@ ausgabenEnde
!setze $tFwhm: (2.5 * T)
!setze $tMitte: (1 * T)
-# licht von links 0.1 * 2^(-2*((t-$tMitte)/$tFwhm)^2) * ω * cos(ω*t) # Zeitableitung des A-Feldes
+licht von links 2 * 2^(-2*((t-$tMitte)/$tFwhm)^2) * ω * cos(ω*t) # Zeitableitung des A-Feldes
!setze $IonenMassenFaktor: (1836.15267245 + 1838.68366158)
@@ -56,13 +56,13 @@ teilchen2
# verteilung wie teilchen1
verteilung stückweise
0
- (0.1*λ + $breite-$profilbreite)/2 - $randbreite
- sin((x - (0.1*λ + $breite-$profilbreite)/2 - $randbreite)*π/2/$randbreite)^2
- (0.1*λ + $breite-$profilbreite)/2
+ ($breite-$profilbreite)/2 - $randbreite
+ sin((x - ($breite-$profilbreite)/2 - $randbreite)*π/2/$randbreite)^2
+ ($breite-$profilbreite)/2
1
- (0.1*λ + $breite+$profilbreite)/2
- sin((x - (0.1*λ + $breite+$profilbreite)/2 + $randbreite)*π/2/$randbreite)^2
- (0.1*λ + $breite+$profilbreite)/2 + $randbreite
+ ($breite+$profilbreite)/2
+ sin((x - ($breite+$profilbreite)/2 + $randbreite)*π/2/$randbreite)^2
+ ($breite+$profilbreite)/2 + $randbreite
0
stückweiseEnde
teilchen2Ende