[issm-svn] r16562 - issm/trunk

[morlighe at issm.ess.uci.edu]

Author: morlighe
Date: 2013-10-28 14:54:49 -0700 (Mon, 28 Oct 2013)
New Revision: 16562

Added:
   issm/trunk/test/NightlyRun/test334.m
   issm/trunk/test/NightlyRun/test335.m
Modified:
   issm/trunk/src/m/classes/model.m
   issm/trunk/test/NightlyRun/IdToName.m
Log:
CHG: merging trunk and trunk-jpl

Modified: issm/trunk/src/m/classes/model.m
===================================================================
--- issm/trunk/src/m/classes/model.m	2013-10-28 21:48:09 UTC (rev 16561)
+++ issm/trunk/src/m/classes/model.m	2013-10-28 21:54:49 UTC (rev 16562)
@@ -679,7 +679,9 @@
 			if ~isnan(md.initialization.vel),md.initialization.vel=project3d(md,'vector',md.initialization.vel,'type','node');end;
 			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
 			md.mesh.elementonbed=project3d(md,'vector',ones(md.mesh.numberofelements2d,1),'type','element','layer',1);
@@ -714,6 +716,11 @@
 			md.damage.spcdamage=project3d(md,'vector',md.damage.spcdamage,'type','node');
 			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
 			md.mesh.elementconnectivity=repmat(md.mesh.elementconnectivity,numlayers-1,1);

Modified: issm/trunk/test/NightlyRun/IdToName.m
===================================================================
--- issm/trunk/test/NightlyRun/IdToName.m	2013-10-28 21:48:09 UTC (rev 16561)
+++ issm/trunk/test/NightlyRun/IdToName.m	2013-10-28 21:54:49 UTC (rev 16562)
@@ -103,6 +103,8 @@
 	case 331, name='SquareSheetConstrainedHydrologyShreve';
 	case 332, name='SquareSheetConstrainedHydrologyDC';
 	case 333, name='SquareSheetHydrologyDCTwoLayers';
+	case 334, name='SquareSheetConstrainedExtrudedHydrologyDC';
+	case 335, name='SquareSheetExtrudedHydrologyDCTwoLayers';
 	case 401, name='SquareSheetShelfStressSSA2d';
 	case 402, name='SquareSheetShelfStressSSA3d';
 	case 403, name='SquareSheetShelfStressHO';