Changeset 27347 for issm/trunk/src/m/classes/model.py

Timestamp:

10/27/22 11:39:37 (3 years ago)

Author:

Mathieu Morlighem

Message:

merged trunk-jpl and trunk for revision 27344

Location:

issm/trunk

Files:

• . (modified) (1 prop)
• src (modified) (1 prop)
• src/m/classes/model.py (modified) (2 diffs)

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

@@ -19 +19 @@
 from levelset import levelset
 from calving import calving
-from fourierlove import fourierlove
+from love import love
 from calvinglevermann import calvinglevermann
 #from calvingpi import calvingpi
@@ -271 +271 @@
         self.calving = calving()
         self.frontalforcings = frontalforcings()
-        self.love = fourierlove()
+        self.love = love()
         self.esa = esa()
         self.sampling = sampling()