fixes

nasa · Jul 13, 2021 · cc29547 · cc29547
1 parent 0667ec0
commit cc29547
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 7 deletions.
diff --git a/acceptance/facebody/combine/accept-combine.sh b/acceptance/facebody/combine/accept-combine.sh
@@ -29,10 +29,6 @@ function adapt_cycle {
     ${src}/ref_acceptance ${field2} ${inproj}.meshb \
  	  ${inproj}-2.solb
 
-    ${src}/ref_metric_test --combine \
-	  ${inproj}.meshb ${inproj}-1.solb ${inproj}-2.solb \
-	  2 -1 ${complexity} 0.5 ${inproj}-metric.solb
-
     ${src}/ref multiscale ${inproj}.meshb ${inproj}-1.solb \
 	  ${complexity} \
 	  ${inproj}-metric.solb \

diff --git a/src/ref_subcommand.c b/src/ref_subcommand.c
@@ -3072,12 +3072,12 @@ static REF_STATUS multiscale(REF_MPI ref_mpi, int argc, char *argv[]) {
           "gradation at complexity");
       ref_mpi_stopwatch_stop(ref_mpi, "metric gradation");
 
-      if (ref_mpi_once(ref_mpi)) printf("scalar1 combined metric ");
+      if (ref_mpi_once(ref_mpi)) printf("s1: ");
       RSS(ref_subcommand_report_error(metric, ref_grid, scalar1, reconstruction,
                                       complexity),
           "report error");
-      if (ref_mpi_once(ref_mpi)) printf("scalar2 combined metric ");
-      RSS(ref_subcommand_report_error(metric, ref_grid, scalar, reconstruction,
+      if (ref_mpi_once(ref_mpi)) printf("s2: ");
+      RSS(ref_subcommand_report_error(metric, ref_grid, scalar2, reconstruction,
                                       complexity),
           "report error");
       ref_free(scalar2);