Changeset 19628

Timestamp:

10/13/15 14:32:31 (9 years ago)

Author:

schlegel

Message:

CHG: need to update smb

Location:

issm/trunk-jpl/examples/Greenland

Files:

• Greenland.par (modified) (1 diff)
• runme.m (modified) (7 diffs)

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

@@ -40 +40 @@
 
 disp('   Interpolating surface mass balance');
-md.surfaceforcings.mass_balance=InterpFromGridToMesh(x1,y1,smb,md.mesh.x,md.mesh.y,0);
-md.surfaceforcings.mass_balance=md.surfaceforcings.mass_balance*md.materials.rho_water/md.materials.rho_ice;
+md.smb.mass_balance=InterpFromGridToMesh(x1,y1,smb,md.mesh.x,md.mesh.y,0);
+md.smb.mass_balance=md.smb.mass_balance*md.materials.rho_water/md.materials.rho_ice;
 
 disp('   Construct basal friction parameters');

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

@@ -92 +92 @@
         smb = smb*md.materials.rho_freshwater/md.materials.rho_ice;
         smb = [smb smb smb-1.0];
-        md.surfaceforcings.mass_balance = [smb;1 10 20];
+        md.smb.mass_balance = [smb;1 10 20];
 
         %Set transient options, run for 20 years, saving every timestep
@@ -102 +102 @@
         md.inversion.iscontrol=0;
         md.transient.requested_outputs={'IceVolume','TotalSmb', ...
-                                             'SurfaceforcingsMassBalance'};
+                                             'SmbMassBalance'};
         md.verbose=verbose('solution',true,'module',true,'convergence',true);
 
@@ -124 +124 @@
         %Plot surface mass balance
         surfmb=[]; for i=1:100; surfmb=[surfmb ...
-                md.results.TransientSolution(i).SurfaceforcingsMassBalance]; end
+                md.results.TransientSolution(i).SmbMassBalance]; end
         subplot(3,1,1); plot([0.2:0.2:20],mean(surfmb)); title('Mean Surface mass balance');
 
@@ -181 +181 @@
         smb_mo = InterpFromMeshToMesh2d(index,x1(:),y1(:),smbmean(:),xi,yi);
         smb = smb_mo*12/1000*md.materials.rho_freshwater/md.materials.rho_ice;
-        md.surfaceforcings.mass_balance = [smb;1 ];
+        md.smb.mass_balance = [smb;1 ];
 
         %Set transient options, run for 20 years, saving every timestep
@@ -191 +191 @@
         md.inversion.iscontrol=0;
         md.transient.requested_outputs={'IceVolume','TotalSmb', ...
-                'SurfaceforcingsMassBalance'};
+                'SmbMassBalance'};
         md.verbose=verbose('solution',true,'module',true);
 
@@ -272 +272 @@
                 end
         end
-        md.surfaceforcings.mass_balance = ...
+        md.smb.mass_balance = ...
                 [smb*12/1000*md.materials.rho_freshwater/md.materials.rho_ice; ...
                 [1/24:1/12:length(years_of_simulation)]];
@@ -284 +284 @@
         md.inversion.iscontrol=0;
         md.transient.requested_outputs={'IceVolume','TotalSmb', ...
-                'SurfaceforcingsMassBalance'};
+                'SmbMassBalance'};
         md.verbose=verbose('solution',true,'module',true);