Changeset 8369

Timestamp:

05/20/11 07:33:26 (14 years ago)

Author:

Mathieu Morlighem

Message:

trunk: fixed marshalling and extrusion of forcings

Location:

issm/trunk/src/m/model

Files:

• extrude.m (modified) (1 diff)
• 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);
-if ~isnan(md.forcing_accumulation), md.forcing_accumulation=[project3d(md,md.forcing_accumulation(1:end-1,:),'node');md.forcing_accumulation(end,:)]; end
+if ~isempty(md.forcings),
+        forcingnames=fieldnames(md.forcings);
+        numforcings=length(md.forcings);
+        for i=1:numforcings
+                forcing=md.forcings.(forcingnames{i});
+                md.forcings.(forcingnames{i})=[project3d(md,forcing(1:end-1,:),'node');forcing(end,:)];
+        end
+end
 
 %results

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

@@ -95 +95 @@
 
 %deal with forcings
-if ~isnans(md.forcings),
+if ~isempty(md.forcings),
         forcingnames=fieldnames(md.forcings);
         numforcings=length(forcingnames);
         forcingtypes=zeros(numforcings,1);
         for i=1:numforcings,
-                forcingtypes(i)=StringToEnum(forcingnames{i});
+                switch (forcingnames{i})
+                        case 'accumulation_rate'
+                                forcingtypes(i)=AccumulationRateEnum;
+                        case 'melting_rate'
+                                forcingtypes(i)=MeltingRateEnum;
+                        otherwise
+                                error(['forcing ' forcingnames{i} ' not supported yet']);
+                end
         end
         WriteData(fid,numforcings,'Integer','numforcings');