Changeset 17071 for issm/trunk-jpl/src/m/boundaryconditions/SetIceSheetBC.py

Timestamp:

01/08/14 16:01:49 (11 years ago)

Author:

Mathieu Morlighem

Message:

NEW: initialize forcings by class itself instead of boundary condition method

File:

• issm/trunk-jpl/src/m/boundaryconditions/SetIceSheetBC.py (modified) (1 diff)

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

@@ -34 +34 @@
         #No ice front -> do nothing
 
-        #Create zeros basal melting rate and surface mass balance if not specified
-        if numpy.all(numpy.isnan(md.surfaceforcings.precipitation)) and (md.surfaceforcings.ispdd==1):
-                md.surfaceforcings.precipitation=numpy.zeros((md.mesh.numberofvertices,1))
-                print "      no surfaceforcings.precipitation specified: values set as zero"
-        if numpy.all(numpy.isnan(md.surfaceforcings.mass_balance)) and (md.surfaceforcings.ispdd==0):
-                md.surfaceforcings.mass_balance=numpy.zeros((md.mesh.numberofvertices,1))
-                print "      no surfaceforcings.mass_balance specified: values set as zero"
-        if numpy.all(numpy.isnan(md.basalforcings.melting_rate)):
-                md.basalforcings.melting_rate=numpy.zeros((md.mesh.numberofvertices,1))
-                print "      no basalforcings.melting_rate specified: values set as zero"
+        #Create zeros basalforcings and surfaceforcings
+        md.surfaceforcings.initialize(md)
+        md.basalforcings.initialize(md)
+
+        #Deal with other boundary conditions
         if numpy.all(numpy.isnan(md.balancethickness.thickening_rate)):
                 md.balancethickness.thickening_rate=numpy.zeros((md.mesh.numberofvertices,1))
                 print "      no balancethickness.thickening_rate specified: values set as zero"
-
         md.masstransport.spcthickness=float('nan')*numpy.ones((md.mesh.numberofvertices,1))
         md.balancethickness.spcthickness=float('nan')*numpy.ones((md.mesh.numberofvertices,1))