Changeset 19860
- Timestamp:
- 12/05/15 22:58:08 (9 years ago)
- Location:
- issm/trunk-jpl/src/m/classes
- Files:
-
- 34 edited
Legend:
- Unmodified
- Added
- Removed
-
issm/trunk-jpl/src/m/classes/SMBforcing.js
r19793 r19860 7 7 //methods 8 8 this.setdefaultparameters = function(){// {{{ 9 this.requested_outputs=['default']; 9 10 } // }}} 10 11 this.disp = function(){ // {{{ … … 46 47 47 48 //process requested outputs 48 outputs = this.requested_outputs;49 var outputs = this.requested_outputs.slice(); 49 50 for (var i=0;i<outputs.length;i++){ 50 51 if (outputs[i] == 'default') { 51 52 outputs.splice(i,1); 52 newoutputs=this.defaultoutputs(md);53 var newoutputs=this.defaultoutputs(md); 53 54 for (var j=0;j<newoutputs.length;j++) outputs.push(newoutputs[j]); 54 55 } … … 57 58 58 59 }//}}} 60 this.fix=function() { //{{{ 61 }//}}} 59 62 //properties 60 63 this.mass_balance = NaN; -
issm/trunk-jpl/src/m/classes/autodiff.js
r19791 r19860 209 209 //}}} 210 210 }//}}} 211 this.fix=function() { //{{{ 212 this.obufsize=NullFix(this.obufsize,NaN); 213 this.lbufsize=NullFix(this.lbufsize,NaN); 214 this.cbufsize=NullFix(this.cbufsize,NaN); 215 this.tbufsize=NullFix(this.tbufsize,NaN); 216 this.gcTriggerRatio=NullFix(this.gcTriggerRatio,NaN); 217 this.gcTriggerMaxSize=NullFix(this.gcTriggerMaxSize,NaN); 218 }//}}} 211 219 //properties 212 220 // {{{ 213 221 this.isautodiff = false; 214 this.dependents = {};215 this.independents = {};222 this.dependents = []; 223 this.independents = []; 216 224 this.driver = 'fos_forward'; 217 225 this.obufsize = NaN; -
issm/trunk-jpl/src/m/classes/balancethickness.js
r19793 r19860 17 17 fielddisplay(this,'spcthickness','thickness constraints (NaN means no constraint) [m]'); 18 18 fielddisplay(this,'thickening_rate','ice thickening rate used in the mass conservation (dh/dt) [m/yr]'); 19 fielddisplay(this, "stabilization','0: None, 1: SU, 2: SSA's artificial diffusivity, 3:DG");19 fielddisplay(this,'stabilization',"0: None, 1: SU, 2: SSA's artificial diffusivity, 3:DG"); 20 20 21 21 }// }}} … … 43 43 44 44 }//}}} 45 this.fix=function() { //{{{ 46 this.spcthickness=NullFix(this.spcthickness,NaN); 47 this.thicknening_rate=NullFix(this.thicknening_rate,NaN); 48 this.omega=NullFix(this.omega,NaN); 49 }//}}} 45 50 //properties 46 51 // {{{ -
issm/trunk-jpl/src/m/classes/basalforcings.js
r19828 r19860 63 63 WriteData(fid,'object',this,'fieldname','geothermalflux','format','DoubleMat','mattype',1,'timeserieslength',md.mesh.numberofvertices+1); 64 64 }//}}} 65 this.fix=function() { //{{{ 66 }//}}} 65 67 //properties 66 68 //{{{ -
issm/trunk-jpl/src/m/classes/calving.js
r19828 r19860 34 34 } //}}} 35 35 this.marshall=function(md,fid) { //{{{ 36 yts=365.0*24.0*3600.0;36 var yts=365.0*24.0*3600.0; 37 37 WriteData(fid,'enum',CalvingLawEnum(),'data',DefaultCalvingEnum(),'format','Integer'); 38 38 WriteData(fid,'enum',LevelsetStabilizationEnum(),'data',this.stabilization,'format','Integer'); … … 40 40 WriteData(fid,'object',this,'fieldname','calvingrate','format','DoubleMat','mattype',1,'timeserieslength',md.mesh.numberofvertices+1,'scale',1./yts); 41 41 WriteData(fid,'object',this,'fieldname','meltingrate','format','DoubleMat','mattype',1,'timeserieslength',md.mesh.numberofvertices+1,'scale',1./yts); 42 }//}}} 43 this.fix=function() { //{{{ 44 this.spclevelset=NullFix(this.spclevelset,NaN); 45 this.calvingrate=NullFix(this.calvingrate,NaN); 46 this.meltingrate=NullFix(this.meltingrate,NaN); 42 47 }//}}} 43 48 //properties -
issm/trunk-jpl/src/m/classes/constants.js
r19791 r19860 46 46 WriteData(fid,'object',this,'fieldname','referencetemperature','format','Double'); 47 47 }//}}} 48 this.fix=function() { //{{{ 49 }//}}} 48 50 //properties 49 51 // {{{ -
issm/trunk-jpl/src/m/classes/damage.js
r19793 r19860 115 115 116 116 //process requested outputs 117 outputs = this.requested_outputs;117 var outputs = this.requested_outputs; 118 118 for (var i=0;i<outputs.length;i++){ 119 119 if (outputs[i] == 'default') { … … 126 126 } 127 127 128 }//}}} 129 this.fix=function() { //{{{ 128 130 }//}}} 129 131 this.defaultoutputs = function(md){ //{{{ -
issm/trunk-jpl/src/m/classes/debug.js
r19791 r19860 23 23 WriteData(fid,'object',this,'fieldname','profiling','format','Boolean'); 24 24 }//}}} 25 this.fix=function() { //{{{ 26 }//}}} 27 25 28 //properties 26 29 // {{{ -
issm/trunk-jpl/src/m/classes/flowequation.js
r19828 r19860 112 112 113 113 //some optimization: 114 noneap=NoneApproximationEnum();115 siaap=SIAApproximationEnum();116 ssaap=SSAApproximationEnum();117 l1l2ap=L1L2ApproximationEnum();118 hoap=HOApproximationEnum();119 fsap=FSApproximationEnum();120 ssahoap=SSAHOApproximationEnum();121 hofsaap=HOFSApproximationEnum();122 ssafsap=SSAFSApproximationEnum();114 var noneap=NoneApproximationEnum(); 115 var siaap=SIAApproximationEnum(); 116 var ssaap=SSAApproximationEnum(); 117 var l1l2ap=L1L2ApproximationEnum(); 118 var hoap=HOApproximationEnum(); 119 var fsap=FSApproximationEnum(); 120 var ssahoap=SSAHOApproximationEnum(); 121 var hofsaap=HOFSApproximationEnum(); 122 var ssafsap=SSAFSApproximationEnum(); 123 123 124 124 for(var i=0;i<data.length;i++){ … … 150 150 151 151 }//}}} 152 this.fix=function() { //{{{ 153 }//}}} 152 154 //properties 153 155 // {{{ -
issm/trunk-jpl/src/m/classes/friction.js
r19793 r19860 40 40 41 41 }//}}} 42 this.fix=function() { //{{{ 43 }//}}} 42 44 //properties 43 45 //{{{ -
issm/trunk-jpl/src/m/classes/geometry.js
r19828 r19860 46 46 WriteData(fid,'object',this,'fieldname','hydrostatic_ratio','format','DoubleMat','mattype',1); 47 47 }//}}} 48 this.fix=function() { //{{{ 49 this.hydrostatic_ratio=NullFix(this.hydrostatic_ratio,NaN); 50 }//}}} 48 51 //properties 49 52 // {{{ -
issm/trunk-jpl/src/m/classes/gia.js
r19828 r19860 49 49 WriteData(fid,'object',this,'fieldname','cross_section_shape','format','Integer'); 50 50 }//}}} 51 this.fix=function() { //{{{ 52 this.mantle_viscosity=NullFix(this.mantle_viscosity,NaN); 53 this.lithosphere_thickness=NullFix(this.lithosphere_thickness,NaN); 54 }//}}} 51 55 //properties 52 56 // {{{ -
issm/trunk-jpl/src/m/classes/groundingline.js
r19791 r19860 43 43 WriteData(fid,'data',StringToEnum(this.migration),'enum',GroundinglineMigrationEnum(),'format','Integer'); 44 44 }//}}} 45 this.fix=function() { //{{{ 46 }//}}} 45 47 //properties 46 48 // {{{ -
issm/trunk-jpl/src/m/classes/hydrologyshreve.js
r19791 r19860 41 41 WriteData(fid,'object',this,'fieldname','stabilization','format','Double'); 42 42 }//}}} 43 this.fix=function() { //{{{ 44 this.spcwatercolumn=NullFix(this.spcwatercolumn,NaN); 45 }//}}} 43 46 //properties 44 47 // {{{ -
issm/trunk-jpl/src/m/classes/initialization.js
r19834 r19860 108 108 } 109 109 }//}}} 110 this.fix=function(md) { //{{{ 111 this.vx=FloatFix(this.vx,md.mesh.numberofvertices); 112 this.vy=FloatFix(this.vx,md.mesh.numberofvertices); 113 this.vy=FloatFix(this.vx,md.mesh.numberofvertices); 114 this.waterfraction=NullFix(this.waterfraction,NaN); 115 this.sediment_head=NullFix(this.sediment_head,NaN); 116 this.epl_head=NullFix(this.epl_head,NaN); 117 this.epl_thickness=NullFix(this.epl_thickness,NaN); 118 this.watercolumn=NullFix(this.watercolumn,NaN); 119 }//}}} 110 120 //properties 111 121 // {{{ -
issm/trunk-jpl/src/m/classes/inversion.js
r19791 r19860 156 156 WriteData(fid,'data',num_cost_functions,'enum',InversionNumCostFunctionsEnum(),'format','Integer'); 157 157 }//}}} 158 this.fix=function() { //{{{ 159 this.control_parameters=NullFix(this.control_parameters,NaN); 160 this.maxiter_per_step=NullFix(this.maxiter_per_step,NaN); 161 this.cost_functions=NullFix(this.cost_functions,NaN); 162 this.cost_functions_coefficients=NullFix(this.cost_functions_coefficients,NaN); 163 this.cost_function_threshold=NullFix(this.cost_function_threshold,NaN); 164 this.gradient_scaling=NullFix(this.gradient_scaling,NaN); 165 this.min_parameters=NullFix(this.min_parameters,NaN); 166 this.max_parameters=NullFix(this.max_parameters,NaN); 167 this.step_threshold=NullFix(this.step_threshold,NaN); 168 this.vx_obs=NullFix(this.vx_obs,NaN); 169 this.vy_obs=NullFix(this.vy_obs,NaN); 170 this.vz_obs=NullFix(this.vz_obs,NaN); 171 this.vel_obs=NullFix(this.vel_obs,NaN); 172 this.thickness_obs=NullFix(this.thickness_obs,NaN); 173 this.surface_obs=NullFix(this.surface_obs,NaN); 174 }//}}} 158 175 //properties 159 176 // {{{ -
issm/trunk-jpl/src/m/classes/mask.js
r19791 r19860 26 26 checkfield(md,'fieldname','mask.groundedice_levelset','size',[md.mesh.numberofvertices, 1]); 27 27 checkfield(md,'fieldname','mask.ice_levelset' ,'size',[md.mesh.numberofvertices, 1]); 28 isice=NewArrayFill(md.mesh.numberofvertices,0);28 var isice=NewArrayFill(md.mesh.numberofvertices,0); 29 29 for(var i=0;i<md.mesh.numberofvertices;i++)if(md.mask.ice_levelset[i]<=0)isice[i]=1; 30 30 if (ArraySum(isice)==0){ … … 35 35 } 36 36 37 icefront=NewArrayFill(md.mesh.numberofelements,0);37 var icefront=NewArrayFill(md.mesh.numberofelements,0); 38 38 for(var i=0;i<md.mesh.numberofelements;i++){ 39 39 for(var j=0;j<md.mesh.elements[0].length;j++){ … … 43 43 if ((ArrayMax(icefront)==3 & (md.mesh.elementtype() == 'Tria')) | (ArrayMax(icefront)==6 & md.mesh.elementtype() == 'Penta')){ 44 44 if (md.mesh.elementtype()=='Tria'){ 45 pos=ArrayFindEqual(icefront,3); numberemptyelements=pos.length;45 var pos=ArrayFindEqual(icefront,3); numberemptyelements=pos.length; 46 46 } 47 47 else if (md.mesh.elementtype() == 'Penta'){ 48 pos=ArrayFindEqual(icefront,6); numberemptyelements=pos.length;48 var pos=ArrayFindEqual(icefront,6); numberemptyelements=pos.length; 49 49 } 50 50 throw Error(sprintf(" %i have all nodes on ice front, change md.mask.ice_levelset to fix it",numberemptyelements)); … … 56 56 57 57 // get mask of vertices of elements with ice 58 isice= NewArrayFill(md.mesh.numberofvertices,0);58 var isice= NewArrayFill(md.mesh.numberofvertices,0); 59 59 for(var i=0;i<md.mesh.numberofvertices;i++)if(md.mask.ice_levelset[i]<=0)isice[i]=1; 60 60 61 v list = NewArrayFill(md.mesh.numberofvertices,0);61 var vlist = NewArrayFill(md.mesh.numberofvertices,0); 62 62 var pos=[]; 63 63 for(var i=0;i<md.mesh.numberofelements;i++){ … … 75 75 WriteData(fid,'data',vlist,'enum',IceMaskNodeActivationEnum(),'format','DoubleMat','mattype',1); 76 76 }//}}} 77 this.fix=function() { //{{{ 78 }//}}} 79 77 80 } -
issm/trunk-jpl/src/m/classes/mask.m
r19607 r19860 46 46 47 47 md = checkfield(md,'fieldname','mask.groundedice_levelset','size',[md.mesh.numberofvertices 1]); 48 md = checkfield(md,'fieldname','mask.ice_levelset' ,'size',[md.mesh.numberofvertices 1]);48 md = checkfield(md,'fieldname','mask.ice_levelset','forcing',1); 49 49 isice=(md.mask.ice_levelset<=0); 50 50 if sum(isice)==0, … … 56 56 icefront=sum(md.mask.ice_levelset(md.mesh.elements)==0,2); 57 57 if (max(icefront)==3 & strcmp(elementtype(md.mesh),'Tria')) | (max(icefront==6) & strcmp(elementtype(md.mesh),'Penta')), 58 if strcmp(elementtype(md.mesh),'Tria'), 59 numberemptyelements=length(find(icefront==3)); 60 elseif strcmp(elementtype(md.mesh),'Penta') 61 numberemptyelements=length(find(icefront==6)); 62 end 63 error([' ' num2str(numberemptyelements) ' have all nodes on ice front, change md.mask.ice_levelset to fix it']) 58 error('At least one element has all nodes on ice front, change md.mask.ice_levelset to fix it') 64 59 end 65 60 end % }}} … … 72 67 function marshall(self,md,fid) % {{{ 73 68 WriteData(fid,'object',self,'fieldname','groundedice_levelset','format','DoubleMat','mattype',1); 74 WriteData(fid,'object',self,'fieldname','ice_levelset','format','DoubleMat','mattype',1 );69 WriteData(fid,'object',self,'fieldname','ice_levelset','format','DoubleMat','mattype',1,'forcinglength',md.mesh.numberofvertices+1); 75 70 76 71 % get mask of vertices of elements with ice 77 isice=md.mask.ice_levelset<=0.; 78 vlist = zeros(md.mesh.numberofvertices,1); 79 if md.mesh.numberofelements==1, 80 pos=find(sum(isice(md.mesh.elements),1)>0); 72 if size(md.mask.ice_levelset,1)==md.mesh.numberofvertices, 73 isice=md.mask.ice_levelset<=0.; 74 vlist = zeros(md.mesh.numberofvertices,1); 75 pos=find(sum(isice(md.mesh.elements),2)>0); 76 vlist(md.mesh.elements(pos,:))=1; 77 WriteData(fid,'data',vlist,'enum',IceMaskNodeActivationEnum(),'format','DoubleMat','mattype',1); 81 78 else 79 isice=md.mask.ice_levelset(1:end-1,1)<=0.; 80 vlist = zeros(md.mesh.numberofvertices,1); 82 81 pos=find(sum(isice(md.mesh.elements),2)>0); 82 vlist(md.mesh.elements(pos,:))=1; 83 WriteData(fid,'data',vlist,'enum',IceMaskNodeActivationEnum(),'format','DoubleMat','mattype',1); 84 save temp vlist; 83 85 end 84 vlist(md.mesh.elements(pos,:))=1;85 WriteData(fid,'data',vlist,'enum',IceMaskNodeActivationEnum(),'format','DoubleMat','mattype',1);86 86 87 87 end % }}} -
issm/trunk-jpl/src/m/classes/masstransport.js
r19828 r19860 56 56 this.marshall=function(md,fid) { //{{{ 57 57 58 yts=365.*24.*3600.;58 var yts=365.*24.*3600.; 59 59 60 60 WriteData(fid,'object',this,'fieldname','spcthickness','format','DoubleMat','mattype',1,'timeserieslength',md.mesh.numberofvertices+1); … … 67 67 68 68 //process requested outputs 69 outputs = this.requested_outputs;69 var outputs = this.requested_outputs; 70 70 for (var i=0;i<outputs.length;i++){ 71 71 if (outputs[i] == 'default') { 72 72 outputs.splice(i,1); 73 newoutputs=this.defaultoutputs(md);73 var newoutputs=this.defaultoutputs(md); 74 74 for (var j=0;j<newoutputs.length;j++) outputs.push(newoutputs[j]); 75 75 } … … 80 80 return ['Thickness','Surface','Base']; 81 81 }//}}} 82 //properties 82 this.fix=function() { //{{{ 83 this.spcthickness=NullFix(this.spcthickness,NaN); 84 this.vertex_pairing=NullFix(this.vertex_pairing,NaN); 85 }//}}} 86 //properties 83 87 // {{{ 84 88 -
issm/trunk-jpl/src/m/classes/matice.js
r19791 r19860 120 120 WriteData(fid,'object',this,'class','materials','fieldname','mantle_density','format','Double','scale',10^3); 121 121 }//}}} 122 this.fix=function() { //{{{ 123 }//}}} 122 124 //properties 123 125 // {{{ -
issm/trunk-jpl/src/m/classes/mesh2d.js
r19819 r19860 93 93 WriteData(fid,'object',this,'class','mesh','fieldname','segments','format','DoubleMat','mattype',3); 94 94 }//}}} 95 this.fix=function() { //{{{ 96 //Transform objects into Float64Arrays: 97 this.x=FloatFix(this.x,this.numberofvertices); 98 this.y=FloatFix(this.y,this.numberofvertices); 99 this.edges=NullFix(this.edges,NaN); 100 this.vertexonboundary=FloatFix(this.vertexonboundary,this.numberofvertices); 101 this.segmentmarkers=FloatFix(this.segmentmarkers,this.segments.length); 102 this.extractedvertices=NullFix(this.extractedvertices,NaN); 103 this.extractedelements=NullFix(this.extractedelements,NaN); 104 this.lat=NullFix(this.lat,NaN); 105 this.long=NullFix(this.long,NaN); 106 }//}}} 95 107 96 108 //properties -
issm/trunk-jpl/src/m/classes/miscellaneous.js
r19791 r19860 27 27 WriteData(fid,'object',this,'fieldname','name','format','String'); 28 28 }//}}} 29 this.fix=function() { //{{{ 30 }//}}} 29 31 //properties 30 32 // {{{ 31 33 this.notes = ''; 32 34 this.name = ''; 33 this.dummy = {};35 this.dummy = []; 34 36 35 37 this.setdefaultparameters(); -
issm/trunk-jpl/src/m/classes/model.js
r19824 r19860 90 90 md.private.isconsistent=false; 91 91 } //}}} 92 this.fix = function(){ //{{{ 93 94 for (var field in this){ 95 96 //Some properties do not need to be fixed 97 if (field == 'results' | field =='radaroverlay' | field == 'toolkits' | field =='cluster' | field == 'flaim' | field == 'priv') continue; 98 99 //Check that current field is a class 100 if(typeof this[field] == 'function'){ 101 continue; 102 } 103 104 //Fix current object 105 this[field].fix(this); 106 } 107 108 } //}}} 92 109 //properties 93 110 // {{{ -
issm/trunk-jpl/src/m/classes/outputdefinition.js
r19793 r19860 29 29 this.marshall=function(md,fid) { //{{{ 30 30 31 enums=NewArrayFill(this.definitions.length,0);31 var enums=NewArrayFill(this.definitions.length,0); 32 32 for (var i=0;i<this.definitions.length;i++){ 33 33 this.definitions[i].marshall(md,fid); … … 39 39 WriteData(fid,'data',enums,'enum',OutputdefinitionListEnum(),'format','DoubleMat','mattype',1); 40 40 }//}}} 41 this.fix=function() { //{{{ 42 }//}}} 41 43 //properties 42 44 // {{{ -
issm/trunk-jpl/src/m/classes/qmu.js
r19793 r19860 118 118 WriteData(fid,'data',flag,'enum',QmuMassFluxSegmentsPresentEnum(),'format','Boolean'); 119 119 }//}}} 120 this.fix=function() { //{{{ 121 }//}}} 120 122 //properties 121 123 // {{{ 122 124 123 125 this.isdakota = 0; 124 this.variables = {};125 this.responses = {};126 this.method = {};127 this.params = {};128 this.results = {};126 this.variables = [] 127 this.responses = []; 128 this.method = [] 129 this.params = [] 130 this.results = [] 129 131 this.partition = NaN; 130 132 this.numberofpartitions = 0; 131 133 this.numberofresponses = 0; 132 this.variabledescriptors = {};133 this.responsedescriptors = {};134 this.variabledescriptors = [] 135 this.responsedescriptors = [] 134 136 this.mass_flux_profile_directory = NaN; 135 137 this.mass_flux_profiles = NaN; 136 this.mass_flux_segments = {};138 this.mass_flux_segments = [] 137 139 this.adjacency = NaN; 138 140 this.vertex_weight = NaN; -
issm/trunk-jpl/src/m/classes/rifts.js
r19791 r19860 17 17 }// }}} 18 18 this.checkconsistency = function(md,solution,analyses) { //{{{ 19 var numrifts; 19 20 if (isNaN(this.riftstruct) | this.riftstruct.length==0){ 20 21 numrifts=0; … … 47 48 this.marshall=function(md,fid) { //{{{ 48 49 50 var numrifts; 49 51 //Process rift info 50 52 if ((this.riftstruct.length==0) | isNaN(this.riftstruct)){ … … 61 63 // 2 for nodes + 2 for elements+ 2 for normals + 1 for length + 1 for fill + 1 for friction + 1 for fraction + 1 for fractionincrement + 1 for state. 62 64 data=Create2DArray(numpairs,12); 63 count=0;65 var count=0; 64 66 for (var i=0;i<numrifts;i++){ 65 67 numpairsforthisrift=this.riftstruct[i].penaltypairs.length; … … 77 79 WriteData(fid,'data',data,'enum',RiftsRiftstructEnum(),'format','DoubleMat','mattype',3); 78 80 }//}}} 81 this.fix=function() { //{{{ 82 this.riftstruct=NullFix(this.riftstruct,NaN); 83 this.riftproperties=NullFix(this.riftproperties,NaN); 84 }//}}} 79 85 //properties 80 86 // {{{ -
issm/trunk-jpl/src/m/classes/settings.js
r19791 r19860 31 31 this.disp= function(){// {{{ 32 32 console.log(sprintf(' settings class echo:')); 33 34 fielddisplay(this,'results_on_nodes','results are output for all the nodes of each element'); 35 fielddisplay(this,'io_gather','I/O gathering strategy for result outputs (default 1)'); 36 fielddisplay(this,'lowmem','is the memory limited ? (0 or 1)'); 37 fielddisplay(this,'output_frequency','frequency at which results are saved in all solutions with multiple time_steps'); 38 fielddisplay(this,'recording_frequency','frequency at which the runs are being recorded, allowing for a restart'); 39 fielddisplay(this,'waitonlock','maximum number of minutes to wait for batch results (NaN to deactivate)'); 40 fielddisplay(this,'upload_server','server hostname where model should be uploaded'); 41 fielddisplay(this,'upload_path','path on server where model should be uploaded'); 42 fielddisplay(this,'upload_login','server login'); 43 fielddisplay(this,'upload_port','port login (default is 0)'); 44 fielddisplay(this,'upload_filename','unique id generated when uploading the file to server'); 45 33 46 34 47 }// }}} … … 55 68 else WriteData(fid,'enum',SettingsWaitonlockEnum(),'data',false,'format','Boolean'); 56 69 }//}}} 70 this.fix=function() { //{{{ 71 }//}}} 57 72 //properties 58 73 // {{{ -
issm/trunk-jpl/src/m/classes/steadystate.js
r19793 r19860 51 51 52 52 //process requested outputs 53 outputs = this.requested_outputs;53 var outputs = this.requested_outputs; 54 54 for (var i=0;i<outputs.length;i++){ 55 55 if (outputs[i] == 'default') { 56 56 outputs.splice(i,1); 57 newoutputs=this.defaultoutputs(md);57 var newoutputs=this.defaultoutputs(md); 58 58 for (var j=0;j<newoutputs.length;j++) outputs.push(newoutputs[j]); 59 59 } … … 71 71 72 72 }//}}} 73 this.fix=function() { //{{{ 74 }//}}} 73 75 //properties 74 76 // {{{ -
issm/trunk-jpl/src/m/classes/stressbalance.js
r19793 r19860 140 140 WriteData(fid,'object',this,'class','stressbalance','fieldname','vertex_pairing','format','DoubleMat','mattype',3); 141 141 142 yts=365.0*24.0*3600.0;142 var yts=365.0*24.0*3600.0; 143 143 144 144 WriteData(fid,'object',this,'class','stressbalance','fieldname','spcvx','format','DoubleMat','mattype',1,'scale',1./yts,'timeserieslength',md.mesh.numberofvertices+1); … … 158 158 WriteData(fid,'object',this,'class','stressbalance','fieldname','referential','format','DoubleMat','mattype',1); 159 159 160 lx=NewArrayFill(this.loadingforce.length,0); for(var i=0;i<lx.length;i++)lx[i]=this.loadingforce[i][0];161 ly=NewArrayFill(this.loadingforce.length,0); for(var i=0;i<lx.length;i++)ly[i]=this.loadingforce[i][1];162 lz=NewArrayFill(this.loadingforce.length,0); for(var i=0;i<lx.length;i++)lz[i]=this.loadingforce[i][2];160 var lx=NewArrayFill(this.loadingforce.length,0); for(var i=0;i<lx.length;i++)lx[i]=this.loadingforce[i][0]; 161 var ly=NewArrayFill(this.loadingforce.length,0); for(var i=0;i<lx.length;i++)ly[i]=this.loadingforce[i][1]; 162 var lz=NewArrayFill(this.loadingforce.length,0); for(var i=0;i<lx.length;i++)lz[i]=this.loadingforce[i][2]; 163 163 164 164 WriteData(fid,'data',lx,'format','DoubleMat','mattype',1,'enum',LoadingforceXEnum()); … … 167 167 168 168 //process requested outputs 169 outputs = this.requested_outputs;169 var outputs = this.requested_outputs; 170 170 for (var i=0;i<outputs.length;i++){ 171 171 if (outputs[i] == 'default') { 172 172 outputs.splice(i,1); 173 newoutputs=this.defaultoutputs(md);173 var newoutputs=this.defaultoutputs(md); 174 174 for (var j=0;j<newoutputs.length;j++) outputs.push(newoutputs[j]); 175 175 } … … 185 185 return list; 186 186 187 }//}}} 188 this.fix=function() { //{{{ 189 this.abstol=NullFix(this.abstol,NaN); 190 this.rift_penalty_lock=NullFix(this.rift_penalty_lock,NaN); 191 this.referential=NullFix(this.referential,NaN); 192 this.loadingforce=NullFix(this.loadingforce,NaN); 193 this.spcvx=NullFix(this.spcvx,NaN); 194 this.spcvy=NullFix(this.spcvy,NaN); 195 this.spcvz=NullFix(this.spcvz,NaN); 196 if(this.vertex_pairing=[])this.vertex_pairing=NaN; 187 197 }//}}} 188 198 //properties -
issm/trunk-jpl/src/m/classes/thermal.js
r19828 r19860 45 45 fielddisplay(this,'penalty_factor','scaling exponent (default is 3)'); 46 46 fielddisplay(this,'isenthalpy','use an enthalpy formulation to include temperate ice (default is 0)'); 47 fielddisplay(this,'isdynamicbasalspc', ['enable dynamic setting of basal forcing. required for enthalpy formulation (default is 0)']);47 fielddisplay(this,'isdynamicbasalspc','enable dynamic setting of basal forcing. required for enthalpy formulation (default is 0)'); 48 48 fielddisplay(this,'requested_outputs','additional outputs requested'); 49 49 … … 96 96 97 97 //process requested outputs 98 outputs = this.requested_outputs;98 var outputs = this.requested_outputs; 99 99 for (var i=0;i<outputs.length;i++){ 100 100 if (outputs[i] == 'default') { 101 101 outputs.splice(i,1); 102 newoutputs=this.defaultoutputs(md);102 var newoutputs=this.defaultoutputs(md); 103 103 for (var j=0;j<newoutputs.length;j++) outputs.push(newoutputs[j]); 104 104 } … … 110 110 if (this.isenthalpy) return ['Enthalpy','Temperature','Waterfraction','Watercolumn','BasalforcingsGroundediceMeltingRate']; 111 111 else return ['Temperature','BasalforcingsGroundediceMeltingRate']; 112 }//}}} 113 this.fix=function() { //{{{ 114 this.spctemperature=NullFix(this.spctemperature,NaN); 112 115 }//}}} 113 116 //properties -
issm/trunk-jpl/src/m/classes/timestepping.js
r19857 r19860 21 21 }// }}} 22 22 this.disp= function(){// {{{ 23 24 var unit; 23 25 console.log(sprintf(' timestepping parameters:')); 24 25 26 unit = 'yr'; 26 27 fielddisplay(this,'start_time','simulation starting time ['+ unit + ']'); … … 61 62 62 63 }//}}} 64 this.fix=function() { //{{{ 65 }//}}} 63 66 //properties 64 67 // {{{ -
issm/trunk-jpl/src/m/classes/toolkits.js
r19793 r19860 62 62 //start writing options 63 63 for (var analysis in this){ 64 var options; 64 65 65 66 if(typeof this[analysis] == 'object') options=this[analysis]; else continue; … … 71 72 72 73 for(var optionname in options){ 73 optionvalue=options[optionname];74 var optionvalue=options[optionname]; 74 75 75 76 if (optionvalue.length==0){ -
issm/trunk-jpl/src/m/classes/trans.js
r19828 r19860 75 75 76 76 //process requested outputs 77 outputs = this.requested_outputs;77 var outputs = this.requested_outputs; 78 78 for (var i=0;i<outputs.length;i++){ 79 79 if (outputs[i] == 'default') { 80 80 outputs.splice(i,1); 81 newoutputs=this.defaultoutputs(md);81 var newoutputs=this.defaultoutputs(md); 82 82 for (var j=0;j<newoutputs.length;j++) outputs.push(newoutputs[j]); 83 83 } … … 88 88 if(this.issmb)return ['SmbMassBalance']; 89 89 else return []; 90 }//}}} 91 this.fix=function() { //{{{ 90 92 }//}}} 91 93 //properties -
issm/trunk-jpl/src/m/classes/verbose.js
r19793 r19860 63 63 64 64 } //}}} 65 this.fix=function() { //{{{ 66 }//}}} 65 67 //properties 66 68 // {{{
Note:
See TracChangeset
for help on using the changeset viewer.