Changeset 13007

Timestamp:

08/13/12 10:27:25 (13 years ago)

Author:

Mathieu Morlighem

Message:

CHG: moving stuff around

Location:

issm/trunk-jpl/src/m

Files:

• contrib/hydrology (added)
• contrib/hydrology/effectivepressure.m (moved) (moved from issm/trunk-jpl/src/m/model/effectivepressure.m )
• contrib/massbalance/divergence.m (moved) (moved from issm/trunk-jpl/src/m/model/divergence.m )
• kml/kmlimagesc.m (moved) (moved from issm/trunk-jpl/src/m/model/kmlimagesc.m ) (2 diffs)
• meca/drivingstress.m (moved) (moved from issm/trunk-jpl/src/m/model/drivingstress.m )
• miscellaneous/MatlabFuncs.py (moved) (moved from issm/trunk-jpl/src/m/model/MatlabFuncs.py )
• model/EnumToModelField.m (deleted)
• model/extrusion (added)
• model/extrusion/DepthAverage.m (moved) (moved from issm/trunk-jpl/src/m/model/DepthAverage.m )
• model/extrusion/project2d.m (moved) (moved from issm/trunk-jpl/src/m/model/project2d.m )
• model/extrusion/project3d.m (moved) (moved from issm/trunk-jpl/src/m/model/project3d.m )
• model/graddetection.m (deleted)
• model/io (added)
• model/io/loadmodel.m (moved) (moved from issm/trunk-jpl/src/m/model/loadmodel.m )
• model/io/loadmodellist.m (moved) (moved from issm/trunk-jpl/src/m/model/loadmodellist.m )
• model/solve/MatlabProcessPatch.m (moved) (moved from issm/trunk-jpl/src/m/model/MatlabProcessPatch.m )
• model/solve/MatlabProcessPatch.py (moved) (moved from issm/trunk-jpl/src/m/model/MatlabProcessPatch.py )
• model/tres.m (modified) (1 diff)

issm/trunk-jpl/src/m/kml/kmlimagesc.m

@@ -4 +4 @@
 %   Usage:
 %      kmlimagesc(md,field,options);
+%
 %   Options: 
 %      'hemisphere': default +1;
@@ -63 +64 @@
 ge_output([fieldname '.kml'],[imagestr colorbarstr]);
 
-
 %now, create kmz file:
 system(['mv ' [fieldname '.kml'] ' doc.kml && zip ' [fieldname '.kmz'] ' doc.kml ' fieldname '.png && rm -rf doc.kml ' [fieldname '.png'] ]);

issm/trunk-jpl/src/m/model/tres.m

@@ -90 +90 @@
         error(['tres error message: analysis ' string ' not supported yet!']);
 end
+end 
+function string=EnumToModelField(enum) % {{{
+        %ENUMTOMODELFIELD - output string of model field associated to enum
+        %
+        %   Usage:
+        %      string=EnumToModelField(enum)
+
+        disp('Warning: EnumToModelField is deprecated, it cannot work with new model definition. This function will be removed in the future');
+
+        switch enum,
+
+                case ThicknessEnum(), string='thickness'; return
+                case FrictionCoefficientEnum(), string='drag_coefficient'; return
+                case MaterialsRheologyBEnum(), string='rheology_B'; return
+                case MaterialsRheologyBbarEnum(), string='rheology_B'; return
+                case BalancethicknessThickeningRateEnum: string='dhdt'; return
+                case VxEnum(), string='vx'; return
+                case InversionVxObsEnum(), string='vx_obs'; return
+                case VyEnum(), string='vy'; return
+                case InversionVyObsEnum(), string='vy_obs'; return
+                case BasalforcingsMeltingRateEnum(), string='basal_melting_rate'; return
+                case SurfaceforcingsAccumulationRateEnum(), string='surface_accumulation_rate'; return
+                case SurfaceforcingsAblationRateEnum(), string='surface_ablation_rate'; return
+                case SurfaceforcingsMassBalanceEnum(), string='surface_mass_balance'; return
+                otherwise, error(['Enum ' num2str(enum)  ' not found associated to any model field']);
+
+                end
+        end % }}}