can use original model now

[moebius2.git] / approxmodel

diff --git a/approxmodel b/approxmodel
index c1c7d36d433910f6208e0a75705a566e62a837f7..cbe1799b096d3f0fa977614f4f9312fd48a7b513 100755 (executable)
--- a/approxmodel
+++ b/approxmodel
@@ -1,18 +1,37 @@
 #!/usr/bin/perl
 require 'library.pl';
 die unless @ARGV==4;
-($primer,$instructions,$aout,$output) = @ARGV;
+($prime,$instructions,$aout,$output) = @ARGV;
 $output =~ s/^\-o// or die "$output ?";
-die if $primer =~ m/^\-/;
+die if $prime =~ m/^\-/;
 die if $instructions =~ m/^\-/;
 
 $aoutin= "$output.aoutin.tmp";
 $initdata= "$output.initdata.tmp";
 
 run("cat $instructions >$aoutin");
-run("./$primer 'pointmap ' ' ' ' ' ' ' ' ' ' # '  'echo ' ' ' u >>$aoutin");
 
 open A, ">>$aoutin" or die $!;
+
+use Math::Trig;
+
+sub initdata_prime_point_callback ($$$$) {
+    my ($u,$v,$comment,$floatformat) = @_; # SGT's coordinates
+    # v corresponds to the old program's t, roughly
+    printf(A "pointmap $floatformat $floatformat %s\n",
+          $v/(pi), $u, $comment)
+       or die $!;
+}
+
+sub initdata_return_vertex_transform () {
+    ($vertex[0],$vertex[2])= ($vertex[2],$vertex[0]);
+    map { $_ *= 0.7 } @vertex;
+    $vertex[1] *= -1;
+    $vertex[1] += 0.5;
+}
+
+initdata_process_prime();
+
 print A "quit\n" or die $!;
 close A or die $!;