Changeset 18068 for issm/trunk-jpl/test/Par

Timestamp:

05/28/14 16:26:33 (11 years ago)

Author:

seroussi

Message:

NEW: reorganizing basal melting

Location:

issm/trunk-jpl/test/Par

Files:

• 79North.par (modified) (1 diff)
• 79North.py (modified) (1 diff)
• RoundSheetShelf.par (modified) (1 diff)
• RoundSheetShelf.py (modified) (1 diff)
• SquareEISMINT.par (modified) (1 diff)
• SquareEISMINT.py (modified) (1 diff)
• SquareSheetShelf.par (modified) (1 diff)
• SquareSheetShelf.py (modified) (1 diff)
• SquareShelfConstrained.par (modified) (1 diff)
• SquareShelfConstrained.py (modified) (1 diff)
• SquareThermal.par (modified) (1 diff)
• ValleyGlacierShelf.par (modified) (1 diff)

issm/trunk-jpl/test/Par/79North.par

@@ -28 +28 @@
 
 %Ice shelf melting and surface mass balance 
-md.basalforcings.melting_rate=zeros(md.mesh.numberofvertices,1);
-md.basalforcings.melting_rate(find(md.mask.groundedice_levelset<0.))=0.;
+md.basalforcings.floatingice_melting_rate=zeros(md.mesh.numberofvertices,1);
+md.basalforcings.floatingice_melting_rate(find(md.mask.groundedice_levelset<0.))=0.;
+md.basalforcings.groundedice_melting_rate=zeros(md.mesh.numberofvertices,1);
 md.surfaceforcings.mass_balance=15.*ones(md.mesh.numberofvertices,1);
 

issm/trunk-jpl/test/Par/79North.py

@@ -40 +40 @@
 
 #Ice shelf melting and surface mass balance 
-md.basalforcings.melting_rate=numpy.zeros((md.mesh.numberofvertices,1))
-md.basalforcings.melting_rate[numpy.nonzero(md.mask.groundedice_levelset<0.)[0]]=0.
+md.basalforcings.floatingice_melting_rate=numpy.zeros((md.mesh.numberofvertices,1))
+md.basalforcings.floatingice_melting_rate[numpy.nonzero(md.mask.groundedice_levelset<0.)[0]]=0.
+md.basalforcings.groundedice_melting_rate=numpy.zeros((md.mesh.numberofvertices,1))
 md.surfaceforcings.mass_balance=15*numpy.ones((md.mesh.numberofvertices,1))
 

issm/trunk-jpl/test/Par/RoundSheetShelf.par

@@ -63 +63 @@
 %Surface mass balance and basal melting
 md.surfaceforcings.mass_balance=-10.*ones(md.mesh.numberofvertices,1);
-md.basalforcings.melting_rate=zeros(md.mesh.numberofvertices,1);
-pos=find(md.mask.groundedice_levelset>0.);md.basalforcings.melting_rate(pos)=10.;
+md.basalforcings.groundedice_melting_rate=zeros(md.mesh.numberofvertices,1);
+pos=find(md.mask.groundedice_levelset>0.);md.basalforcings.groundedice_melting_rate(pos)=10.;
+md.basalforcings.floatingice_melting_rate=zeros(md.mesh.numberofvertices,1);
 md.basalforcings.geothermalflux=ones(md.mesh.numberofvertices,1);
 

issm/trunk-jpl/test/Par/RoundSheetShelf.py

@@ -70 +70 @@
 #Surface mass balance and basal melting
 md.surfaceforcings.mass_balance=-10.*numpy.ones((md.mesh.numberofvertices,1))
-md.basalforcings.melting_rate=numpy.zeros((md.mesh.numberofvertices,1))
+md.basalforcings.groundedice_melting_rate=numpy.zeros((md.mesh.numberofvertices,1))
 pos=numpy.nonzero(md.mask.groundedice_levelset>0.)[0]
-md.basalforcings.melting_rate[pos]=10.
+md.basalforcings.groudedice_melting_rate[pos]=10.
+md.basalforcings.floatingice_melting_rate=numpy.zeros((md.mesh.numberofvertices,1))
 md.basalforcings.geothermalflux=numpy.ones((md.mesh.numberofvertices,1))
 

issm/trunk-jpl/test/Par/SquareEISMINT.par

@@ -28 +28 @@
 disp('      creating surface mass balance');
 md.surfaceforcings.mass_balance=0.2*ones(md.mesh.numberofvertices,1); %0m/a
-md.basalforcings.melting_rate=0.*ones(md.mesh.numberofvertices,1); %0m/a
+md.basalforcings.floatingice_melting_rate=0.*ones(md.mesh.numberofvertices,1); %0m/a
+md.basalforcings.groundedice_melting_rate=0.*ones(md.mesh.numberofvertices,1); %0m/a
 
 disp('      boundary conditions');

issm/trunk-jpl/test/Par/SquareEISMINT.py

@@ -31 +31 @@
 print "      creating surface mass balance"
 md.surfaceforcings.mass_balance=0.2*numpy.ones((md.mesh.numberofvertices,1))    #0m/a
-md.basalforcings.melting_rate=0.*numpy.ones((md.mesh.numberofvertices,1))    #0m/a
+md.basalforcings.floatingice_melting_rate=0.*numpy.ones((md.mesh.numberofvertices,1))    #0m/a
+md.basalforcings.groundedice_melting_rate=0.*numpy.ones((md.mesh.numberofvertices,1))    #0m/a
 
 print "      boundary conditions"

issm/trunk-jpl/test/Par/SquareSheetShelf.par

@@ -34 +34 @@
 %Accumulation and melting
 md.surfaceforcings.mass_balance=10.*ones(md.mesh.numberofvertices,1);
-md.basalforcings.melting_rate=5.*ones(md.mesh.numberofvertices,1);
+md.basalforcings.groundedice_melting_rate=5.*ones(md.mesh.numberofvertices,1);
+md.basalforcings.floatingice_melting_rate=5.*ones(md.mesh.numberofvertices,1);
 
 %Friction

issm/trunk-jpl/test/Par/SquareSheetShelf.py

@@ -45 +45 @@
 #Accumulation and melting
 md.surfaceforcings.mass_balance=10.*numpy.ones((md.mesh.numberofvertices,1))
-md.basalforcings.melting_rate=5.*numpy.ones((md.mesh.numberofvertices,1))
+md.basalforcings.groundedice_melting_rate=5.*numpy.ones((md.mesh.numberofvertices,1))
+md.basalforcings.floatingice_melting_rate=5.*numpy.ones((md.mesh.numberofvertices,1))
 
 #Friction

issm/trunk-jpl/test/Par/SquareShelfConstrained.par

@@ -31 +31 @@
 %Surface mass balance and basal melting
 md.surfaceforcings.mass_balance=10*ones(md.mesh.numberofvertices,1);
-md.basalforcings.melting_rate=5*ones(md.mesh.numberofvertices,1);
+md.basalforcings.floatingice_melting_rate=5*ones(md.mesh.numberofvertices,1);
+md.basalforcings.groundedice_melting_rate=5*ones(md.mesh.numberofvertices,1);
 
 %Friction

issm/trunk-jpl/test/Par/SquareShelfConstrained.py

@@ -42 +42 @@
 #Surface mass balance and basal melting
 md.surfaceforcings.mass_balance=10.*numpy.ones((md.mesh.numberofvertices,1))
-md.basalforcings.melting_rate=5.*numpy.ones((md.mesh.numberofvertices,1))
+md.basalforcings.groundedice_melting_rate=5.*numpy.ones((md.mesh.numberofvertices,1))
+md.basalforcings.floatingice_melting_rate=5.*numpy.ones((md.mesh.numberofvertices,1))
 
 #Friction

issm/trunk-jpl/test/Par/SquareThermal.par

@@ -29 +29 @@
 disp('      creating surface mass balance');
 md.surfaceforcings.mass_balance=ones(md.mesh.numberofvertices,1)/md.constants.yts; %1m/a
-md.basalforcings.melting_rate=0.*ones(md.mesh.numberofvertices,1)/md.constants.yts; %1m/a
+md.basalforcings.groundedice_melting_rate=0.*ones(md.mesh.numberofvertices,1)/md.constants.yts; %1m/a
+md.basalforcings.floatingice_melting_rate=0.*ones(md.mesh.numberofvertices,1)/md.constants.yts; %1m/a
 
 %Deal with boundary conditions:

issm/trunk-jpl/test/Par/ValleyGlacierShelf.par

@@ -50 +50 @@
 %Surface mass balance and basal melting
 md.surfaceforcings.mass_balance = 0.3*ones(md.mesh.numberofvertices,1);
-md.basalforcings.melting_rate = md.surfaceforcings.mass_balance;
+md.basalforcings.floatingice_melting_rate = md.surfaceforcings.mass_balance;
+md.basalforcings.groundedice_melting_rate = md.surfaceforcings.mass_balance;
 
 %Friction