[cig-commits] r4969 - in long/3D/Gale/trunk: . src/PICellerator/libPICellerator/src src/StGermain/libStGermain/dynamic src/StgFEM/libStG_FEM/src src/StgFEM/plugins/StandardConditionFunctions src/Underworld/libUnderworld/src

[walter at geodynamics.org]

Author: walter
Date: 2006-10-13 02:08:46 -0700 (Fri, 13 Oct 2006)
New Revision: 4969

Modified:
   long/3D/Gale/trunk/
   long/3D/Gale/trunk/SConstruct.in
   long/3D/Gale/trunk/src/PICellerator/libPICellerator/src/SConscript
   long/3D/Gale/trunk/src/StGermain/libStGermain/dynamic/SConscript
   long/3D/Gale/trunk/src/StgFEM/libStG_FEM/src/SConscript
   long/3D/Gale/trunk/src/StgFEM/plugins/StandardConditionFunctions/StandardConditionFunctions.c
   long/3D/Gale/trunk/src/Underworld/libUnderworld/src/SConscript
Log:
 r889 at earth:  boo | 2006-10-13 02:08:34 -0700
 Don't set up stuff for building shared libraries if we are not actually going to build them.  This is needed on Windows where static and shared libraries are the same, and having two rules to build the same thing confuses scons.



Property changes on: long/3D/Gale/trunk
___________________________________________________________________
Name: svk:merge
   - 3a629746-de10-0410-b17b-fd6ecaaa963e:/cig:887
   + 3a629746-de10-0410-b17b-fd6ecaaa963e:/cig:889

Modified: long/3D/Gale/trunk/SConstruct.in
===================================================================
--- long/3D/Gale/trunk/SConstruct.in	2006-10-13 07:39:03 UTC (rev 4968)
+++ long/3D/Gale/trunk/SConstruct.in	2006-10-13 09:08:46 UTC (rev 4969)
@@ -39,6 +39,7 @@
 if not '@WITH_SHARED@':
     with_shared=False
     env.Append(CPPFLAGS=['-DNOSHARED'])
+Export('with_shared')
 
 # Add in the MPI paths
 for path in Split('@MPI_CPPPATH@'):

Modified: long/3D/Gale/trunk/src/PICellerator/libPICellerator/src/SConscript
===================================================================
--- long/3D/Gale/trunk/src/PICellerator/libPICellerator/src/SConscript	2006-10-13 07:39:03 UTC (rev 4968)
+++ long/3D/Gale/trunk/src/PICellerator/libPICellerator/src/SConscript	2006-10-13 09:08:46 UTC (rev 4969)
@@ -15,7 +15,8 @@
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
 # USA
 
-Import('env','shared_lib_objects','static_lib_objects','PICellerator_static_objects','header_groups')
+Import('env','shared_lib_objects','static_lib_objects',
+       'PICellerator_static_objects','header_groups','with_shared')
 
 local_env=env.Copy()
 local_env.Append(CPPPATH=["#/build/include/PICellerator"])
@@ -28,6 +29,7 @@
 c_files=Split("""Finalise.c
 Init.c""")
 
-shared_lib_objects+=[local_env.SharedLibrary('PICellerator',c_files)]
+if with_shared:
+    shared_lib_objects+=[local_env.SharedLibrary('PICellerator',c_files)]
 static_lib_objects=[local_env.StaticLibrary('PICellerator',[c_files+PICellerator_static_objects])]+static_lib_objects
 Export('static_lib_objects')

Modified: long/3D/Gale/trunk/src/StGermain/libStGermain/dynamic/SConscript
===================================================================
--- long/3D/Gale/trunk/src/StGermain/libStGermain/dynamic/SConscript	2006-10-13 07:39:03 UTC (rev 4968)
+++ long/3D/Gale/trunk/src/StGermain/libStGermain/dynamic/SConscript	2006-10-13 09:08:46 UTC (rev 4969)
@@ -16,12 +16,13 @@
 # USA
 
 Import('env','shared_lib_objects','static_lib_objects',
-       'StGermain_static_objects','libStGermain_shared_objects')
+       'StGermain_static_objects','libStGermain_shared_objects','with_shared')
 
 local_env=env.Copy()
 
 c_shared_files=libStGermain_shared_objects+["dummy.c"]
-shared_lib_objects+=[local_env.SharedLibrary('StGermain',c_shared_files)]
+if with_shared:
+    shared_lib_objects+=[local_env.SharedLibrary('StGermain',c_shared_files)]
 
 static_lib_objects=[local_env.StaticLibrary('StGermain',StGermain_static_objects)]+static_lib_objects
 Export('static_lib_objects')

Modified: long/3D/Gale/trunk/src/StgFEM/libStG_FEM/src/SConscript
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/libStG_FEM/src/SConscript	2006-10-13 07:39:03 UTC (rev 4968)
+++ long/3D/Gale/trunk/src/StgFEM/libStG_FEM/src/SConscript	2006-10-13 09:08:46 UTC (rev 4969)
@@ -16,7 +16,7 @@
 # USA
 
 Import('env','shared_lib_objects','static_lib_objects',
-       'StgFEM_static_objects','header_groups')
+       'StgFEM_static_objects','header_groups','with_shared')
 
 local_env=env.Copy()
 
@@ -27,6 +27,7 @@
 c_files=Split("""Finalise.c
 Init.c""")
 
-shared_lib_objects+=[local_env.SharedLibrary('StgFEM',c_files)]
+if with_shared:
+    shared_lib_objects+=[local_env.SharedLibrary('StgFEM',c_files)]
 static_lib_objects=[local_env.StaticLibrary('StgFEM',[c_files]+StgFEM_static_objects)] + static_lib_objects
 Export('static_lib_objects')

Modified: long/3D/Gale/trunk/src/StgFEM/plugins/StandardConditionFunctions/StandardConditionFunctions.c
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/plugins/StandardConditionFunctions/StandardConditionFunctions.c	2006-10-13 07:39:03 UTC (rev 4968)
+++ long/3D/Gale/trunk/src/StgFEM/plugins/StandardConditionFunctions/StandardConditionFunctions.c	2006-10-13 09:08:46 UTC (rev 4969)
@@ -711,6 +711,8 @@
 				*result = (offset - coord[dim])*grad;
 			else
 				*result = value;
+                        if(fabs(*result)>fabs(value))
+                          *result=value;
 		}
 		else
 			*result = 0;
@@ -721,6 +723,8 @@
 				*result = (coord[dim] - offset)*grad;
 			else
 				*result = value;
+                        if(fabs(*result)>fabs(value))
+                          *result=value;
 		}
 		else
 			*result = 0;

Modified: long/3D/Gale/trunk/src/Underworld/libUnderworld/src/SConscript
===================================================================
--- long/3D/Gale/trunk/src/Underworld/libUnderworld/src/SConscript	2006-10-13 07:39:03 UTC (rev 4968)
+++ long/3D/Gale/trunk/src/Underworld/libUnderworld/src/SConscript	2006-10-13 09:08:46 UTC (rev 4969)
@@ -16,7 +16,7 @@
 # USA
 
 Import('env','shared_lib_objects','static_lib_objects',
-       'Underworld_static_objects','header_groups')
+       'Underworld_static_objects','header_groups','with_shared')
 
 local_env=env.Copy()
 
@@ -28,7 +28,8 @@
 c_files=Split("""Finalise.c
 Init.c""")
 
-shared_lib_objects+=[local_env.SharedLibrary('Underworld',c_files)]
+if with_shared:
+    shared_lib_objects+=[local_env.SharedLibrary('Underworld',c_files)]
 static_lib_objects=[local_env.StaticLibrary('Underworld',c_files+Underworld_static_objects)]+static_lib_objects
 Export('static_lib_objects')