Changeset 19262

Timestamp:

04/07/15 11:34:43 (10 years ago)

Author:

lemorzad

Message:

last line of pdd variables was not marshalled properly

Location:

issm/trunk-jpl/src/m/classes

Files:

• SMBd18opdd.m (modified) (1 diff)
• SMBpdd.m (modified) (2 diffs)
• clusters/acenet.m (modified) (2 diffs)

issm/trunk-jpl/src/m/classes/SMBd18opdd.m ¶

@@ -106 +106 @@
                         WriteData(fid,'object',self,'class','surfaceforcings','fieldname','sealev','format','DoubleMat','mattype',1);
 
+                        A=self.Tdiff;
+                        A(end,:) = A(end,:)*yts;
+                        WriteData(fid,'data',A,'enum',SurfaceforcingsTdiffEnum(),'format','DoubleMat','mattype',3);
+
                         if self.isd18opd
                                 WriteData(fid,'object',self,'class','surfaceforcings','fieldname','temperatures_presentday','format','DoubleMat','mattype',1);
                                 WriteData(fid,'object',self,'class','surfaceforcings','fieldname','precipitations_presentday','format','DoubleMat','mattype',1);
-                                WriteData(fid,'object',self,'class','surfaceforcings','fieldname','delta18o','format','DoubleMat','mattype',1);
+
+                                D=self.delta18o;
+                                D(end,:) = D(end,:)*yts;
+                                WriteData(fid,'data',D,'enum',SurfaceforcingsDelta18oEnum(),'format','DoubleMat','mattype',3);
+                                
                                 WriteData(fid,'object',self,'class','surfaceforcings','fieldname','dpermil','format','Double');
-                        end
+
+   end
                 end % }}}
         end

issm/trunk-jpl/src/m/classes/SMBpdd.m ¶

@@ -155 +155 @@
                                 WriteData(fid,'object',self,'class','surfaceforcings','fieldname','delta18o_surface','format','DoubleMat','mattype',1);
                                 WriteData(fid,'object',self,'class','surfaceforcings','fieldname','delta18o','format','DoubleMat','mattype',1);
-                                WriteData(fid,'object',self,'class','surfaceforcings','fieldname','Tdiff','format','DoubleMat','mattype',1);
-                                WriteData(fid,'object',self,'class','surfaceforcings','fieldname','sealev','format','DoubleMat','mattype',1);
+
+                                A=self.Tdiff
+                                A(end,:) = A(end,:)*yts;
+                                WriteData(fid,'data',A,'enum',SurfaceforcingsTdiffEnum(),'format','DoubleMat','mattype',3);
+                                
+                                C=self.sealev
+                                C(end,:) = C(end,:)*yts;                                
+                                WriteData(fid,'data',C,'enum',SurfaceforcingsSealevEnum(),'format','DoubleMat','mattype',3);
+
+                                % WriteData(fid,'object',self,'class','surfaceforcings','fieldname','Tdiff','format','DoubleMat','mattype',1);
+                                % WriteData(fid,'object',self,'class','surfaceforcings','fieldname','sealev','format','DoubleMat','mattype',1);
                         elseif self.ismungsm
                                 WriteData(fid,'object',self,'class','surfaceforcings','fieldname','temperatures_presentday','format','DoubleMat','mattype',1);
@@ -162 +171 @@
                                 WriteData(fid,'object',self,'class','surfaceforcings','fieldname','precipitations_presentday','format','DoubleMat','mattype',1);
                                 WriteData(fid,'object',self,'class','surfaceforcings','fieldname','precipitations_lgm','format','DoubleMat','mattype',1);
-                                WriteData(fid,'object',self,'class','surfaceforcings','fieldname','Pfac','format','DoubleMat','mattype',1);
-                                WriteData(fid,'object',self,'class','surfaceforcings','fieldname','Tdiff','format','DoubleMat','mattype',1);
-                                WriteData(fid,'object',self,'class','surfaceforcings','fieldname','sealev','format','DoubleMat','mattype',1);
+
+                                A=self.Tdiff;
+                                A(end,:) = A(end,:)*yts;
+                                WriteData(fid,'data',A,'enum',SurfaceforcingsTdiffEnum(),'format','DoubleMat','mattype',3);
+                                
+                                B=self.Pfac;
+                                B(end,:) = B(end,:)*yts;
+                                WriteData(fid,'data',B,'enum',SurfaceforcingsPfacEnum(),'format','DoubleMat','mattype',3);
+
+                                C=self.sealev;
+                                C(end,:) = C(end,:)*yts;                                
+                                WriteData(fid,'data',C,'enum',SurfaceforcingsSealevEnum(),'format','DoubleMat','mattype',3);
+                                
+                                % WriteData(fid,'object',self,'class','surfaceforcings','fieldname','Pfac','format','DoubleMat','mattype',1);
+                                % WriteData(fid,'object',self,'class','surfaceforcings','fieldname','Tdiff','format','DoubleMat','mattype',1);
+                                % WriteData(fid,'object',self,'class','surfaceforcings','fieldname','sealev','format','DoubleMat','mattype',1);
                         end
                 end % }}}

issm/trunk-jpl/src/m/classes/clusters/acenet.m ¶

@@ -68 +68 @@
                          fprintf(fid,'#$ -cwd\n');
           fprintf(fid,'#$ -N issm\n');
+          fprintf(fid,'#$ -l h_rt=00:15:00\n');
           % fprintf(fid,'#$ -l h_rt=25:00:0\n');
-          fprintf(fid,'#$ -l h_rt=47:59:00\n');
+          % fprintf(fid,'#$ -l h_rt=47:59:00\n');
           % fprintf(fid,'#$ -l h_rt=72:00:0\n');
-          % fprintf(fid,'#$ -l h_rt=96:00:0\n');
+          fprintf(fid,'#$ -l h_rt=96:00:0\n');
           % fprintf(fid,'#$ -l h_rt=336:00:0\n');
 
@@ -77 +78 @@
 
           % ---- Which queue to use ----
-          % fprintf(fid,'#$ -q tarasov.q\n'); %
-          %fprintf(fid,'#$ -q medium.q@*,short.q@*\n');
-          fprintf(fid,'#$ -q short.q@*\n');
+          %fprintf(fid,'#$ -q tarasov.q\n'); %
+          fprintf(fid,'#$ -q short.q@*,medium.q@*\n');
+          %fprintf(fid,'#$ -q medium.q@*\n');
+          %fprintf(fid,'#$ -q short.q@*\n');
 
           % ---- Which node are selected ----
-          %fprintf(fid,'#$ -l h=cl27*|cl28*|cl29*|cl30*|cl31*|cl320|cl267|cl268|cl269|cl338 \n');
-          % fprintf(fid,'#$ -l h=cl0* \n');
-          %fprintf(fid,'#$ -l h=cl338 \n');
+          % fprintf(fid,'#$ -l h=cl27*|cl28*|cl29*|cl30*|cl31*|cl320|cl267|cl268|cl269|cl338 \n');
+          %fprintf(fid,'#$ -l h=cl0* \n');
+          % fprintf(fid,'#$ -l h=cl338 \n');
           % Acenet nodes with 16cpus and more than 60G mem
           % fprintf(fid,'#$ -l h=cl001|cl002|cl003|cl004|cl005|cl006|cl007|cl008|cl009|cl010|cl011|cl012|cl021|cl022|cl023|cl024 \n');
   
           % ---- cpus on different nodes ----
-          fprintf(fid,'#$ -pe ompi %i\n',cluster.np); % To avoid green acenet that does not have InfiniBand
+           fprintf(fid,'#$ -pe ompi %i\n',cluster.np); % To avoid green acenet that does not have InfiniBand
           % fprintf(fid,'#$ -pe ompi* %i\n',cluster.np);
+          %fprintf(fid,'#$ -pe 4per* %i\n',cluster.np);
           % -------- All cpus in the same node --------          
           % fprintf(fid,'#$ -pe openmp %i\n',cluster.np);