Merge branch 'master' into cvm

This commit is contained in:
graham
2011-02-18 16:30:05 +00:00
5 changed files with 10 additions and 10 deletions

View File

@ -105,8 +105,8 @@ int main()
Z[Count] = Phi + 1.0; Z[Count] = Phi + 1.0;
Count++; Count++;
X[Count] = -X[Count - 1]; X[Count] = -X[Count - 1];
Y[Count] = -Y[Count - 1]; Y[Count] = -Y[Count - 1];
Z[Count] = -Z[Count - 1]; Z[Count] = -Z[Count - 1];
Count++; Count++;
@ -115,18 +115,18 @@ int main()
Z[Count] = Phi - 1.0; Z[Count] = Phi - 1.0;
Count++; Count++;
X[Count] = -X[Count - 1]; X[Count] = -X[Count - 1];
Y[Count] = -Y[Count - 1]; Y[Count] = -Y[Count - 1];
Z[Count] = -Z[Count - 1]; Z[Count] = -Z[Count - 1];
Count++; Count++;
} }
INTEGER4 IsDouble = 1; INTEGER4 IsDouble = 1;
I = TECDAT112(&NumPts, X, &IsDouble); I = TECDAT112(&NumPts, X, &IsDouble);
I = TECDAT112(&NumPts, Y, &IsDouble); I = TECDAT112(&NumPts, Y, &IsDouble);
I = TECDAT112(&NumPts, Z, &IsDouble); I = TECDAT112(&NumPts, Z, &IsDouble);
delete X; delete X;
delete Y; delete Y;
delete Z; delete Z;
@ -371,6 +371,6 @@ int main()
I = TECEND112(); I = TECEND112();
/* DOCEND */ /* DOCEND */
} }
return 0; return 0;
} }

View File

@ -38,7 +38,7 @@ cleaned=`$WM_PROJECT_DIR/bin/foamCleanPath "$PATH" "$WM_THIRD_PARTY_DIR/platform
# determine the cmake to be used # determine the cmake to be used
unset CMAKE_HOME unset CMAKE_HOME
for cmake in cmake-2.8.3 cmake-2.8.1 for cmake in cmake-2.8.4 cmake-2.8.3 cmake-2.8.1
do do
cmake=$WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER/$cmake cmake=$WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER/$cmake
if [ -r $cmake ] if [ -r $cmake ]

View File

@ -39,7 +39,7 @@ if ( $status == 0 ) setenv PATH $cleaned
# determine the cmake to be used # determine the cmake to be used
unsetenv CMAKE_HOME unsetenv CMAKE_HOME
foreach cmake ( cmake-2.8.3 cmake-2.8.1 ) foreach cmake ( cmake-2.8.4 cmake-2.8.3 cmake-2.8.1 )
set cmake=$WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER/$cmake set cmake=$WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER/$cmake
if ( -r $cmake ) then if ( -r $cmake ) then
setenv CMAKE_HOME $cmake setenv CMAKE_HOME $cmake

View File

@ -229,7 +229,7 @@ endif
# boost and CGAL # boost and CGAL
# ~~~~~~~~~~~~~~ # ~~~~~~~~~~~~~~
set boost_version=boost_1_42_0 set boost_version=boost_1_45_0
set cgal_version=CGAL-3.7 set cgal_version=CGAL-3.7
setenv BOOST_ARCH_PATH $WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER/$boost_version setenv BOOST_ARCH_PATH $WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER/$boost_version