Ignore:
Timestamp:
04/12/16 21:32:01 (9 years ago)
Author:
Mathieu Morlighem
Message:

merged trunk-jpl and trunk for revision 20497

Location:
issm/trunk
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • issm/trunk

  • issm/trunk/test

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

    r19105 r20500  
    77
    88% Use of ispdd methods
    9 md.surfaceforcings = SMBpdd();
    10 md.surfaceforcings.isdelta18o=0;
    11 md.surfaceforcings.ismungsm=1;
    12 
    13 if md.surfaceforcings.isdelta18o==0 & md.surfaceforcings.ismungsm==0
    14     md.surfaceforcings.precipitation=zeros(md.mesh.numberofvertices,1);
    15     md.surfaceforcings.monthlytemperatures=273*ones(md.mesh.numberofvertices,1);
    16 end
    17    
    18 
    19 % Add temperature, precipitation and delta18o needed to measure the surface mass balance
    20 % % creating delta18o
    21 % load '../Data/delta18o.data'
    22 % md.surfaceforcings.delta18o=delta18o;
    23 % % creating delta18oSurface
    24 % md.surfaceforcings.delta18o_surface(1,1:(length(delta18o))) = 0;
    25 % md.surfaceforcings.delta18o_surface(2,:) = delta18o(2,:);
    26 
    27 % creating Present day and lgm temperatures
    28 % Same temperature over the all region:
    29 tmonth(1:12)=238.15+20.;
    30 for imonth=0:11
    31     md.surfaceforcings.temperatures_presentday(1:md.mesh.numberofvertices,imonth+1)=tmonth(imonth+1);
    32     md.surfaceforcings.temperatures_lgm(1:md.mesh.numberofvertices,imonth+1)=tmonth(imonth+1)-20.;
    33     % Time for the last line:
    34     md.surfaceforcings.temperatures_presentday(md.mesh.numberofvertices+1,imonth+1)=((imonth+1)/12);
    35     md.surfaceforcings.temperatures_lgm(md.mesh.numberofvertices+1,imonth+1)=((imonth+1)/12);
    36 end
    37 
    38 % creating initialization and spc temperatures initialization and spc
    39 md.thermal.spctemperature=mean(md.surfaceforcings.temperatures_lgm(1:md.mesh.numberofvertices,1:12),2); %-10*ones(md.mesh.numberofvertices,1);
    40 md.thermal.spctemperature=repmat(md.thermal.spctemperature,1,md.timestepping.final_time/md.timestepping.time_step);
    41 itemp=0:md.timestepping.time_step:md.timestepping.final_time-md.timestepping.time_step;
    42 md.thermal.spctemperature(md.mesh.numberofvertices+1,:)=itemp;
    43 
    44 md.initialization.temperature=md.surfaceforcings.temperatures_lgm(1:md.mesh.numberofvertices,1); %*ones(md.mesh.numberofvertices,1);
    45 
    46 % creating precipitation
    47 for imonth=0:11
    48     md.surfaceforcings.precipitations_presentday(1:md.mesh.numberofvertices,imonth+1)=-0.4*10^(-6)*md.mesh.y+0.5;
    49     md.surfaceforcings.precipitations_lgm(1:md.mesh.numberofvertices,imonth+1)=-0.4*10^(-6)*md.mesh.y+0.5;
    50     % Time for the last line:
    51     md.surfaceforcings.precipitations_presentday(md.mesh.numberofvertices+1,imonth+1)=((imonth+1)/12);
    52     md.surfaceforcings.precipitations_lgm(md.mesh.numberofvertices+1,imonth+1)=((imonth+1)/12);
    53 end
    54 
    55 md.surfaceforcings.Pfac(1,1:md.timestepping.final_time)=0.5;
    56 md.surfaceforcings.Tdiff(1,1:md.timestepping.final_time)=0.5;
    57 md.surfaceforcings.sealev(1,1:md.timestepping.final_time)=0.5;
    58 % Year of each data point
    59 md.surfaceforcings.Pfac(2,1:md.timestepping.final_time)=1:1:md.timestepping.final_time;
    60 md.surfaceforcings.Tdiff(2,1:md.timestepping.final_time)=1:1:md.timestepping.final_time;
    61 md.surfaceforcings.sealev(2,1:md.timestepping.final_time)=1:1:md.timestepping.final_time;
     9md.smb = SMBpdd();
     10md.smb.isdelta18o=0;
     11md.smb.ismungsm=1;
    6212
    6313% time steps and resolution
    … …  
    6616md.timestepping.final_time=60;
    6717
     18% creating Present day and lgm temperatures
     19% Same temperature over the all region:
     20tmonth(1:12)=238.15+20.;
     21for imonth=0:11
     22    md.smb.temperatures_presentday(1:md.mesh.numberofvertices,imonth+1)=tmonth(imonth+1);
     23    md.smb.temperatures_lgm(1:md.mesh.numberofvertices,imonth+1)=tmonth(imonth+1)-20.;
     24    % Time for the last line:
     25    md.smb.temperatures_presentday(md.mesh.numberofvertices+1,imonth+1)=((imonth+1)/12);
     26    md.smb.temperatures_lgm(md.mesh.numberofvertices+1,imonth+1)=((imonth+1)/12);
     27end
     28
     29% creating initialization and spc temperatures initialization and spc
     30md.thermal.spctemperature=mean(md.smb.temperatures_lgm(1:md.mesh.numberofvertices,1:12),2); %-10*ones(md.mesh.numberofvertices,1);
     31md.thermal.spctemperature=repmat(md.thermal.spctemperature,1,md.timestepping.final_time/md.timestepping.time_step);
     32itemp=0:md.timestepping.time_step:md.timestepping.final_time-md.timestepping.time_step;
     33md.thermal.spctemperature(md.mesh.numberofvertices+1,:)=itemp;
     34
     35md.initialization.temperature=md.smb.temperatures_lgm(1:md.mesh.numberofvertices,1); %*ones(md.mesh.numberofvertices,1);
     36md.smb = initialize(md.smb,md);
     37
     38% creating precipitation
     39for imonth=0:11
     40    md.smb.precipitations_presentday(1:md.mesh.numberofvertices,imonth+1)=-0.4*10^(-6)*md.mesh.y+0.5;
     41    md.smb.precipitations_lgm(1:md.mesh.numberofvertices,imonth+1)=-0.4*10^(-6)*md.mesh.y+0.5;
     42    % Time for the last line:
     43    md.smb.precipitations_presentday(md.mesh.numberofvertices+1,imonth+1)=((imonth+1)/12);
     44    md.smb.precipitations_lgm(md.mesh.numberofvertices+1,imonth+1)=((imonth+1)/12);
     45end
     46
     47for iint=1:(md.timestepping.final_time/md.timestepping.time_step)+1
     48    md.smb.Pfac(1,iint)=0.15*iint;
     49    md.smb.Tdiff(1,iint)=0.15*iint;
     50    md.smb.sealev(1,iint)=0.15*iint;
     51    % Year of each data point
     52    md.smb.Pfac(2,iint)=(iint-1)*20;
     53    md.smb.Tdiff(2,iint)=(iint-1)*20;
     54    md.smb.sealev(2,iint)=(iint-1)*20;
     55end
     56
    6857%
    69 md.transient.requested_outputs={'default','SurfaceforcingsMonthlytemperatures'};
     58md.transient.requested_outputs={'default','SmbMonthlytemperatures'};
    7059md=extrude(md,3,1);
    7160
    … …  
    7564
    7665%Fields and tolerances to track changes
    77 field_names     ={'Vx1','Vy1','Vz1','Vel1','Pressure1','Bed1','Surface1','Thickness1','Temperature1','BasalforcingsGroundediceMeltingRate1', ...
    78                                                 'Vx2','Vy2','Vz2','Vel2','Pressure2','Bed2','Surface2','Thickness2','Temperature2','BasalforcingsGroundediceMeltingRate2', ...
    79                                                 'Vx3','Vy3','Vz3','Vel3','Pressure3','Bed3','Surface3','Thickness3','Temperature3','BasalforcingsGroundediceMeltingRate3'};
     66field_names     ={'Vx1','Vy1','Vz1','Vel1','Pressure1','Bed1','Surface1','Thickness1','Temperature1','BasalforcingsGroundediceMeltingRate1','SmbMonthlytemperatures1','SmbMassBalance1',...
     67                                                'Vx2','Vy2','Vz2','Vel2','Pressure2','Bed2','Surface2','Thickness2','Temperature2','BasalforcingsGroundediceMeltingRate2','SmbMonthlytemperatures2','SmbMassBalance2',...
     68                                                'Vx3','Vy3','Vz3','Vel3','Pressure3','Bed3','Surface3','Thickness3','Temperature3','BasalforcingsGroundediceMeltingRate3','SmbMonthlytemperatures3','SmbMassBalance3'};
    8069field_tolerances={...
    81         1e-13,1e-13,1e-13,1e-13,1e-13,1e-8,1e-8,1e-8,1e-13,1e-8,...
    82         1e-13,1e-13,1e-13,1e-13,1e-13,1e-8,1e-8,1e-8,1e-13,1e-8,...
    83         1e-13,1e-13,1e-08,1e-13,1e-13,1e-8,1e-8,1e-8,1e-13,1e-8};
     70        1e-13,1e-13,1e-13,1e-13,1e-13,1e-8,1e-8,1e-8,1e-13,1e-8,1e-13,1e-13,...
     71        1e-13,1e-13,1e-13,1e-13,1e-13,1e-8,1e-8,1e-8,1e-13,1e-7,1e-13,1e-13,...
     72        1e-13,1e-13,1e-08,1e-13,1e-13,1e-8,1e-8,1e-8,1e-13,5e-7,1e-13,1e-13};
    8473field_values={...
    8574        (md.results.TransientSolution(1).Vx),...
    … …  
    9382        (md.results.TransientSolution(1).Temperature),...
    9483        (md.results.TransientSolution(1).BasalforcingsGroundediceMeltingRate),...
    95         (md.results.TransientSolution(1).SurfaceforcingsMonthlytemperatures),...
    96         (md.results.TransientSolution(1).SurfaceforcingsMassBalance),...
     84        (md.results.TransientSolution(1).SmbMonthlytemperatures),...
     85        (md.results.TransientSolution(1).SmbMassBalance),...
    9786        (md.results.TransientSolution(2).Vx),...
    9887        (md.results.TransientSolution(2).Vy),...
    … …  
    10594        (md.results.TransientSolution(2).Temperature),...
    10695        (md.results.TransientSolution(2).BasalforcingsGroundediceMeltingRate),...
    107         (md.results.TransientSolution(2).SurfaceforcingsMonthlytemperatures),...
    108         (md.results.TransientSolution(2).SurfaceforcingsMassBalance),...
     96        (md.results.TransientSolution(2).SmbMonthlytemperatures),...
     97        (md.results.TransientSolution(2).SmbMassBalance),...
    10998        (md.results.TransientSolution(3).Vx),...
    11099        (md.results.TransientSolution(3).Vy),...
    … …  
    117106        (md.results.TransientSolution(3).Temperature),...
    118107        (md.results.TransientSolution(3).BasalforcingsGroundediceMeltingRate),...
    119         (md.results.TransientSolution(3).SurfaceforcingsMonthlytemperatures),...
    120         (md.results.TransientSolution(3).SurfaceforcingsMassBalance),...
     108        (md.results.TransientSolution(3).SmbMonthlytemperatures),...
     109        (md.results.TransientSolution(3).SmbMassBalance),...
    121110        };
Note: See TracChangeset for help on using the changeset viewer.