diff --git a/heat-diffusion.js b/heat-diffusion.js index 9adc8af..975155c 100644 --- a/heat-diffusion.js +++ b/heat-diffusion.js @@ -279,22 +279,23 @@ function HeatSolver(startingTemps,timestep,spacestep){ } var cnVector = make_crank_nicolson_vector(); calculate_next_cn(cnVector); - var newMaxTemp = []; - for(var n=0; n maxTemps[maxTemps.length-1][n]){ - newMaxTemp.push(tempArray[tempArray.length-1][n]); - } - else{ - newMaxTemp.push(maxTemps[maxTemps.length-1][n]) - } - } - maxTemps.push(newMaxTemp); } } var arrays = tempArray.length-1 ; var len= tempArray[0].length; var step = arrays/60.0; for(var i=0; i<60*step; i+=step){ + + var newMaxTemp = []; + for(var n=0; n maxTemps[maxTemps.length-1][n]){ + newMaxTemp.push(tempArray[parseInt(i)][n]); + } + else{ + newMaxTemp.push(maxTemps[maxTemps.length-1][n]) + } + } + maxTemps.push(newMaxTemp); grapharray.push(tempArray[parseInt(i)].slice(1,len-1)); diff --git a/home-screen.css b/home-screen.css index 0cdaaac..1f6ac2f 100644 --- a/home-screen.css +++ b/home-screen.css @@ -11,8 +11,8 @@ border: 1px solid black; } -#startModal .modal-footer{ - text-align:center; +.modal-footer{ + text-align:center !important; } /*.dropdown{ diff --git a/perfectSteak.js b/perfectSteak.js index 6486bf2..cb0b4df 100644 --- a/perfectSteak.js +++ b/perfectSteak.js @@ -251,7 +251,11 @@ var clicked=false; var addQuickButton = $(""); var addTextButton = $(""); var saveModal=$(''); - displayDiv.append(saveModal) + var cookDropdown=$(""); + + var quickAddModal=$(''); + $(".cookp").append(cookDropdown); + displayDiv.append(saveModal, quickAddModal) saveBut.on("click", function(){ diff --git a/sample.js b/sample.js index 6694584..e88f475 100644 --- a/sample.js +++ b/sample.js @@ -17,7 +17,6 @@ var calculate=function(data,steak,meatType,first,totalTime){ if(timestep > 39){ //39 is basically the maximum timestep for acceptable accuracy (below 1° error) timestep = 39; } - var myheatsolver = HeatSolver(steak,timestep,spacestep); var Thedata=myheatsolver.sixty_graph_arrays_duration(data); var sampledata=Thedata.temps;