source: issm/oecreview/Archive/25834-26739/ISSM-26358-26359.diff@ 26740

Last change on this file since 26740 was 26740, checked in by Mathieu Morlighem, 3 years ago

CHG: added 25834-26739

File size: 1.8 KB
RevLine 
[26740]1Index: ../trunk-jpl/src/m/classes/SMBgemb.py
2===================================================================
3--- ../trunk-jpl/src/m/classes/SMBgemb.py (revision 26358)
4+++ ../trunk-jpl/src/m/classes/SMBgemb.py (revision 26359)
5@@ -21,15 +21,15 @@
6 """
7
8 #solution choices
9- self.isgraingrowth
10- self.isalbedo
11- self.isshortwave
12- self.isthermal
13- self.isaccumulation
14- self.ismelt
15- self.isdensification
16- self.isturbulentflux
17- self.isconstrainsurfaceT
18+ self.isgraingrowth = 0
19+ self.isalbedo = 0
20+ self.isshortwave = 0
21+ self.isthermal = 0
22+ self.isaccumulation = 0
23+ self.ismelt = 0
24+ self.isdensification = 0
25+ self.isturbulentflux = 0
26+ self.isconstrainsurfaceT = 0
27 self.isclimatology = np.nan
28
29 # Inputs
30Index: ../trunk-jpl/src/m/classes/dsl.py
31===================================================================
32--- ../trunk-jpl/src/m/classes/dsl.py (revision 26358)
33+++ ../trunk-jpl/src/m/classes/dsl.py (revision 26359)
34@@ -67,8 +67,6 @@
35 #}}}
36
37 def initialize(self, md): #{{{
38- print('sdasa')
39- exit()
40 if np.isnan(self.global_average_thermosteric_sea_level):
41 self.global_average_thermosteric_sea_level = np.array([0, 0]).reshape(-1, 1)
42 print(' no dsl.global_average_thermosteric_sea_level specified: transient values set at zero')
43Index: ../trunk-jpl/src/m/classes/matdamageice.py
44===================================================================
45--- ../trunk-jpl/src/m/classes/matdamageice.py (revision 26358)
46+++ ../trunk-jpl/src/m/classes/matdamageice.py (revision 26359)
47@@ -1,3 +1,5 @@
48+import numpy as np
49+
50 from fielddisplay import fielddisplay
51 from project3d import project3d
52 from checkfield import checkfield
Note: See TracBrowser for help on using the repository browser.