Changeset 687 for branches/newmole/scripts

Timestamp:

12/05/06 21:35:06 (2 years ago)

Author:

peter

Message:

Merge changes from mainline upto r685.

This branch is now fully merged. Any remaining problems in doxygen, scripts
and tsuite should now be resolved.

Location:

branches/newmole/scripts

Files:

• dayslow_master.pl (modified) (1 diff)
• nightly_copy_files_original.pl (modified) (2 diffs)
• nightly_copy_source.pl (modified) (2 diffs)
• readme.txt (modified) (2 diffs)

branches/newmole/scripts/dayslow_master.pl

@@ -67 +67 @@
 #$exe_org = "$c:/projects/cloudy/trunk/release/trunk.exe";
 # use fast gcc exe
-$exe_org = "$c:/projects/cloudy/trunk/gcc/release/cloudy_gcc.exe";
+$exe_gcc = "$c:/projects/cloudy/trunk/gcc/release/cloudy_gcc.exe";
+$exe_icl = "$c:/projects/cloudy/trunk/icl/release/cloudy_icl.exe";
+$exe_org = $exe_icl;
 system("cp $exe_org $out_dir ");
 #$exe = "c:/projects/Cloudy/trunk/release/trunk.exe";
 #$exe = "$out_dir"."trunk.exe";
-$exe = "$out_dir"."cloudy_gcc.exe";
+$exe_gcc = "$out_dir"."cloudy_gcc.exe";
+$exe_icl = "$out_dir"."cloudy_icl.exe";
+$exe = $exe_icl;
 printf(ioLOG "exe is $exe\n");
 

branches/newmole/scripts/nightly_copy_files_original.pl

@@ -101 +101 @@
 print(" moved to unix target source directory, about to delete all files\n");
 # remove the old source files
-unlink <*.c> ; 
+unlink <*.cpp> ; 
 #
 # --------
@@ -499 +499 @@
         copy( $input  , $output);
 }
-# we have now clobbered the path.c file, and need to copy a valid one from 1 dir up
-copy( "u:/cloudy/trunk/path.c" , "u:/cloudy/trunk/source/path.c" );
+# we have now clobbered the path.cpp file, and need to copy a valid one from 1 dir up
+copy( "u:/cloudy/trunk/path.cpp" , "u:/cloudy/trunk/source/path.cpp" );
 
 # move to pc unix tsuite directory

branches/newmole/scripts/nightly_copy_source.pl

@@ -63 +63 @@
 print(" moved to unix target source directory, about to delete all files\n");
 # remove the old source files
-unlink <*.c> ; 
+unlink <*.cpp> ; 
 
 
@@ -109 +109 @@
         copy( $input  , $output);
 }
-# we have now clobbered the path.c file, and need to copy a valid one from 1 dir up
+# we have now clobbered the path.cpp file, and need to copy a valid one from 1 dir up
 # so that version on unix cluster will compile & execute
-copy( "u:/cloudy/trunk/path.c" , "u:/cloudy/trunk/source/path.c" );
+copy( "u:/cloudy/trunk/path.cpp" , "u:/cloudy/trunk/source/path.cpp" );
 
 # ----------------------------------------------------------

branches/newmole/scripts/readme.txt

@@ -1 +1 @@
 ===============================================================
+NIGHTLY RUN OF TEST SUITE
+
+nightly_run_tsuite.pl - main script on my machine
+        starts first and must end last since launches checks
+        runs second group of sims (second slave does first, a point of confusion)
+        copies current.exe to tsuite directory for second script to use
+        creates log fil autorun.log
+        checks results
+        sends email announcing results
+        calls ir_extime.pl to track exec time
+        calls promote_last_good to promote last to last_good if all is ok
+        autorun.log
+
+nightly_runL_tsuite_part2.pl  - second script
+        runs first block sims across network
+        uses current.exe in tsuite dir which was copied there by first script
+        autorun2.log log file in auto directory
+
+LOAD LEVELING
+$nmod_calc - var controls number of sims in each half
+        adjust in each script to get load leveling right
+        decrease value to have master end later
+
+===============================================================
+
 NIGHTLY COPY OF FILES ACROSS CLUSTER
 nightly_copy_files.pl
@@ -19 +44 @@
 
 ===============================================================
-NIGHTLY RUN OF TEST SUITE
-main script on my machine
-        nightly_run_tsuite.pl - script name
-        starts first and must end last since launches checks
-        runs second group of sims (slabe does first, a point of confusion)
-        copies current.exe to tsuite directory for second script to use
-        creates log fil autorun.log
-        checks results
-        sends email announcing results
-        calls ir_extime.pl to track exec time
-        calls promote_last_good to promote last to last_good if all is ok
-
-second script
-        nightly_runL_tsuite_part2.pl  <- runs first block sims across network
-        uses current.exe in tsuite dir which was copied there by first script
-        log file is autorun2.log in auto directory
-
-$nmod_calc - var controls number of sims in each half
-        adjust in each script to get load leveling right
-
-===============================================================
 
 SLOW RUNS