Changeset 16562

Timestamp:

10/28/13 14:54:49 (11 years ago)

Author:

Mathieu Morlighem

Message:

CHG: merging trunk and trunk-jpl

Location:

issm/trunk

Files:

• src/m/classes/model.m (modified) (2 diffs)
• test/NightlyRun/IdToName.m (modified) (1 diff)
• test/NightlyRun/test334.m (added)
• test/NightlyRun/test335.m (added)

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

@@ -680 +680 @@
                         if ~isnan(md.initialization.temperature),md.initialization.temperature=project3d(md,'vector',md.initialization.temperature,'type','node');end;
                         if ~isnan(md.initialization.waterfraction),md.initialization.waterfraction=project3d(md,'vector',md.initialization.waterfraction,'type','node');end;
-            if ~isnan(md.initialization.watercolumn),md.initialization.watercolumn=project3d(md,'vector',md.initialization.watercolumn,'type','node','layer',1);end;
+      if ~isnan(md.initialization.watercolumn),md.initialization.watercolumn=project3d(md,'vector',md.initialization.watercolumn,'type','node','layer',1);end;
+      if ~isnan(md.initialization.sediment_head),md.initialization.sediment_head=project3d(md,'vector',md.initialization.sediment_head,'type','node','layer',1);end;
+      if ~isnan(md.initialization.epl_head),md.initialization.epl_head=project3d(md,'vector',md.initialization.epl_head,'type','node','layer',1);end;
 
                         %bedinfo and surface info
@@ -715 +717 @@
                         md.stressbalance.referential=project3d(md,'vector',md.stressbalance.referential,'type','node');
                         md.stressbalance.loadingforce=project3d(md,'vector',md.stressbalance.loadingforce,'type','node');
+                        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=project3d(md,'vector',md.hydrology.mask_eplactive,'type','node','layer',1);
+            end
 
                         %connectivity

issm/trunk/test/NightlyRun/IdToName.m

@@ -104 +104 @@
         case 332, name='SquareSheetConstrainedHydrologyDC';
         case 333, name='SquareSheetHydrologyDCTwoLayers';
+        case 334, name='SquareSheetConstrainedExtrudedHydrologyDC';
+        case 335, name='SquareSheetExtrudedHydrologyDCTwoLayers';
         case 401, name='SquareSheetShelfStressSSA2d';
         case 402, name='SquareSheetShelfStressSSA3d';