Changeset 18605

Timestamp:

10/08/14 14:38:53 (10 years ago)

Author:

Mathieu Morlighem

Message:

BUG: fixing python indentation

Location:

issm/trunk-jpl/src/m/classes

Files:

• initialization.py (modified) (2 diffs)
• inversion.m (modified) (5 diffs)
• inversionvalidation.m (modified) (1 diff)
• model.py (modified) (1 diff)

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

@@ -79 +79 @@
                 if HydrologyDCInefficientAnalysisEnum() in analyses:
                         if hasattr(md.hydrology,'hydrologydc'):
-                                md = checkfield(md,'fieldname','initialization.sediment_head','NaN',1,'size',[md.mesh.numberofvertices 1])
+                                md = checkfield(md,'fieldname','initialization.sediment_head','NaN',1,'size',[md.mesh.numberofvertices,1])
                 if HydrologyDCEfficientAnalysisEnum() in analyses:
                         if hasattr(md.hydrology,'hydrologydc'):
                                 if md.hydrology.isefficientlayer==1:
-                                        md = checkfield(md,'fieldname','initialization.epl_head','NaN',1,'size',[md.mesh.numberofvertices 1])
-                                        md = checkfield(md,'fieldname','initialization.epl_thickness','NaN',1,'size',[md.mesh.numberofvertices 1])
-                                
-
+                                        md = checkfield(md,'fieldname','initialization.epl_head','NaN',1,'size',[md.mesh.numberofvertices,1])
+                                        md = checkfield(md,'fieldname','initialization.epl_thickness','NaN',1,'size',[md.mesh.numberofvertices,1])
 
                 return md
@@ -102 +100 @@
                 WriteData(fid,'data',self.watercolumn,'format','DoubleMat','mattype',1,'enum',WatercolumnEnum())
                 WriteData(fid,'data',self.sediment_head,'format','DoubleMat','mattype',1,'enum',SedimentHeadEnum())
-                WriteData(fid,'data',self.epl_head,'format','DoubleMat','mattype',1,'enum',EplHeadEnum);
-                WriteData(fid,'data',self.epl_thickness,'format','DoubleMat','mattype',1,'enum',HydrologydcEplThicknessEnum);
+                WriteData(fid,'data',self.epl_head,'format','DoubleMat','mattype',1,'enum',EplHeadEnum())
+                WriteData(fid,'data',self.epl_thickness,'format','DoubleMat','mattype',1,'enum',HydrologydcEplThicknessEnum())
 
                 

issm/trunk-jpl/src/m/classes/inversion.m

@@ -23 +23 @@
                 vel_obs                     = NaN
                 thickness_obs               = NaN
+                surface_obs                 = NaN
         end
         methods
@@ -133 +134 @@
                         md = checkfield(md,'fieldname','inversion.control_parameters','cell',1,'values',...
                                 {'BalancethicknessThickeningRate' 'FrictionCoefficient' 'MaterialsRheologyBbar' 'DamageDbar' 'Vx' 'Vy' 'Thickness',...
-                                'BalancethicknessNu' 'BalancethicknessApparentMassbalance'});
+                                'BalancethicknessOmega' 'BalancethicknessApparentMassbalance'});
                         md = checkfield(md,'fieldname','inversion.nsteps','numel',1,'>=',0);
                         md = checkfield(md,'fieldname','inversion.maxiter_per_step','size',[md.inversion.nsteps 1],'>=',0);
@@ -177 +178 @@
                         fielddisplay(obj,'vel_obs','observed velocity magnitude [m/yr]');
                         fielddisplay(obj,'thickness_obs','observed thickness [m]');
+                        fielddisplay(obj,'surface_obs','observed surface elevation [m]');
                         disp('Available cost functions:');
                         disp('   101: SurfaceAbsVelMisfit');
@@ -213 +215 @@
                         end
                         WriteData(fid,'object',obj,'class','inversion','fieldname','thickness_obs','format','DoubleMat','mattype',mattype);
+                        WriteData(fid,'object',obj,'class','inversion','fieldname','surface_obs','format','DoubleMat','mattype',mattype);
 
 
@@ -239 +242 @@
                         pos=find(obj.cost_functions==505); data(pos)=ThicknessAcrossGradientEnum();
                         pos=find(obj.cost_functions==506); data(pos)=BalancethicknessMisfitEnum();
+                        pos=find(obj.cost_functions==601); data(pos)=SurfaceAbsMisfitEnum();
                         WriteData(fid,'data',data,'enum',InversionCostFunctionsEnum(),'format','DoubleMat','mattype',3);
                         WriteData(fid,'data',num_cost_functions,'enum',InversionNumCostFunctionsEnum(),'format','Integer');

issm/trunk-jpl/src/m/classes/inversionvalidation.m

@@ -18 +18 @@
                 vel_obs                     = NaN
                 thickness_obs               = NaN
-                surface_obs               = NaN
+                surface_obs                 = NaN
         end
         methods

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

@@ -660 +660 @@
                 md.masstransport.calvingrate=project3d(md,'vector',md.masstransport.calvingrate,'type','node')
 
-                # Hydrologydc variables
-                if hasattr(md.hydrology,'hydrologydc'):
-                        md.hydrology.spcsediment_head=project3d(md,'vector',md.hydrology.spcsediment_head,'type','node','layer',1)
-                        md.hydrology.spcepl_head=project3d(md,'vector',md.hydrology.spcepl_head,'type','node','layer',1)
-                        md.hydrology.mask_eplactive_node=project3d(md,'vector',md.hydrology.mask_eplactive_node,'type','node','layer',1)
-                        md.hydrology.sediment_transmitivity=project3d(md,'vector',md.hydrology.sediment_transmitivity,'type','node','layer',1)
-                        md.hydrology.basal_moulin_input=project3d(md,'vector',md.hydrology.basal_moulin_input,'type','node','layer',1)
-                if md.hydrology.isefficientlayer==1 :
-                        md.hydrology.spcepl_head=project3d(md,'vector',md.hydrology.spcepl_head,'type','node','layer',1)
+                # Hydrologydc variables
+                if hasattr(md.hydrology,'hydrologydc'):
+                        md.hydrology.spcsediment_head=project3d(md,'vector',md.hydrology.spcsediment_head,'type','node','layer',1)
+                        md.hydrology.spcepl_head=project3d(md,'vector',md.hydrology.spcepl_head,'type','node','layer',1)
+                        md.hydrology.mask_eplactive_node=project3d(md,'vector',md.hydrology.mask_eplactive_node,'type','node','layer',1)
+                        md.hydrology.sediment_transmitivity=project3d(md,'vector',md.hydrology.sediment_transmitivity,'type','node','layer',1)
+                        md.hydrology.basal_moulin_input=project3d(md,'vector',md.hydrology.basal_moulin_input,'type','node','layer',1)
+                        if md.hydrology.isefficientlayer==1 :
+                                md.hydrology.spcepl_head=project3d(md,'vector',md.hydrology.spcepl_head,'type','node','layer',1)
 
                 #connectivity