Changeset 17079 for issm/trunk-jpl/src/m/classes/model.py

Timestamp:

01/09/14 11:55:33 (11 years ago)

Author:

Mathieu Morlighem

Message:

NEW: deleted surfaceforcings class, now users need to decide what surfaceforcings class they want to use (SMB, SMBgradients, SMBpdd and more to come)

File:

• issm/trunk-jpl/src/m/classes/model.py (modified) (3 diffs)

issm/trunk-jpl/src/m/classes/model.py

@@ -60 +60 @@
                 self.geometry         = geometry()
                 self.constants        = constants()
-                self.surfaceforcings  = surfaceforcings()
+                self.surfaceforcings  = SMB()
                 self.basalforcings    = basalforcings()
                 self.materials        = matice()
@@ -576 +576 @@
                 md.inversion.vel_obs=project3d(md,'vector',md.inversion.vel_obs,'type','node')
                 md.inversion.thickness_obs=project3d(md,'vector',md.inversion.thickness_obs,'type','node')
-                md.surfaceforcings.mass_balance=project3d(md,'vector',md.surfaceforcings.mass_balance,'type','node')
-                md.surfaceforcings.precipitation=project3d(md,'vector',md.surfaceforcings.precipitation,'type','node')
+                md.surfaceforcings.extrude(md)
                 md.balancethickness.thickening_rate=project3d(md,'vector',md.balancethickness.thickening_rate,'type','node')
-                md.surfaceforcings.monthlytemperatures=project3d(md,'vector',md.surfaceforcings.monthlytemperatures,'type','node')
 
                 #results
@@ -662 +660 @@
                 if not numpy.any(numpy.isnan(md.qmu.partition)):
                         md.qmu.partition=project3d(md,'vector',numpy.transpose(md.qmu.partition),'type','node')
-                if(md.surfaceforcings.isdelta18o):
-                        md.surfaceforcings.temperatures_lgm=project3d(md,'vector',md.surfaceforcings.temperatures_lgm,'type','node')
-                if(md.surfaceforcings.isdelta18o):
-                        md.surfaceforcings.temperatures_presentday=project3d(md,'vector',md.surfaceforcings.temperatures_presentday,'type','node')
-                if(md.surfaceforcings.isdelta18o):
-                        md.surfaceforcings.precipitations_presentday=project3d(md,'vector',md.surfaceforcings.precipitations_presentday,'type','node')
 
                 #Put lithostatic pressure if there is an existing pressure