summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorConstantin Riß <constantin.riss@dre.de>2010-01-17 18:50:32 +0100
committerConstantin Riß <constantin.riss@dre.de>2010-01-17 18:50:32 +0100
commit0adf3012c7080f9e753471087fb63d0e9af1bed1 (patch)
tree1af3ba1bde10e4f280c62e02dbe5d33e0a090cbf
parentbb5829eaf5cad431bfe3a8c7df2634fedc27a9f2 (diff)
downloadc3d-0adf3012c7080f9e753471087fb63d0e9af1bed1.tar
c3d-0adf3012c7080f9e753471087fb63d0e9af1bed1.zip
kurze änderung
-rw-r--r--.gitignore11
-rw-r--r--Temparray.cpp3
2 files changed, 7 insertions, 7 deletions
diff --git a/.gitignore b/.gitignore
index 322f840..a748af4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,11 +4,8 @@
/.cproject
/.setting
-#BSPTree.o
-#Cubehole.o
-#Cuboid.o
-#DisplayClass.o
-#Temparray.o
-#Trapezocube.o
-#main.o
+*.exe
+*.layout
+*.win
+*.dev
*.o
diff --git a/Temparray.cpp b/Temparray.cpp
index ed45074..4b48fcf 100644
--- a/Temparray.cpp
+++ b/Temparray.cpp
@@ -82,6 +82,9 @@ void Temparray::calcTemp(){
capacity = specificconductivity *((((depth + innerdepth)/2)*height)/0.9*meterperunit);
capacity2 = specificconductivity *((((depth2 + innerdepth2)/2)*height2)/0.9*meterperunit);
}
+ tau12 = capacity * thermalresistance;
+ tau21 = capacity2 * thermalresistance;
+ std::cerr << tau12 << "\n" << tau21 << std::endl;
}
}
}