Changeset 8313 for issm/trunk

Timestamp:

05/16/11 16:43:53 (14 years ago)

Author:

seroussi

Message:

added forcing_accumulation

Location:

issm/trunk/src/m/model

Files:

• extrude.m (modified) (1 diff)
• ismodelselfconsistent.m (modified) (2 diffs)
• marshall.m (modified) (1 diff)

issm/trunk/src/m/model/extrude.m

@@ -153 +153 @@
 md.dhdt=project3d(md,md.dhdt,'node');
 md.firn_layer=project3d(md,md.firn_layer,'node',md.numlayers);
+md.forcing_accumulation=[project3d(md,md.forcing_accumulation(1:end-1,:),'node');md.forcing_accumulation(end,:)];
 
 %results

issm/trunk/src/m/model/ismodelselfconsistent.m

@@ -91 +91 @@
 checksize(md,fields,[md.numberofelements 1]);
 %}}}
-%SIZE NUMBEROFGRIDS {{{1
+%SIZE NUMBEROFNODES {{{1
 fields={'x','y','z','rheology_B','drag_coefficient','melting_rate','accumulation_rate','surface','thickness','bed','nodeonbed','nodeonsurface'};
 checksize(md,fields,[md.numberofnodes 1]);
@@ -277 +277 @@
                 error(['model not consistent: model ' md.name ' cfl_coefficient field should between  0 and 1']);
         end
+
+        if(md.cfl_coefficient>1 | md.cfl_coefficient<0),
+                error(['model not consistent: model ' md.name ' cfl_coefficient field should between  0 and 1']);
+        end
+
+        %Check that forcing has length numberofnodes+1
+        fields={'forcing_accumulation'};
+        checklength(md,fields,md.numberofnodes+1)
+
+        %Check that forcing columns are properly ordered
+        if md.forcing_accumulation(end,:)~=sort(md.forcing_accumulation(end,:)),
+                error(['model not consistent: model ' md.name ' forcing_accumulation field columns should be chronological']);
+        end
+
+
 end
 %}}}

issm/trunk/src/m/model/marshall.m

@@ -93 +93 @@
 WriteData(fid,md.melting_rate,'Mat','melting_rate');
 WriteData(fid,md.melting_rate_correction_apply,'Integer','melting_rate_correction_apply');
+WriteData(fid,md.forcing_accumulation,'Mat','forcing_accumulation');
 if md.melting_rate_correction_apply,
         WriteData(fid,md.melting_rate_correction,'Mat','melting_rate_correction');