[cig-commits] r13664 - long/3D/SNAC/trunk/Snac/plugins/temperature

[echoi at geodynamics.org]

Author: echoi
Date: 2008-12-12 12:10:47 -0800 (Fri, 12 Dec 2008)
New Revision: 13664

Modified:
   long/3D/SNAC/trunk/Snac/plugins/temperature/Remesh.c
   long/3D/SNAC/trunk/Snac/plugins/temperature/VariableConditions.c
Log:
1. Restored the original functionality of Top2BottomSweep funciton.
2. Removed unnecessary print lines.



Modified: long/3D/SNAC/trunk/Snac/plugins/temperature/Remesh.c
===================================================================
--- long/3D/SNAC/trunk/Snac/plugins/temperature/Remesh.c	2008-12-12 19:21:54 UTC (rev 13663)
+++ long/3D/SNAC/trunk/Snac/plugins/temperature/Remesh.c	2008-12-12 20:10:47 UTC (rev 13664)
@@ -84,7 +84,7 @@
 	}
 
 	/* Zero out on first addition */
-	fprintf(stderr,"before T=%e \t",dstNodeExt->temperature);
+/* 	fprintf(stderr,"before T=%e \t",dstNodeExt->temperature); */
 	dstNodeExt->temperature = 0;
 
 	for( tetNode_i = 0; tetNode_i < 4; tetNode_i++ ) {
@@ -95,7 +95,7 @@
 
 		dstNodeExt->temperature += srcNodeExt->temperature * weights[tetNode_i];
 	}
-	fprintf(stderr,"%e (%e %e %e %e)\t",srcNodeExt->temperature,
-		weights[0],weights[1],weights[2],weights[3]);
-	fprintf(stderr,"after T=%e \n",dstNodeExt->temperature);
+/* 	fprintf(stderr,"%e (%e %e %e %e)\t",srcNodeExt->temperature, */
+/* 		weights[0],weights[1],weights[2],weights[3]); */
+/* 	fprintf(stderr,"after T=%e \n",dstNodeExt->temperature); */
 }

Modified: long/3D/SNAC/trunk/Snac/plugins/temperature/VariableConditions.c
===================================================================
--- long/3D/SNAC/trunk/Snac/plugins/temperature/VariableConditions.c	2008-12-12 19:21:54 UTC (rev 13663)
+++ long/3D/SNAC/trunk/Snac/plugins/temperature/VariableConditions.c	2008-12-12 20:10:47 UTC (rev 13664)
@@ -65,14 +65,8 @@
 	node_gI = context->mesh->nodeL2G[node_lI];
 	RegularMeshUtils_Node_1DTo3D( decomp, node_gI, &ijk[0], &ijk[1], &ijk[2] );
 
-	if( ijk[1] == decomp->nodeGlobal3DCounts[1]-1)
-		(*temperature) = contextExt->topTemp;
-	else
-		(*temperature) = contextExt->bottomTemp;
+  	*temperature = contextExt->bottomTemp + (contextExt->topTemp - contextExt->bottomTemp) / (jCount - 1) * ijk[1];
 
-/*  	*temperature = contextExt->bottomTemp + (contextExt->topTemp - contextExt->bottomTemp) / (jCount - 1) * ijk[1]; */
-/*	if( (*temperature) > 700.0f ) (*temperature) = 700.0f; */
-
 	#if 0
 		printf( "Top: %8g, Bottom: %8g, node_I: %3u, node_gI: %3u, iijk: { %3u, %3u, %3u, }, *temperature: %g\n", contextExt->topTemp, contextExt->bottomTemp, node_lI, node_gI, ijk[0], ijk[1], ijk[2], *temperature );
 	#endif