Changeset 16063


Ignore:
Timestamp:
09/04/13 11:14:02 (12 years ago)
Author:
seroussi
Message:

CHG: added a small slope in x direction for all nighlty runs to avoid 0 values problem

Location:
issm/trunk-jpl/test
Files:
133 edited

Legend:

Unmodified
Added
Removed

  • issm/trunk-jpl/test/Par/SquareSheetConstrained.par

    r15988 r16063  
    66ymin=min(md.mesh.y);
    77ymax=max(md.mesh.y);
    8 
    9 md.geometry.thickness=hmax+(hmin-hmax)*(md.mesh.y-ymin)/(ymax-ymin);
     8xmin=min(md.mesh.x);
     9xmax=max(md.mesh.x);
     10md.geometry.thickness=hmax+(hmin-hmax)*(md.mesh.y-ymin)/(ymax-ymin)+0.1*(hmin-hmax)*(md.mesh.x-xmin)/(xmax-xmin);
    1011md.geometry.bed=-md.materials.rho_ice/md.materials.rho_water*md.geometry.thickness+20.;
    1112md.geometry.surface=md.geometry.bed+md.geometry.thickness;

  • issm/trunk-jpl/test/Par/SquareSheetConstrained.py

    r15988 r16063  
    1515ymin=numpy.min(md.mesh.y)
    1616ymax=numpy.max(md.mesh.y)
    17 
    18 md.geometry.thickness=hmax+(hmin-hmax)*(md.mesh.y.reshape(-1,1)-ymin)/(ymax-ymin)
     17xmin=min(md.mesh.x)
     18xmax=max(md.mesh.x)
     19md.geometry.thickness=hmax+(hmin-hmax)*(md.mesh.y.reshape(-1,1)-ymin)/(ymax-ymin)+0.1*(hmin-hmax)*(md.mesh.x.reshape(-1,1)-xmin)/(xmax-xmin)
    1920md.geometry.bed=-md.materials.rho_ice/md.materials.rho_water*md.geometry.thickness+20.
    2021md.geometry.surface=md.geometry.bed+md.geometry.thickness

  • issm/trunk-jpl/test/Par/SquareSheetShelf.par

    r15988 r16063  
    66ymin=min(md.mesh.y);
    77ymax=max(md.mesh.y);
    8 md.geometry.thickness=hmax+(hmin-hmax)*(md.mesh.y-ymin)/(ymax-ymin);
     8xmin=min(md.mesh.x);
     9xmax=max(md.mesh.x);
     10md.geometry.thickness=hmax+(hmin-hmax)*(md.mesh.y-ymin)/(ymax-ymin)+0.1*(hmin-hmax)*(md.mesh.x-xmin)/(xmax-xmin);
    911md.geometry.bed=-md.materials.rho_ice/md.materials.rho_water*md.geometry.thickness;
    1012bed_sheet=-md.materials.rho_ice/md.materials.rho_water*(hmax+(hmin-hmax)*(ymax/2-ymin)/(ymax-ymin));

  • issm/trunk-jpl/test/Par/SquareSheetShelf.py

    r15988 r16063  
    1515ymin=min(md.mesh.y)
    1616ymax=max(md.mesh.y)
    17 md.geometry.thickness=hmax+(hmin-hmax)*(md.mesh.y.reshape(-1,1)-ymin)/(ymax-ymin)
     17xmin=min(md.mesh.x)
     18xmax=max(md.mesh.x)
     19md.geometry.thickness=hmax+(hmin-hmax)*(md.mesh.y.reshape(-1,1)-ymin)/(ymax-ymin)+0.1*(hmin-hmax)*(md.mesh.x.reshape(-1,1)-xmin)/(xmax-xmin)
    1820md.geometry.bed=-md.materials.rho_ice/md.materials.rho_water*md.geometry.thickness
    1921bed_sheet=-md.materials.rho_ice/md.materials.rho_water*(hmax+(hmin-hmax)*(ymax/2-ymin)/(ymax-ymin))

  • issm/trunk-jpl/test/Par/SquareShelf.par

    r15988 r16063  
    66ymin=min(md.mesh.y);
    77ymax=max(md.mesh.y);
    8 md.geometry.thickness=hmax+(hmin-hmax)*(md.mesh.y-ymin)/(ymax-ymin);
     8xmin=min(md.mesh.x);
     9xmax=max(md.mesh.x);
     10md.geometry.thickness=hmax+(hmin-hmax)*(md.mesh.y-ymin)/(ymax-ymin)+0.1*(hmin-hmax)*(md.mesh.x-xmin)/(xmax-xmin);
    911md.geometry.bed=-md.materials.rho_ice/md.materials.rho_water*md.geometry.thickness;
    1012md.geometry.surface=md.geometry.bed+md.geometry.thickness;

  • issm/trunk-jpl/test/Par/SquareShelf.py

    r15988 r16063  
    1414ymin=min(md.mesh.y)
    1515ymax=max(md.mesh.y)
    16 
    17 md.geometry.thickness=hmax+(hmin-hmax)*(md.mesh.y.reshape(-1,1)-ymin)/(ymax-ymin)
     16xmin=min(md.mesh.x)
     17xmax=max(md.mesh.x)
     18md.geometry.thickness=hmax+(hmin-hmax)*(md.mesh.y.reshape(-1,1)-ymin)/(ymax-ymin)+0.1*(hmin-hmax)*(md.mesh.x.reshape(-1,1)-xmin)/(xmax-xmin)
    1819md.geometry.bed=-md.materials.rho_ice/md.materials.rho_water*md.geometry.thickness
    1920md.geometry.surface=md.geometry.bed+md.geometry.thickness

  • issm/trunk-jpl/test/Par/SquareShelf2.par

    r15988 r16063  
    66ymin=min(md.mesh.y);
    77ymax=max(md.mesh.y);
    8 md.geometry.thickness=hmax+(hmin-hmax)*(md.mesh.y-ymin)/(ymax-ymin);
     8xmin=min(md.mesh.x);
     9xmax=max(md.mesh.x);
     10md.geometry.thickness=hmax+(hmin-hmax)*(md.mesh.y-ymin)/(ymax-ymin)+0.1*(hmin-hmax)*(md.mesh.x-xmin)/(xmax-xmin);
    911md.geometry.bed=-md.materials.rho_ice/md.materials.rho_water*md.geometry.thickness;
    1012md.geometry.surface=md.geometry.bed+md.geometry.thickness;

  • issm/trunk-jpl/test/Par/SquareShelf2.py

    r15988 r16063  
    1414ymin=min(md.mesh.y)
    1515ymax=max(md.mesh.y)
    16 
    17 md.geometry.thickness=hmax+(hmin-hmax)*(md.mesh.y.reshape(-1,1)-ymin)/(ymax-ymin)
     16xmin=min(md.mesh.x)
     17xmax=max(md.mesh.x)
     18md.geometry.thickness=hmax+(hmin-hmax)*(md.mesh.y.reshape(-1,1)-ymin)/(ymax-ymin)+0.1*(hmin-hmax)*(md.mesh.x.reshape(-1,1)-xmin)/(xmax-xmin)
    1819md.geometry.bed=-md.materials.rho_ice/md.materials.rho_water*md.geometry.thickness
    1920md.geometry.surface=md.geometry.bed+md.geometry.thickness

  • issm/trunk-jpl/test/Par/SquareShelfConstrained.par

    r15988 r16063  
    66ymin=min(md.mesh.y);
    77ymax=max(md.mesh.y);
    8 md.geometry.thickness=hmax+(hmin-hmax)*(md.mesh.y-ymin)/(ymax-ymin);
     8xmin=min(md.mesh.x);
     9xmax=max(md.mesh.x);
     10md.geometry.thickness=hmax+(hmin-hmax)*(md.mesh.y-ymin)/(ymax-ymin)+0.1*(hmin-hmax)*(md.mesh.x-xmin)/(xmax-xmin);
    911md.geometry.bed=-md.materials.rho_ice/md.materials.rho_water*md.geometry.thickness;
    1012md.geometry.surface=md.geometry.bed+md.geometry.thickness;

  • issm/trunk-jpl/test/Par/SquareShelfConstrained.py

    r15988 r16063  
    1414ymin=numpy.min(md.mesh.y)
    1515ymax=numpy.max(md.mesh.y)
    16 
    17 md.geometry.thickness=hmax+(hmin-hmax)*(md.mesh.y.reshape(-1,1)-ymin)/(ymax-ymin)
     16xmin=min(md.mesh.x)
     17xmax=max(md.mesh.x)
     18md.geometry.thickness=hmax+(hmin-hmax)*(md.mesh.y.reshape(-1,1)-ymin)/(ymax-ymin)+0.1*(hmin-hmax)*(md.mesh.x.reshape(-1,1)-xmin)/(xmax-xmin)
    1819md.geometry.bed=-md.materials.rho_ice/md.materials.rho_water*md.geometry.thickness
    1920md.geometry.surface=md.geometry.bed+md.geometry.thickness
Note: See TracChangeset for help on using the changeset viewer.