Changeset 3758


Ignore:
Timestamp:
05/17/10 08:10:04 (15 years ago)
Author:
seroussi
Message:

fields name

File:
1 edited

Legend:

Unmodified
Added
Removed

  • issm/trunk/src/m/classes/public/ismodelselfconsistent.m

    r3653 r3758  
    9393
    9494%NO NAN
    95 fields={'numberofelements','numberofgrids','x','y','z','drag','drag_type','p','q',...
    96         'rho_ice','rho_water','B','elementoniceshelf','surface','thickness','bed','g','lowmem','sparsity','nsteps','maxiter',...
    97         'tolx','np','eps_res','max_nonlinear_iterations','exclusive','n','gridonbed','gridonsurface','elementonbed','elementonsurface','deltaH','DeltaH','timeacc','timedec'};
     95fields={'numberofelements','numberofgrids','x','y','z','drag_coefficient','drag_type','drag_p','drag_q',...
     96        'rho_ice','rho_water','rheology_B','elementoniceshelf','surface','thickness','bed','g','lowmem','sparsity','nsteps','maxiter',...
     97        'tolx','np','eps_res','max_nonlinear_iterations','exclusive','rheology_n','gridonbed','gridonsurface','elementonbed','elementonsurface','deltaH','DeltaH','timeacc','timedec'};
    9898checknan(md,fields);
    9999
    100100%FIELDS >= 0
    101 fields={'numberofelements','numberofgrids','elements','drag','drag_type','p','q',...
    102         'rho_ice','rho_water','B','elementoniceshelf','thickness','g','eps_res','max_nonlinear_iterations','eps_rel','eps_abs','nsteps','maxiter','tolx','exclusive',...
    103         'sparsity','lowmem','n','gridonbed','gridonsurface','elementonbed','elementonsurface','deltaH','DeltaH','timeacc','timedec'};
     101fields={'numberofelements','numberofgrids','elements','drag_coefficient','drag_type','drag_p','drag_q',...
     102        'rho_ice','rho_water','rheology_B','elementoniceshelf','thickness','g','eps_res','max_nonlinear_iterations','eps_rel','eps_abs','nsteps','maxiter','tolx','exclusive',...
     103        'sparsity','lowmem','rheology_n','gridonbed','gridonsurface','elementonbed','elementonsurface','deltaH','DeltaH','timeacc','timedec'};
    104104checkgreater(md,fields,0);
    105105
    106106%FIELDS > 0
    107 fields={'numberofelements','numberofgrids','elements','drag_type','p',...
    108         'rho_ice','rho_water','B','thickness','g','max_nonlinear_iterations','eps_res','eps_rel','eps_abs','maxiter','tolx',...
     107fields={'numberofelements','numberofgrids','elements','drag_type','drag_p',...
     108        'rho_ice','rho_water','rheology_B','thickness','g','max_nonlinear_iterations','eps_res','eps_rel','eps_abs','maxiter','tolx',...
    109109        'sparsity','deltaH','DeltaH','timeacc','timedec'};
    110110checkgreaterstrict(md,fields,0);
    111111
    112112%SIZE NUMBEROFELEMENTS
    113 fields={'p','q','elementoniceshelf','n','elementonbed'};
     113fields={'drag_p','drag_q','elementoniceshelf','n','elementonbed'};
    114114checksize(md,fields,[md.numberofelements 1]);
    115115
    116116%SIZE NUMBEROFGRIDS
    117 fields={'x','y','z','B','drag','melting','accumulation','surface','thickness','bed','gridonbed','gridonsurface'};
     117fields={'x','y','z','rheology_B','drag_coefficient','melting_rate','accumulation_rate','surface','thickness','bed','gridonbed','gridonsurface'};
    118118checksize(md,fields,[md.numberofgrids 1]);
    119119
    … …  
    326326
    327327        %INITIAL TEMPERATURE, MELTING AND ACCUMULATION
    328         fields={'temperature','accumulation','melting'};
     328        fields={'temperature','accumulation_rate','melting_rate'};
    329329        checksize(md,fields,[md.numberofgrids 1]);
    330330        checknan(md,fields);
    … …  
    340340
    341341        %VELOCITIES MELTING AND ACCUMULATION
    342         fields={'vx','vy','accumulation','melting'};
     342        fields={'vx','vy','accumulation_rate','melting_rate'};
    343343        checksize(md,fields,[md.numberofgrids 1]);
    344344        checknan(md,fields);
    … …  
    354354
    355355        %VELOCITIES MELTING AND ACCUMULATION
    356         fields={'vx','vy','accumulation','melting','dhdt'};
     356        fields={'vx','vy','accumulation_rate','melting_rate','dhdt'};
    357357        checksize(md,fields,[md.numberofgrids 1]);
    358358        checknan(md,fields);
    … …  
    368368
    369369        %VELOCITIES MELTING AND ACCUMULATION
    370         fields={'vx','vy','accumulation','melting'};
     370        fields={'vx','vy','accumulation_rate','melting_rate'};
    371371        checksize(md,fields,[md.numberofgrids 1]);
    372372        checknan(md,fields);
Note: See TracChangeset for help on using the changeset viewer.