Changeset 13076

Timestamp:

08/17/12 10:53:42 (13 years ago)

Author:

jschierm

Message:

BUG: Fix Matlab changeset [12892] and apply corresponding Python change.

Location:

issm/trunk-jpl/src/m/boundaryconditions

Files:

• SetIceSheetBC.m (modified) (1 diff)
• SetIceShelfBC.m (modified) (1 diff)
• SetIceShelfBC.py (modified) (1 diff)
• SetMarineIceSheetBC.m (modified) (1 diff)

issm/trunk-jpl/src/m/boundaryconditions/SetIceSheetBC.m

@@ -34 +34 @@
 
 %Create zeros basal melting rate and surface mass balance if not specified
-if (isnan(md.surfaceforcings.precipitation) & (md.surfaceforcings.ispdd==1) & (md.surfaceforcings.ispdd==0)),
+if (isnan(md.surfaceforcings.precipitation) & (md.surfaceforcings.ispdd==1)),
         md.surfaceforcings.precipitation=zeros(md.mesh.numberofvertices,1);
         disp('      no surfaceforcings.precipitation specified: values set as zero');
 end
-if isnan(md.surfaceforcings.mass_balance) & (md.surfaceforcings.ispdd==0),
+if (isnan(md.surfaceforcings.mass_balance) & (md.surfaceforcings.ispdd==0)),
         md.surfaceforcings.mass_balance=zeros(md.mesh.numberofvertices,1);
         disp('      no surfaceforcings.mass_balance specified: values set as zero');

issm/trunk-jpl/src/m/boundaryconditions/SetIceShelfBC.m

@@ -65 +65 @@
 
 %Create zeros basalforcings and surfaceforcings
-if (isnan(md.surfaceforcings.precipitation) & (md.surfaceforcings.ispdd==1) & (md.surfaceforcings.ispdd==0)),
+if (isnan(md.surfaceforcings.precipitation) & (md.surfaceforcings.ispdd==1)),
         md.surfaceforcings.precipitation=zeros(md.mesh.numberofvertices,1);
         disp('      no surfaceforcings.precipitation specified: values set as zero');
 end
-if isnan(md.surfaceforcings.mass_balance) & (md.surfaceforcings.ispdd==0),
+if (isnan(md.surfaceforcings.mass_balance) & (md.surfaceforcings.ispdd==0)),
                 md.surfaceforcings.mass_balance=zeros(md.mesh.numberofvertices,1);
                 disp('      no surfaceforcings.mass_balance specified: values set as zero');

issm/trunk-jpl/src/m/boundaryconditions/SetIceShelfBC.py

@@ -69 +69 @@
 
         #Create zeros basalforcings and surfaceforcings
-        if numpy.all(numpy.isnan(md.surfaceforcings.precipitation)):
+        if numpy.all(numpy.isnan(md.surfaceforcings.precipitation)) and (md.surfaceforcings.ispdd==1):
                 md.surfaceforcings.precipitation=numpy.zeros(md.mesh.numberofvertices)
                 print '      no surfaceforcings.precipitation specified: values set as zero'
-        if numpy.all(numpy.isnan(md.surfaceforcings.mass_balance)):
+        if numpy.all(numpy.isnan(md.surfaceforcings.mass_balance)) and (md.surfaceforcings.ispdd==0):
                 md.surfaceforcings.mass_balance=numpy.zeros(md.mesh.numberofvertices)
                 print '      no surfaceforcings.mass_balance specified: values set as zero'

issm/trunk-jpl/src/m/boundaryconditions/SetMarineIceSheetBC.m

@@ -76 +76 @@
 
 %Create zeros basalforcings and surfaceforcings
-if (isnan(md.surfaceforcings.precipitation)& (md.surfaceforcings.ispdd==1) & (md.surfaceforcings.ispdd==0)),
+if (isnan(md.surfaceforcings.precipitation) & (md.surfaceforcings.ispdd==1)),
         md.surfaceforcings.precipitation=zeros(md.mesh.numberofvertices,1);
         disp('      no surfaceforcings.precipitation specified: values set as zero');
 end
-if isnan(md.surfaceforcings.mass_balance) & (md.surfaceforcings.ispdd==0),
+if (isnan(md.surfaceforcings.mass_balance) & (md.surfaceforcings.ispdd==0)),
         md.surfaceforcings.mass_balance=zeros(md.mesh.numberofvertices,1);
         disp('      no surfaceforcings.mass_balance specified: values set as zero');