Merge remote-tracking branch 'refs/remotes/origin/Ver.2.0_w_PVR' into Ver.2.0_w_PVR

hiromatsui · hiromatsui · commit 4b484fbae32a · 2024-11-25T14:57:50.000-08:00
diff --git a/tests/Rendering_tests/PVR_defs/ctl_pvr_Bpole b/tests/Rendering_tests/PVR_defs/ctl_pvr_Bpole
@@ -21,7 +21,7 @@ begin volume_rendering   (BMP or PNG)
     end array surface_enhanse_ctl
   end  plot_area_ctl
 !
-  begin pvr_color_ctl
+  begin colormap_ctl
     colormap_mode_ctl       rainbow
 !
     data_mapping_ctl   Colormap_list
@@ -46,7 +46,7 @@ begin volume_rendering   (BMP or PNG)
 !
     range_min_ctl   0.0e+00
     range_max_ctl   1.0e+01
-  end   pvr_color_ctl
+  end   colormap_ctl
 !
   begin colorbar_ctl
     colorbar_switch_ctl    On
diff --git a/tests/Rendering_tests/PVR_defs/ctl_pvr_Bz b/tests/Rendering_tests/PVR_defs/ctl_pvr_Bz
@@ -21,7 +21,7 @@ begin volume_rendering   (BMP or PNG)
     end array surface_enhanse_ctl
   end  plot_area_ctl
 !
-  begin pvr_color_ctl
+  begin colormap_ctl
     colormap_ctl       rainbow
 !
     data_mapping_ctl   Colormap_list
@@ -51,7 +51,7 @@ begin volume_rendering   (BMP or PNG)
 !
     range_min_ctl   -6.0
     range_max_ctl    6.0
-  end   pvr_color_ctl
+  end   colormap_ctl
 !
   begin colorbar_ctl
     colorbar_switch_ctl    On
diff --git a/tests/Rendering_tests/PVR_defs/ctl_pvr_temp b/tests/Rendering_tests/PVR_defs/ctl_pvr_temp
@@ -23,7 +23,7 @@ begin volume_rendering   (BMP or PNG)
     end array surface_enhanse_ctl
   end  plot_area_ctl
 !
-  begin pvr_color_ctl
+  begin colormap_ctl
     colormap_mode_ctl       rainbow
 !
     data_mapping_ctl   Colormap_list
@@ -50,7 +50,7 @@ begin volume_rendering   (BMP or PNG)
 !
     range_min_ctl   0.0
     range_max_ctl   0.5
-  end   pvr_color_ctl
+  end   colormap_ctl
 !
   begin colorbar_ctl
     colorbar_switch_ctl    On
diff --git a/tests/Rendering_tests/PVR_defs/ctl_pvr_vr b/tests/Rendering_tests/PVR_defs/ctl_pvr_vr
@@ -21,7 +21,7 @@ begin volume_rendering   (BMP or PNG)
     end array surface_enhanse_ctl
   end  plot_area_ctl
 !
-  begin pvr_color_ctl
+  begin colormap_ctl
     colormap_mode_ctl       rainbow
 !
     data_mapping_ctl   Colormap_list
@@ -53,7 +53,7 @@ begin volume_rendering   (BMP or PNG)
 !
     range_min_ctl   -80.0
     range_max_ctl    80.0
-  end   pvr_color_ctl
+  end   colormap_ctl
 !
   begin colorbar_ctl
     colorbar_switch_ctl    On
diff --git a/tests/Rendering_tests/PVR_defs/ctl_pvr_wz b/tests/Rendering_tests/PVR_defs/ctl_pvr_wz
@@ -21,7 +21,7 @@ begin volume_rendering   (BMP or PNG)
     end array surface_enhanse_ctl
   end  plot_area_ctl
 !
-  begin pvr_color_ctl
+  begin colormap_ctl
     colormap_mode_ctl       rainbow
 !
     data_mapping_ctl   Colormap_list
@@ -53,7 +53,7 @@ begin volume_rendering   (BMP or PNG)
 !
     range_min_ctl   -3000.0
     range_max_ctl    3000.0
-  end   pvr_color_ctl
+  end   colormap_ctl
 !
   begin colorbar_ctl
     colorbar_switch_ctl    On

Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@ begin volume_rendering (BMP or PNG)`
`21`	`21`	`end array surface_enhanse_ctl`
`22`	`22`	`end plot_area_ctl`
`23`	`23`	`!`
`24`		`- begin pvr_color_ctl`
	`24`	`+ begin colormap_ctl`
`25`	`25`	`colormap_mode_ctl rainbow`
`26`	`26`	`!`
`27`	`27`	`data_mapping_ctl Colormap_list`
`@@ -46,7 +46,7 @@ begin volume_rendering (BMP or PNG)`
`46`	`46`	`!`
`47`	`47`	`range_min_ctl 0.0e+00`
`48`	`48`	`range_max_ctl 1.0e+01`
`49`		`- end pvr_color_ctl`
	`49`	`+ end colormap_ctl`
`50`	`50`	`!`
`51`	`51`	`begin colorbar_ctl`
`52`	`52`	`colorbar_switch_ctl On`
Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@ begin volume_rendering (BMP or PNG)`
`23`	`23`	`end array surface_enhanse_ctl`
`24`	`24`	`end plot_area_ctl`
`25`	`25`	`!`
`26`		`- begin pvr_color_ctl`
	`26`	`+ begin colormap_ctl`
`27`	`27`	`colormap_mode_ctl rainbow`
`28`	`28`	`!`
`29`	`29`	`data_mapping_ctl Colormap_list`
`@@ -50,7 +50,7 @@ begin volume_rendering (BMP or PNG)`
`50`	`50`	`!`
`51`	`51`	`range_min_ctl 0.0`
`52`	`52`	`range_max_ctl 0.5`
`53`		`- end pvr_color_ctl`
	`53`	`+ end colormap_ctl`
`54`	`54`	`!`
`55`	`55`	`begin colorbar_ctl`
`56`	`56`	`colorbar_switch_ctl On`