[issm-svn] r12296 - issm/trunk/src

[morlighe at issm.ess.uci.edu]

Author: morlighe
Date: 2012-05-29 09:57:04 -0700 (Tue, 29 May 2012)
New Revision: 12296

Modified:
   issm/trunk/src/c/modules/ModelProcessorx/Prognostic/UpdateElementsPrognostic.cpp
   issm/trunk/src/c/modules/PositiveDegreeDayx/PositiveDegreeDayx.cpp
   issm/trunk/src/c/modules/modules.h
   issm/trunk/src/m/classes/surfaceforcings.m
   issm/trunk/src/m/utils/BC/SetMarineIceSheetBC.m
Log:
minor

Modified: issm/trunk/src/c/modules/ModelProcessorx/Prognostic/UpdateElementsPrognostic.cpp
===================================================================
--- issm/trunk/src/c/modules/ModelProcessorx/Prognostic/UpdateElementsPrognostic.cpp	2012-05-29 16:56:03 UTC (rev 12295)
+++ issm/trunk/src/c/modules/ModelProcessorx/Prognostic/UpdateElementsPrognostic.cpp	2012-05-29 16:57:04 UTC (rev 12296)
@@ -45,8 +45,6 @@
 	iomodel->FetchDataToInput(elements,BathymetryEnum);
 	iomodel->FetchDataToInput(elements,MaskElementonfloatingiceEnum);
 	iomodel->FetchDataToInput(elements,MaskElementonwaterEnum);
-	iomodel->FetchDataToInput(elements,SurfaceforcingsPrecipitationEnum);
-	iomodel->FetchDataToInput(elements,SurfaceforcingsMassBalanceEnum);
 	iomodel->FetchDataToInput(elements,BasalforcingsMeltingRateEnum);
 	iomodel->FetchDataToInput(elements,BasalforcingsMeltingRateCorrectionEnum);
 	iomodel->FetchDataToInput(elements,VxEnum);
@@ -73,6 +71,10 @@
 	  iomodel->FetchDataToInput(elements,ThermalSpctemperatureEnum);
 	  iomodel->FetchDataToInput(elements,SurfaceforcingsPrecipitationEnum);
 	}
+	else{
+		iomodel->FetchDataToInput(elements,SurfaceforcingsMassBalanceEnum);
+	}
+
 	/*Free data: */
 	iomodel->DeleteData(1,MeshElementsEnum);
 }

Modified: issm/trunk/src/c/modules/PositiveDegreeDayx/PositiveDegreeDayx.cpp
===================================================================
--- issm/trunk/src/c/modules/PositiveDegreeDayx/PositiveDegreeDayx.cpp	2012-05-29 16:56:03 UTC (rev 12295)
+++ issm/trunk/src/c/modules/PositiveDegreeDayx/PositiveDegreeDayx.cpp	2012-05-29 16:57:04 UTC (rev 12296)
@@ -19,7 +19,7 @@
 //    ,NTIME) 
 //    monthly mean precip rate (m/yr water equivalent): vPrec(NA,NTIME)
 //    OUTPUT: mass-balance (m/yr ice): agd(NA)
-//    mean annual sssurface temperature (degrees C): Tsurf(NA)
+//    mean annual surface temperature (degrees C): Tsurf(NA)
 
   int    i, it, jj, itm;
   double DT = 0.02, sigfac, snormfac;

Modified: issm/trunk/src/c/modules/modules.h
===================================================================
--- issm/trunk/src/c/modules/modules.h	2012-05-29 16:56:03 UTC (rev 12295)
+++ issm/trunk/src/c/modules/modules.h	2012-05-29 16:57:04 UTC (rev 12296)
@@ -121,6 +121,4 @@
 #include "./UpdateDynamicConstraintsx/UpdateDynamicConstraintsx.h"
 #include "./VerticesDofx/VerticesDofx.h"
 #include "./VecMergex/VecMergex.h"
-
-
 #endif

Modified: issm/trunk/src/m/classes/surfaceforcings.m
===================================================================
--- issm/trunk/src/m/classes/surfaceforcings.m	2012-05-29 16:56:03 UTC (rev 12295)
+++ issm/trunk/src/m/classes/surfaceforcings.m	2012-05-29 16:57:04 UTC (rev 12296)
@@ -7,7 +7,7 @@
 	properties (SetAccess=public) 
 		precipitation = NaN;
 		mass_balance  = NaN;
-		ispdd = NaN;
+		ispdd = false;
 	end
 	methods
 		function obj = surfaceforcings(varargin) % {{{
@@ -20,8 +20,8 @@
 		end % }}}
 		function obj = setdefaultparameters(obj) % {{{
 		  
-		  %pdd methode not use in default mode
-		  obj.ispdd=0;
+		  %pdd method not used in default mode
+		  obj.ispdd=false;
 
 		end % }}}
 		function checkconsistency(obj,md,solution,analyses) % {{{

Modified: issm/trunk/src/m/utils/BC/SetMarineIceSheetBC.m
===================================================================
--- issm/trunk/src/m/utils/BC/SetMarineIceSheetBC.m	2012-05-29 16:56:03 UTC (rev 12295)
+++ issm/trunk/src/m/utils/BC/SetMarineIceSheetBC.m	2012-05-29 16:57:04 UTC (rev 12296)
@@ -57,7 +57,6 @@
 
 %segment on Neumann (Ice Front)
 pos=find(vertexonicefront(md.mesh.segments(:,1)) | vertexonicefront(md.mesh.segments(:,2)));
-
 if (md.mesh.dimension==2)
 	pressureload=md.mesh.segments(pos,:);
 elseif md.mesh.dimension==3
@@ -106,4 +105,3 @@
 else
 	disp('      no thermal boundary conditions created: no observed temperature found');
 end
-