Changeset 9182

Timestamp:

08/04/11 14:31:55 (14 years ago)

Author:

seroussi

Message:

some corrections for extrusion and checking of forcing fields

Location:

issm/trunk/src/m/model

Files:

• ismodelselfconsistent.m (modified) (3 diffs)
• project3d.m (modified) (1 diff)

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

@@ -466 +466 @@
                         checksize(md,fields,[md.numberofnodes 1]);
                         checknan(md,fields);
+
+                        %FORCINGS
+                        fields={'surface_mass_balance'};
+                        checkforcing(md,fields);
                         %}}}
                 case HydrologyAnalysisEnum,
@@ -484 +488 @@
                                 end
                         end
+
+                        %CHECK THAT SPCTEMPERATURE IS AN APPROPRIATE FORCING
+                        fields={'spctemperature'};
+                        checkforcing(md,fields);
 
                         %CHECK THAT WE ARE NOT FULLY CONSTRAINED
@@ -725 +733 @@
 
         eval(['field=md.' fieldname ';']);
-        checksize(md,{fieldname},[md.numberofnodes+1 NaN])
-
-        if any(field(end,:)~=sort(field(end,:))),
-                message(['model not consistent: model ' md.name ': ' fieldname ' columns should be chronological']);
-        end
-        if any(field(end,1:end-1)==field(end,2:end)),
-                message(['model not consistent: model ' md.name ': ' fieldname ' columns must not contain duplicate timesteps']);
+        if size(field,1)==md.numberofnodes,
+                if ~size(field,2)==1,
+                         message(['model not consistent: model ' md.name ': ' fieldname ' should have only one column as there are md.numberofnodes lines']);
+                end
+        elseif size(field,1)==md.numberofnodes+1
+                if any(field(end,:)~=sort(field(end,:))),
+                        message(['model not consistent: model ' md.name ': ' fieldname ' columns should be chronological']);
+                end
+                if any(field(end,1:end-1)==field(end,2:end)),
+                        message(['model not consistent: model ' md.name ': ' fieldname ' columns must not contain duplicate timesteps']);
+                end
+        else
+                 message(['model not consistent: model ' md.name ': ' fieldname ' should have md.numberofnodes or md.numberofnodes+1 lines']);
         end
 end

issm/trunk/src/m/model/project3d.m

@@ -34 +34 @@
 paddingvalue = getfieldvalue(options,'padding',0);  %0 by default
 
-if strcmpi(type,'node'),
+if length(vector2d)==1,
+        projected_vector=vector2d;
+elseif strcmpi(type,'node'),
 
         %Initialize 3d vector