Changeset 18202

Timestamp:

06/30/14 18:19:09 (11 years ago)

Author:

schlegel

Message:

CHG: update runmes for tutorials

Location:

issm/trunk-jpl/examples/Pig

Files:

• CheatSheet.m (modified) (2 diffs)
• Pig.par (modified) (1 diff)
• runme.m (modified) (7 diffs)

issm/trunk-jpl/examples/Pig/CheatSheet.m

@@ -1 +1 @@
 if perform(org,'ModelHO')
   % Load Model
-  md = loadmodel(org,'Control_drag');
+  mdHO = loadmodel('./Models/PIG.Control_drag');
   md.inversion.iscontrol=0;
 
@@ -15 +15 @@
 
   % Save Model
-  savemodel(org,md);
+  save ./Models/PIG.ModelHO md;
 end

issm/trunk-jpl/examples/Pig/Pig.par

@@ -129 +129 @@
 disp('   Set boundary conditions');
 md=SetMarineIceSheetBC(md);
-md.basalforcings.melting_rate = zeros(md.mesh.numberofvertices,1);
+md.basalforcings.floatingice_melting_rate = zeros(md.mesh.numberofvertices,1);
 md.thermal.spctemperature     = [md.initialization.temperature;1]; %impose observed temperature on surface
 md.masstransport.spcthickness    = NaN*ones(md.mesh.numberofvertices,1);

issm/trunk-jpl/examples/Pig/runme.m

@@ -1 +1 @@
 %Which steps to be performed
-steps=[2] ;
-
-name_prefix='PIG.';
+steps=[1:5] ;
+
 %Run Steps
-org=organizer('repository','./Models','prefix',name_prefix,'steps',steps);
 
 % {{{ Mesh Generation #1
-if perform(org,'Mesh_generation'),
-
-        md.miscellaneous.name=strcat(name_prefix,'Mesh_generation');
+if any(steps==1)
+
+        md.miscellaneous.name='PIG.Mesh_generation';
 
         %Mesh parameters
@@ -70 +68 @@
 
         % Convert x,y coordinates (Polar stereo) to lat/lon
-        [md.mesh.lat,md.mesh.long]=xy2ll(md.mesh.x,md.mesh.y,-1,39,71);
-        
-        % Save model
-        savemodel(org,md);
+        [md.mesh.lat,md.mesh.long]=xy2ll(md.mesh.x,md.mesh.y,-1);
+        
+        % Save model
+        save ./Models/PIG.Mesh_generation md;
 end
 % }}}
 
 % {{{ Masks #2
-if perform(org,'SetMask'), 
-        
-        md = loadmodel(org,'Mesh_generation');
+if any(steps==2) 
+
+        md = loadmodel('./Models/PIG.Mesh_generation'); 
 
         % Load SeaRISe dataset for Antarctica  
@@ -104 +102 @@
         
         % Save model
-        savemodel(org,md); 
+        save ./Models/PIG.SetMask md;
 end
 % }}}
 
 % {{{ Parameterization #3
-if perform(org,'Parameterization') 
-
-        md = loadmodel(org,'SetMask');
+if any(steps==3) 
+
+        md = loadmodel('./Models/PIG.SetMask');
         md = parameterize(md,'./Pig.par');
 
@@ -118 +116 @@
         
         % Save model
-        savemodel(org,md); 
+        save ./Models/PIG.Parameterization md;
 end
 % }}}
 
 % {{{ Control Method #4
-if perform(org,'Control_drag') 
-
-        md = loadmodel(org,'Parameterization');
+if any(steps==4)
+
+        md = loadmodel('./Models/PIG.Parameterization');
 
         % Control general
@@ -163 +161 @@
 
         % Save model
-        savemodel(org,md); 
+        save ./Models/PIG.Control_drag md;
 end
 % }}}
 
 % {{{ Plot #5
-if perform(org,'PlotSSA')
-
-        md = loadmodel(org,'Control_drag');
+if any(steps==5)
+
+        md = loadmodel('./Models/PIG.Control_drag');
 
         plotmodel(md,'nlines',2,'ncols',2,'unit#all','km','axis#all','equal',...
@@ -187 +185 @@
 
 % {{{ HO #6
-if perform(org,'ModelHO')
+if any(steps==6)
 
         % Load Model
@@ -205 +203 @@
 
 % {{{ Plot #7
-if perform(org,'PlotHO')
-
-        mdHO = loadmodel(org,'ModelHO'); 
-        mdSSA = loadmodel(org,'Control_drag');
+if any(steps==7)
+
+        mdHO = loadmodel('./Models/PIG.ModelHO');
+        mdSSA = loadmodel('./Models/PIG.Control_drag');
 
         basal=find(mdHO.mesh.vertexonbase);