Changeset 9433


Ignore:
Timestamp:
08/25/11 15:51:05 (14 years ago)
Author:
Mathieu Morlighem
Message:

no more observed_temperature

Location:
issm/trunk/test/NightlyRun
Files:
8 edited

Legend:

Unmodified
Added
Removed

  • issm/trunk/test/NightlyRun/test1301.m

    r9045 r9433  
    1414%Some conditions specific to melting test
    1515md.pressure=zeros(md.numberofnodes,1);
    16 md.observed_temperature=273.15*ones(md.numberofnodes,1);
    17 md.temperature=md.observed_temperature;
     16md.temperature=273.15*ones(md.numberofnodes,1);
    1817pos=find(md.nodeonsurface);
    19 md.spctemperature(pos)=md.observed_temperature(pos);
     18md.spctemperature(pos)=md.temperature(pos);
    2019md.rheology_B=paterson(md.temperature);
    2120

  • issm/trunk/test/NightlyRun/test1302.m

    r9045 r9433  
    2323A=10/(exp(alpha*(-1000))-1);    %A=T(bed)/(exp(alpha*bed)-1)  with bed=-1000 T(bed)=10
    2424B=-A;
    25 md.observed_temperature=A*exp(alpha*md.z)+B;
     25md.temperature=A*exp(alpha*md.z)+B;
    2626
    2727%modeled  results
    … …  
    3232comp_temp=zeros(md.numberofnodes,1);
    3333comp_temp(md.results.ThermalSolution.Temperature.index)=md.results.ThermalSolution.Temperature.value;
    34 relative=abs((comp_temp-md.observed_temperature)./md.observed_temperature)*100;
    35 relative(find(comp_temp==md.observed_temperature))=0;
    36 plotmodel(md,'data',comp_temp,'title','Modeled temperature [K]','data','observed_temperature','view',3,...
    37         'title','Analytical temperature [K]','view',3,'data',comp_temp-md.observed_temperature,...
     34relative=abs((comp_temp-md.temperature)./md.temperature)*100;
     35relative(find(comp_temp==md.temperature))=0;
     36plotmodel(md,'data',comp_temp,'title','Modeled temperature [K]','data','temperature','view',3,...
     37        'title','Analytical temperature [K]','view',3,'data',comp_temp-md.temperature,...
    3838        'title','Absolute error [K]','view',3,'data',relative,'title','Relative error [%]','view',3,...
    3939        'figposition','mathieu','FontSize#all',20)

  • issm/trunk/test/NightlyRun/test1303.m

    r9045 r9433  
    1818%d2T/dz2=0 T(bed)=10 T(surface)=0  => T=0*(z-bed)/thickness+10*(surface-z)/thickness
    1919%each layer of the 3d mesh must have a constant value
    20 md.observed_temperature=10*(md.surface-md.z)./md.thickness;
     20md.temperature=10*(md.surface-md.z)./md.thickness;
    2121
    2222%modeled  results
    … …  
    2727comp_temp=zeros(md.numberofnodes,1);
    2828comp_temp(md.results.ThermalSolution.Temperature.index)=md.results.ThermalSolution.Temperature.value;
    29 relative=abs((comp_temp-md.observed_temperature)./md.observed_temperature)*100;
    30 relative(find(comp_temp==md.observed_temperature))=0;
    31 plotmodel(md,'data',comp_temp,'title','Modeled temperature [K]','data','observed_temperature','view',3,...
    32         'title','Analytical temperature [K]','view',3,'data',comp_temp-md.observed_temperature,...
     29relative=abs((comp_temp-md.temperature)./md.temperature)*100;
     30relative(find(comp_temp==md.temperature))=0;
     31plotmodel(md,'data',comp_temp,'title','Modeled temperature [K]','data','temperature','view',3,...
     32        'title','Analytical temperature [K]','view',3,'data',comp_temp-md.temperature,...
    3333        'title','Absolute error [K]','view',3,'data',relative,'title','Relative error [%]','view',3,...
    3434        'figposition','mathieu','FontSize#all',20)

  • issm/trunk/test/NightlyRun/test1304.m

    r9045 r9433  
    1919%the result is linear with depth and is equal to 0 on the upper surface (See BC)
    2020%d2T/dz2=0  -k*dT/dz(bed)=G  T(surface)=0  => T=-G/k*(z-surface)
    21 md.observed_temperature=-0.1/md.thermalconductivity*(md.z-md.surface); %G=0.1 W/m2
     21md.temperature=-0.1/md.thermalconductivity*(md.z-md.surface); %G=0.1 W/m2
    2222
    2323%modeled  results
    … …  
    2828comp_temp=zeros(md.numberofnodes,1);
    2929comp_temp(md.results.ThermalSolution.Temperature.index)=md.results.ThermalSolution.Temperature.value;
    30 relative=abs((comp_temp-md.observed_temperature)./md.observed_temperature)*100;
    31 relative(find(comp_temp==md.observed_temperature))=0;
    32 plotmodel(md,'data',comp_temp,'title','Modeled temperature [K]','data','observed_temperature','view',3,...
    33         'title','Analytical temperature','view',3,'data',comp_temp-md.observed_temperature,...
     30relative=abs((comp_temp-md.temperature)./md.temperature)*100;
     31relative(find(comp_temp==md.temperature))=0;
     32plotmodel(md,'data',comp_temp,'title','Modeled temperature [K]','data','temperature','view',3,...
     33        'title','Analytical temperature','view',3,'data',comp_temp-md.temperature,...
    3434        'title','Absolute error [K]','view',3,'data',relative,'title','Relative error [%]','view',3,...
    3535        'figposition','mathieu','FontSize#all',20)

  • issm/trunk/test/NightlyRun/test233.m

    r8824 r9433  
    3232
    3333%Materials
    34 md.observed_temperature=(273-20)*ones(md.numberofnodes,1);
    35 md.rheology_B=paterson(md.observed_temperature);
     34md.temperature=(273-20)*ones(md.numberofnodes,1);
     35md.rheology_B=paterson(md.temperature);
    3636md.rheology_n=3*ones(md.numberofelements,1);
    37 md.temperature=md.observed_temperature;
    3837
    3938%Boundary conditions:

  • issm/trunk/test/NightlyRun/test234.m

    r8824 r9433  
    3232
    3333%Materials
    34 md.observed_temperature=(273-20)*ones(md.numberofnodes,1);
    35 md.rheology_B=paterson(md.observed_temperature);
     34md.temperature=(273-20)*ones(md.numberofnodes,1);
     35md.rheology_B=paterson(md.temperature);
    3636md.rheology_n=3*ones(md.numberofelements,1);
    37 md.temperature=md.observed_temperature;
    3837
    3938%Boundary conditions:

  • issm/trunk/test/NightlyRun/test235.m

    r8968 r9433  
    2929
    3030%Materials
    31 md.observed_temperature=(273-20)*ones(md.numberofnodes,1);
    32 md.rheology_B=paterson(md.observed_temperature);
     31md.temperature=(273-20)*ones(md.numberofnodes,1);
     32md.rheology_B=paterson(md.temperature);
    3333md.rheology_n=3*ones(md.numberofelements,1);
    34 md.temperature=md.observed_temperature;
    3534
    3635%Boundary conditions:

  • issm/trunk/test/NightlyRun/test236.m

    r8968 r9433  
    2929
    3030%Materials
    31 md.observed_temperature=(273-20)*ones(md.numberofnodes,1);
    32 md.rheology_B=paterson(md.observed_temperature);
     31md.temperature=(273-20)*ones(md.numberofnodes,1);
     32md.rheology_B=paterson(md.temperature);
    3333md.rheology_n=3*ones(md.numberofelements,1);
    34 md.temperature=md.observed_temperature;
    3534
    3635%Boundary conditions:
Note: See TracChangeset for help on using the changeset viewer.