Changeset 22338


Ignore:
Timestamp:
01/05/18 14:16:06 (7 years ago)
Author:
seroussi
Message:

CHG: added scaling in test443

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

Legend:

Unmodified
Added
Removed

  • issm/trunk-jpl/test/NightlyRun/test443.m

    r21827 r22338  
    1414md.transient.isgroundingline=1;
    1515md.groundingline.migration='AggressiveMigration';
     16md.mesh.scale_factor=1.1*ones(md.mesh.numberofvertices,1);
    1617
    1718md.settings.output_frequency=2;
    … …  
    2324regionalmask(find(in))=1;
    2425md.transient.requested_outputs={'default','GroundedArea1','FloatingArea1','TotalFloatingBmb1','TotalGroundedBmb1','TotalSmb1',...
    25         'IceMass1','IceVolume1','IceVolumeAboveFloatation1','IceVolumeAboveFloatation2','IceVolumeAboveFloatation'};
     26        'IceMass1','IceVolume1','IceVolumeAboveFloatation1','IceVolumeAboveFloatation2','IceVolumeAboveFloatation',...
     27        'IceMassScaled1','IceVolumeScaled1','IceVolumeAboveFloatationScaled1','IceVolumeAboveFloatationScaled2'};
    2628md.outputdefinition.definitions{1}=regionaloutput('name','GroundedArea1','outputnamestring','GroundedArea','mask',regionalmask,...
    2729        'definitionstring','Outputdefinition1');
    … …  
    4244md.outputdefinition.definitions{9}=regionaloutput('name','IceVolumeAboveFloatation2','outputnamestring','IceVolumeAboveFloatation',...
    4345        'maskexpstring','../Exp/SquareHalfRight.exp','definitionstring','Outputdefinition9','model',md);
     46md.outputdefinition.definitions{10}=regionaloutput('name','IceMassScaled1','outputnamestring','IceMassScaled','mask',regionalmask,...
     47        'definitionstring','Outputdefinition10');
     48md.outputdefinition.definitions{11}=regionaloutput('name','IceVolumeScaled1','outputnamestring','IceVolumeScaled','mask',regionalmask,...
     49        'definitionstring','Outputdefinition11');
     50md.outputdefinition.definitions{12}=regionaloutput('name','IceVolumeAboveFloatationScaled1','outputnamestring','IceVolumeAboveFloatationScaled','mask',regionalmask,...
     51        'definitionstring','Outputdefinition12');
     52md.outputdefinition.definitions{13}=regionaloutput('name','IceVolumeAboveFloatationScaled2','outputnamestring','IceVolumeAboveFloatationScaled',...
     53        'maskexpstring','../Exp/SquareHalfRight.exp','definitionstring','Outputdefinition13','model',md);
    4454
    4555md=extrude(md,3,1);
    … …  
    5060field_names     ={'IceMass1','IceVolume1','IceVolumeAboveFloatation1','IceVolumeAboveFloatation21',...
    5161        'Thickness1','GroundedArea1','FloatingArea1','TotalFloatingBmb1','TotalGroundedBmb1','TotalSmb1',...
     62   'IceMassScaled1','IceVolumeScaled1','IceVolumeAboveFloatationScaled1','IceVolumeAboveFloatationScaled21',...
    5263        'IceMass3','IceVolume3','IceVolumeAboveFloatation3','IceVolumeAboveFloatation23',...
    5364        'Thickness3','GroundedArea3','FloatingArea3','TotalFloatingBmb3','TotalGroundedBmb3','TotalSmb3',...
     65        'IceMassScaled3','IceVolumeScaled3','IceVolumeAboveFloatationScaled3','IceVolumeAboveFloatationScaled23',...
    5466        'ExtrudedMask','CollapsedMask'};
    55 field_tolerances={1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,...
    56         1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13};
     67field_tolerances={1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,...
     68        1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13};
    5769field_values={...
    5870        (md.results.TransientSolution(1).IceMass1),...
    … …  
    6678        (md.results.TransientSolution(1).TotalGroundedBmb1),...
    6779        (md.results.TransientSolution(1).TotalSmb1),...
     80        (md.results.TransientSolution(1).IceMassScaled1),...
     81        (md.results.TransientSolution(1).IceVolumeScaled1),...
     82        (md.results.TransientSolution(1).IceVolumeAboveFloatationScaled1),...
     83        (md.results.TransientSolution(1).IceVolumeAboveFloatationScaled2),...
    6884        (md.results.TransientSolution(3).IceMass1),...
    6985        (md.results.TransientSolution(3).IceVolume1),...
    … …  
    7692        (md.results.TransientSolution(3).TotalGroundedBmb1),...
    7793        (md.results.TransientSolution(3).TotalSmb1),...
     94        (md.results.TransientSolution(3).IceMassScaled1),...
     95        (md.results.TransientSolution(3).IceVolumeScaled1),...
     96        (md.results.TransientSolution(3).IceVolumeAboveFloatationScaled1),...
     97        (md.results.TransientSolution(3).IceVolumeAboveFloatationScaled2),...
    7898        length(md.outputdefinition.definitions{1}.mask),...
    7999        length(md2.outputdefinition.definitions{1}.mask),...

  • issm/trunk-jpl/test/NightlyRun/test443.py

    r21827 r22338  
    2727md.transient.isgroundingline=True
    2828md.groundingline.migration='AggressiveMigration';
     29md.mesh.scale_factor=1.1*np.ones((md.mesh.numberofvertices))
    2930
    3031md.settings.output_frequency=2
    … …  
    3536inflag=ContourToMesh(md.mesh.elements,md.mesh.x,md.mesh.y,'../Exp/SquareHalfRight.exp','node',1)
    3637regionalmask[np.nonzero(inflag)[0]] = 1.
    37 md.transient.requested_outputs=['default','GroundedArea1','FloatingArea1','TotalFloatingBmb1','TotalGroundedBmb1','TotalSmb1','IceMass1','IceVolume1','IceVolumeAboveFloatation1','IceVolumeAboveFloatation2','IceVolumeAboveFloatation']
     38md.transient.requested_outputs=['default','GroundedArea1','FloatingArea1','TotalFloatingBmb1','TotalGroundedBmb1','TotalSmb1','IceMass1','IceVolume1','IceVolumeAboveFloatation1','IceVolumeAboveFloatation2','IceVolumeAboveFloatation','IceMassScaled1','IceVolumeScaled1','IceVolumeAboveFloatationScaled1','IceVolumeAboveFloatationScaled2']
    3839
    3940md.outputdefinition.definitions=[regionaloutput('name','GroundedArea1','outputnamestring','GroundedArea','mask',regionalmask,'definitionstring','Outputdefinition1'),
    … …  
    4546                regionaloutput('name','IceVolumeAboveFloatation1','outputnamestring','IceVolumeAboveFloatation','mask',regionalmask,'definitionstring','Outputdefinition7'),
    4647                regionaloutput('name','TotalSmb1','outputnamestring','TotalSmb','mask',regionalmask,'definitionstring','Outputdefinition8'),
    47                 regionaloutput('name','IceVolumeAboveFloatation2','outputnamestring','IceVolumeAboveFloatation','maskexpstring','../Exp/SquareHalfRight.exp','definitionstring','Outputdefinition9','model',md)]
     48                regionaloutput('name','IceVolumeAboveFloatation2','outputnamestring','IceVolumeAboveFloatation','maskexpstring','../Exp/SquareHalfRight.exp','definitionstring','Outputdefinition9','model',md),
     49                regionaloutput('name','IceMassScaled1','outputnamestring','IceMassScaled','mask',regionalmask,'definitionstring','Outputdefinition10'),
     50                regionaloutput('name','IceVolumeScaled1','outputnamestring','IceVolumeScaled','mask',regionalmask,'definitionstring','Outputdefinition11'),
     51                regionaloutput('name','IceVolumeAboveFloatationScaled1','outputnamestring','IceVolumeAboveFloatationScaled','mask',regionalmask,'definitionstring','Outputdefinition12'),
     52                regionaloutput('name','IceVolumeAboveFloatationScaled2','outputnamestring','IceVolumeAboveFloatationScaled','maskexpstring','../Exp/SquareHalfRight.exp','definitionstring','Outputdefinition13','model',md)]
    4853
    4954md.extrude(3,1.)
    … …  
    5358
    5459#Fields and tolerances to track changes
    55 field_names     =['IceMass1','IceVolume1','IceVolumeAboveFloatation1','IceVolumeAboveFloatation21','Thickness1','GroundedArea1','FloatingArea1','TotalFloatingBmb1','TotalGroundedBmb1','TotalSmb1','IceMass3','IceVolume3','IceVolumeAboveFloatation3','IceVolumeAboveFloatation23','Thickness3','GroundedArea3','FloatingArea3','TotalFloatingBmb3','TotalGroundedBmb3','TotalSmb3','ExtrudedMask','CollapsedMask']
    56 field_tolerances=[1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13]
     60field_names     =['IceMass1','IceVolume1','IceVolumeAboveFloatation1','IceVolumeAboveFloatation21','Thickness1','GroundedArea1','FloatingArea1','TotalFloatingBmb1','TotalGroundedBmb1','TotalSmb1','IceMassScaled1','IceVolumeScaled1','IceVolumeAboveFloatationScaled1','IceVolumeAboveFloatationScaled21','IceMass3','IceVolume3','IceVolumeAboveFloatation3','IceVolumeAboveFloatation23','Thickness3','GroundedArea3','FloatingArea3','TotalFloatingBmb3','TotalGroundedBmb3','TotalSmb3','IceMassScaled3','IceVolumeScaled3','IceVolumeAboveFloatationScaled3','IceVolumeAboveFloatationScaled23','ExtrudedMask','CollapsedMask']
     61field_tolerances=[1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13]
    5762field_values=[\
    5863        md.results.TransientSolution[0].IceMass1,\
    … …  
    6671        md.results.TransientSolution[0].TotalGroundedBmb1,\
    6772        md.results.TransientSolution[0].TotalSmb1,\
     73        md.results.TransientSolution[0].IceMassScaled1,\
     74        md.results.TransientSolution[0].IceVolumeScaled1,\
     75        md.results.TransientSolution[0].IceVolumeAboveFloatationScaled1,\
     76        md.results.TransientSolution[0].IceVolumeAboveFloatationScaled2,\
    6877        md.results.TransientSolution[2].IceMass1,\
    6978        md.results.TransientSolution[2].IceVolume1,\
    … …  
    7685        md.results.TransientSolution[2].TotalGroundedBmb1,\
    7786        md.results.TransientSolution[2].TotalSmb1,\
     87        md.results.TransientSolution[2].IceMassScaled1,\
     88        md.results.TransientSolution[2].IceVolumeScaled1,\
     89        md.results.TransientSolution[2].IceVolumeAboveFloatationScaled1,\
     90        md.results.TransientSolution[2].IceVolumeAboveFloatationScaled2,\
    7891        len(md.outputdefinition.definitions[0].mask),\
    7992        len(md2.outputdefinition.definitions[0].mask),\
Note: See TracChangeset for help on using the changeset viewer.