Changeset 15655

Timestamp:

07/31/13 16:13:50 (12 years ago)

Author:

Mathieu Morlighem

Message:

CHG: change last line of forcing before it is marshalled

Location:

issm/trunk-jpl/src/m

Files:

• classes/flowequation.py (modified) (2 diffs)
• solve/WriteData.m (modified) (1 diff)
• solve/WriteData.py (modified) (1 diff)

issm/trunk-jpl/src/m/classes/flowequation.py

@@ -52 +52 @@
                 #}}}
         def setdefaultparameters(self): # {{{
+
+                #MINI element for FS by default
+                self.fe_FS=3
+
                 return self
         #}}}
@@ -64 +68 @@
                         md = checkfield(md,'flowequation.fe_SSA','numel',[1],'values',[0,1])
                         md = checkfield(md,'flowequation.fe_HO','numel',[1],'values',numpy.arange(0,3+1))
-                        md = checkfield(md,'flowequation.fe_FS','numel',[1],'values',[0])
+                        md = checkfield(md,'flowequation.fe_FS','numel',[1],'values',numpy.arange(0,3+1))
                         md = checkfield(md,'flowequation.borderSSA','size',[md.mesh.numberofvertices],'values',[0,1])
                         md = checkfield(md,'flowequation.borderHO','size',[md.mesh.numberofvertices],'values',[0,1])

issm/trunk-jpl/src/m/solve/WriteData.m

@@ -39 +39 @@
                 data  = scale.*data;
         end
+end
+if(size(data,1)==forcinglength),
+        yts=365.0*24.0*3600.0;
+        data(end,:) = data(end,:)*yts;
 end
 

issm/trunk-jpl/src/m/solve/WriteData.py

@@ -53 +53 @@
                 else:
                         data  = scale*data
+        if numpy.size(data) > 1 :
+                if numpy.size(data,0)==forcinglength:
+                        yts=365.0*24.0*3600.0
+                        data[-1,:] = yts*data[-1,:]
 
         #Step 1: write the enum to identify this record uniquely