Context Navigation

ISSM-24735-24736.diff@ 25834

Last change on this file since 25834 was 25834, checked in by Mathieu Morlighem, 4 years ago
CHG: added 24684-25833
File size: 1.2 KB

Rev	Line
[25834]	1	Index: ../trunk-jpl/test/Archives/Archive253.arch
	2	===================================================================
	3	Cannot display: file marked as a binary type.
	4	svn:mime-type = application/octet-stream
	5	Index: ../trunk-jpl/src/c/modules/SurfaceMassBalancex/Gembx.cpp
	6	===================================================================
	7	--- ../trunk-jpl/src/c/modules/SurfaceMassBalancex/Gembx.cpp (revision 24735)
	8	+++ ../trunk-jpl/src/c/modules/SurfaceMassBalancex/Gembx.cpp (revision 24736)
	9	@@ -936,8 +936,8 @@
	10	// new grid point temperature
	11
	12	//SW penetrates surface
	13	- for(int j=0;j<m;j++) T[j] = T[j] + dT_sw[j];
	14	- T[0] = T[0] + dT_dlw + dT_ulw + dT_turb;
	15	+ if(!isconstrainsurfaceT) for(int j=0;j<m;j++) T[j] = T[j] + dT_sw[j];
	16	+ if(!isconstrainsurfaceT) T[0] = T[0] + dT_dlw + dT_ulw + dT_turb;
	17
	18	// temperature diffusion
	19	for(int j=0;j<m;j++) T0[1+j]=T[j];
	20	@@ -946,7 +946,7 @@
	21	for(int j=0;j<m;j++) T[j] = (Np[j] * T[j]) + (Nu[j] * Tu[j]) + (Nd[j] * Td[j]);
	22
	23	// calculate cumulative evaporation (+)/condensation(-)
	24	- EC = EC + (EC_day/dts)*dt;
	25	+ if(!isconstrainsurfaceT) EC = EC + (EC_day/dts)*dt;
	26
	27	/* CHECK FOR ENERGY (E) CONSERVATION [UNITS: J]
	28	//energy flux across lower boundary (energy supplied by underling ice)

Note: See TracBrowser for help on using the repository browser.