Last change
on this file since 20498 was 20498, checked in by Mathieu Morlighem, 9 years ago |
CHG: done with Archive/19101-20495
|
File size:
1.3 KB
|
Rev | Line | |
---|
[20498] | 1 | Index: ../trunk-jpl/src/m/boundaryconditions/SetIceShelfBC.js
|
---|
| 2 | ===================================================================
|
---|
| 3 | --- ../trunk-jpl/src/m/boundaryconditions/SetIceShelfBC.js (revision 19836)
|
---|
| 4 | +++ ../trunk-jpl/src/m/boundaryconditions/SetIceShelfBC.js (revision 19837)
|
---|
| 5 | @@ -17,7 +17,7 @@
|
---|
| 6 | //node on Dirichlet (boundary and ~icefront)
|
---|
| 7 | if (arguments.length==2){
|
---|
| 8 | icefront=arguments[1];
|
---|
| 9 | - nodeinsideicefront=ContourToMesh(md.mesh.elements,md.mesh.x,md.mesh.y,icefrontfile,'node',2);
|
---|
| 10 | + nodeinsideicefront=ContourToMesh(md.mesh.elements,md.mesh.x,md.mesh.y,icefront,'node',2);
|
---|
| 11 | nodeonicefront=ArrayAnd(md.mesh.vertexonboundary,nodeinsideicefront);
|
---|
| 12 | }
|
---|
| 13 | else if(arguments.length==1){
|
---|
| 14 | @@ -51,7 +51,6 @@
|
---|
| 15 | var obs=false;
|
---|
| 16 | if((md.inversion.vx_obs.length == md.mesh.numberofvertices) & (md.inversion.vy_obs.length==md.mesh.numberofvertices))obs=true;
|
---|
| 17 |
|
---|
| 18 | -
|
---|
| 19 | if(obs==true){
|
---|
| 20 | console.log(' boundary conditions for stressbalance model: setting spc as observed velocities');
|
---|
| 21 | }
|
---|
| 22 | @@ -61,7 +60,7 @@
|
---|
| 23 | for(var i=0;i<md.mesh.segments.length;i++){
|
---|
| 24 | var sum=0;
|
---|
| 25 | for (var j=0;j<numbernodesfront;j++) sum+=md.mask.ice_levelset[md.mesh.segments[i][j]-1];
|
---|
| 26 | - if(sum!=numbernodesfront){
|
---|
| 27 | + if(sum!=0){
|
---|
| 28 | for (var j=0;j<numbernodesfront;j++){
|
---|
| 29 | if(obs==false){
|
---|
| 30 | md.stressbalance.spcvx[md.mesh.segments[i][j]-1]=0;
|
---|
Note:
See
TracBrowser
for help on using the repository browser.