lars/Projekttage
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source 
# Conflicts:
#	Formeln.py
This commit is contained in:
michelar
2019-07-23 10:27:56 +02:00
parent 011338461d d8a3162ebb
commit 1d28ae0b5f
5 changed files with 39 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Formeln.py
+1
View File
@@ -8,5 +8,6 @@ Formeln = [k.Formel('Kraftformel', i=k.Groesse('F', 'N', False), a=k.Groesse('m'
k.Formel('Gleichm. beschl. Bew.', i=k.Groesse('s', 'm', False), a=k.Groesse(None, None, True, 0.5),
b=('a', 'm/s^2', False), c=k.Groesse('t', 's', False), z=konstante_eins, x=konstante_eins,
y=k.Groesse(None, None, True, 2)),
k.formel('Gewichtskraft', i=k.Groesse('Fg', 'N',False), a=k.Groesse(None,None,True,9.81),b=('h','m',False),z=konstante_eins,y=konstante_eins,x=konstante_eins
k.Formel('Spannenergie', i=k.Groesse('Espann','J', False), a=k.Groesse(None, None, True, 0.5),
b=k.Groesse('D', '', False), c=k.Groesse('s', 'm', False), x=konstante_eins, y=konstante_eins, z=k.Groesse(None, None, True, 2))]