Commit ea14842a authored by amandaghassaei's avatar amandaghassaei

added stiffness parameters

parent 3c6c6862
......@@ -682,4 +682,8 @@ label {
.leftOffset{
left: 30px!important;
}
.normalStylingCheckbox{
font-size: 18px!important;
}
\ No newline at end of file
......@@ -310,6 +310,7 @@ define(['underscore', 'appState', 'three'], function(_, appState, THREE){
else if (json.mesh == "wireStraight") this.mesh = wireStraight;
else if (json.mesh == "wireBent") this.mesh = wireBent;
else if (json.mesh == "siliconModule") this.mesh = siliconModule;
else if (json.mesh.vertices) this.mesh = json.mesh;//we've passed in a mesh object
else console.warn("no mesh for type " + json.mesh);
}
}
......
......@@ -4,15 +4,26 @@ Display Color:   
<a id="newRandomColor" href="#" class="btn btn-block btn-lg btn-default">New Random Display Color</a><br/>
Realistic Color: &nbsp;&nbsp;
<input id="materialAltColor" style="border-color: <%= color %> ;" data-property="color" value="<%= color %>" placeholder="Enter HEX" class="halfWidth materialEditor form-control hexInput" type="text"><br/><br/>
Material Properties:<br/>
Material Properties:<br/><br/>
<div class="tab1">
<label class="checkbox" for="conductive">
<label class="checkbox normalStylingCheckbox" for="conductive">
<input id="conductive" data-property="conductive" type="checkbox" <% if (properties.conductive){ %> checked="checked"<% } %> value="" data-toggle="checkbox" class="materialProperties custom-checkbox">
<span class="icons"><span class="icon-unchecked"></span><span class="icon-checked"></span></span>
Conductive</label>
Density (kg/m^3): &nbsp;&nbsp;<input data-property="density" value="<%= properties.density %>" placeholder="Density" class="form-control floatInput materialProperties" type="text"><br/><br/>
<!--Elasitc Mod (GPa): &nbsp;&nbsp;<input data-property="elasMod" value="<%= properties.elasMod %>" placeholder="Mod" class="form-control floatInput materialProperties" type="text"><br/><br/>-->
k (N/m): &nbsp;&nbsp;<input data-property="k" value="<%= properties.k %>" placeholder="K" class="form-control floatInput materialProperties" type="text"><br/><br/>
Material Stiffness (XYZ):<br/><br/>
Axial K: &nbsp;&nbsp;<input data-property="longitudalK" data-key="x" value="<%= properties.longitudalK.x %>" placeholder="X" class="form-control floatInput materialProperties" type="text">
<input data-property="longitudalK" data-key="y" value="<%= properties.longitudalK.y %>" placeholder="X" class="form-control floatInput materialProperties" type="text">
<input data-property="longitudalK" data-key="z" value="<%= properties.longitudalK.z %>" placeholder="X" class="form-control floatInput materialProperties" type="text"><br/><br/>
Shear K: &nbsp;&nbsp;<input data-property="shearK" data-key="x" value="<%= properties.shearK.x %>" placeholder="X" class="form-control floatInput materialProperties" type="text">
<input data-property="shearK" data-key="y" value="<%= properties.shearK.y %>" placeholder="X" class="form-control floatInput materialProperties" type="text">
<input data-property="shearK" data-key="z" value="<%= properties.shearK.z %>" placeholder="X" class="form-control floatInput materialProperties" type="text"><br/><br/>
Bending K: &nbsp;&nbsp;<input data-property="bendingK" data-key="x" value="<%= properties.bendingK.x %>" placeholder="X" class="form-control floatInput materialProperties" type="text">
<input data-property="bendingK" data-key="y" value="<%= properties.bendingK.y %>" placeholder="X" class="form-control floatInput materialProperties" type="text">
<input data-property="bendingK" data-key="z" value="<%= properties.bendingK.z %>" placeholder="X" class="form-control floatInput materialProperties" type="text"><br/><br/>
Torsional K: &nbsp;&nbsp;<input data-property="torsionK" data-key="x" value="<%= properties.torsionK.x %>" placeholder="X" class="form-control floatInput materialProperties" type="text">
<input data-property="torsionK" data-key="y" value="<%= properties.torsionK.y %>" placeholder="X" class="form-control floatInput materialProperties" type="text">
<input data-property="torsionK" data-key="z" value="<%= properties.torsionK.z %>" placeholder="X" class="form-control floatInput materialProperties" type="text"><br/><br/>
</div>
<br/>
<a id="saveExitMenu" href="#" class="btn btn-block btn-lg btn-success">Save Material</a><br/>
......
......@@ -31,8 +31,10 @@ define([], function(){
properties:{
conductive: false,
density: 3500,//kg/m^3
elasMod: 17.2,
k: 500
longitudalK:{x:500,y:500,z:500},
shearK:{x:500,y:500,z:500},
bendingK:{x:500,y:500,z:500},
torsionK:{x:500,y:500,z:500}
}
},
bending1DOF: {
......@@ -44,8 +46,10 @@ define([], function(){
properties:{
conductive: false,
density: 3500,//kg/m^3
elasMod: 0.01,
k: 30
longitudalK:{x:500,y:500,z:500},
shearK:{x:500,y:500,z:500},
bendingK:{x:500,y:500,z:30},
torsionK:{x:500,y:500,z:500}
}
},
bending2DOF: {
......@@ -57,8 +61,10 @@ define([], function(){
properties:{
conductive: false,
density: 3500,//kg/m^3
elasMod: 0.01,
k: 30
longitudalK:{x:500,y:500,z:500},
shearK:{x:500,y:500,z:500},
bendingK:{x:500,y:30,z:30},
torsionK:{x:500,y:500,z:500}
}
},
torsion1DOF: {
......@@ -70,8 +76,10 @@ define([], function(){
properties:{
conductive: false,
density: 3500,//kg/m^3
elasMod: 0.01,
k: 30
longitudalK:{x:500,y:500,z:500},
shearK:{x:500,y:500,z:500},
bendingK:{x:500,y:500,z:500},
torsionK:{x:500,y:500,z:30}
}
},
shear1DOF: {
......@@ -82,8 +90,24 @@ define([], function(){
properties:{
conductive: false,
density: 3500,//kg/m^3
elasMod: 0.01,
k: 30
longitudalK:{x:500,y:500,z:500},
shearK:{x:30,y:500,z:500},
bendingK:{x:500,y:500,z:500},
torsionK:{x:500,y:500,z:500}
}
},
isoFlex: {
name: "Iso-Flexible",
color: "#cda4f3",
altColor: "#cda4f3",
texture: "stripes",
properties:{
conductive: false,
density: 3500,//kg/m^3
longitudalK:{x:30,y:30,z:30},
shearK:{x:30,y:30,z:30},
bendingK:{x:30,y:30,z:30},
torsionK:{x:30,y:30,z:30}
}
},
conductive:{
......@@ -94,8 +118,10 @@ define([], function(){
properties:{
conductive: true,
density: 8500,//kg/m^3
elasMod: 1000,//Gpascals (kg/(s^2*m)/10000000000)
k: 500
longitudalK:{x:500,y:500,z:500},
shearK:{x:500,y:500,z:500},
bendingK:{x:500,y:500,z:500},
torsionK:{x:500,y:500,z:500}
}
},
conductiveBend:{
......@@ -106,8 +132,10 @@ define([], function(){
properties:{
conductive: true,
density: 8500,//kg/m^3
elasMod: 1000,//Gpascals (kg/(s^2*m)/10000000000)
k: 500
longitudalK:{x:500,y:500,z:500},
shearK:{x:500,y:500,z:500},
bendingK:{x:500,y:500,z:500},
torsionK:{x:500,y:500,z:500}
}
},
flexureCond: {
......@@ -119,8 +147,10 @@ define([], function(){
properties:{
conductive: true,
density: 3500,//kg/m^3
elasMod: 0.01,
k: 30
longitudalK:{x:30,y:30,z:30},
shearK:{x:30,y:30,z:30},
bendingK:{x:30,y:30,z:30},
torsionK:{x:30,y:30,z:30}
}
},
flexureCondBend: {
......@@ -132,8 +162,10 @@ define([], function(){
properties:{
conductive: true,
density: 3500,//kg/m^3
elasMod: 0.01,
k: 30
longitudalK:{x:30,y:30,z:30},
shearK:{x:30,y:30,z:30},
bendingK:{x:30,y:30,z:30},
torsionK:{x:30,y:30,z:30}
}
},
actuatorLinear1DOF: {
......@@ -144,8 +176,10 @@ define([], function(){
properties:{
conductive: false,
density: 6500,//kg/m^3
elasMod: 50,
k: 200
longitudalK:{x:500,y:500,z:500},
shearK:{x:500,y:500,z:500},
bendingK:{x:500,y:500,z:500},
torsionK:{x:500,y:500,z:500}
}
},
actuatorBending1DOF: {
......@@ -156,8 +190,10 @@ define([], function(){
properties:{
conductive: false,
density: 6500,//kg/m^3
elasMod: 50,
k: 200
longitudalK:{x:500,y:500,z:500},
shearK:{x:500,y:500,z:500},
bendingK:{x:500,y:500,z:500},
torsionK:{x:500,y:500,z:500}
}
},
actuatorTorsion1DOF: {
......@@ -168,8 +204,10 @@ define([], function(){
properties:{
conductive: false,
density: 6500,//kg/m^3
elasMod: 50,
k: 200
longitudalK:{x:500,y:500,z:500},
shearK:{x:500,y:500,z:500},
bendingK:{x:500,y:500,z:500},
torsionK:{x:500,y:500,z:500}
}
},
actuatorShear: {
......@@ -179,8 +217,10 @@ define([], function(){
properties:{
conductive: false,
density: 6500,//kg/m^3
elasMod: 50,
k: 200
longitudalK:{x:500,y:500,z:500},
shearK:{x:500,y:500,z:500},
bendingK:{x:500,y:500,z:500},
torsionK:{x:500,y:500,z:500}
}
},
signal: {
......@@ -191,8 +231,10 @@ define([], function(){
properties:{
conductive: true,
density: 6500,//kg/m^3
elasMod: 50,
k: 200
longitudalK:{x:500,y:500,z:500},
shearK:{x:500,y:500,z:500},
bendingK:{x:500,y:500,z:500},
torsionK:{x:500,y:500,z:500}
}
},
script: {
......@@ -203,8 +245,10 @@ define([], function(){
properties:{
conductive: true,
density: 6500,//kg/m^3
elasMod: 50,
k: 200
longitudalK:{x:500,y:500,z:500},
shearK:{x:500,y:500,z:500},
bendingK:{x:500,y:500,z:500},
torsionK:{x:500,y:500,z:500}
}
}
},
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment