Changeset 18506

Timestamp:

09/11/14 09:23:18 (11 years ago)

Author:

bdef

Message:

BUG: adding seaice field if nonexistent, collapsing Hydrology

File:

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

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

@@ -126 +126 @@
                                 end
                         end
+                        %2014 September 11
+                        if (size(setdiff(fieldnames(md),'seaice'),1)==size(fieldnames(md),1));
+                                md.seaice=seaice()
+            end
                 end% }}}
         end
@@ -205 +209 @@
                         if ~isnan(md.initialization.vz),md.initialization.vz=DepthAverage(md,md.initialization.vz);end;
                         if ~isnan(md.initialization.vel),md.initialization.vel=DepthAverage(md,md.initialization.vel);end;
-                        if ~isnan(md.initialization.temperature),md.initialization.temperature=DepthAverage(md,md.initialization.temperature);end;
+                        if ~isnan(md.initialization.temperature),       md.initialization.temperature=DepthAverage(md,md.initialization.temperature);end;
+                        if ~isnan(md.initialization.pressure),md.initialization.pressure=project2d(md,md.initialization.pressure,1);end;
 
                         %gia
@@ -230 +235 @@
                         md.thermal.spctemperature=project2d(md,md.thermal.spctemperature,md.mesh.numberoflayers);
 
+                        % Hydrologydc variables
+                        if isa(md.hydrology,'hydrologydc');
+                                md.hydrology.spcsediment_head=project2d(md,md.hydrology.spcsediment_head,1);
+                                md.hydrology.mask_eplactive_node=project2d(md,md.hydrology.mask_eplactive_node,1);
+                                md.hydrology.sediment_transmitivity=project2d(md,md.hydrology.sediment_transmitivity,1);
+                                md.hydrology.basal_moulin_input=project2d(md,md.hydrology.basal_moulin_input,1);
+                                if(md.hydrology.isefficientlayer==1)
+                                        md.hydrology.spcepl_head=project2d(md,md.hydrology.spcepl_head,1);
+                    end
+            end
+                        
                         %materials
                         md.materials.rheology_B=DepthAverage(md,md.materials.rheology_B);
@@ -782 +798 @@
                         if isa(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);
+                    end
             end
 
@@ -825 +843 @@
                         if ~isnan(md.initialization.pressure),
                                 md.initialization.pressure=md.constants.g*md.materials.rho_ice*(md.geometry.surface-md.mesh.z);
-                        end
+            end
 
                         %special for thermal modeling: