From 043c449171bdd9ba70396c0128f4db3409350da2 Mon Sep 17 00:00:00 2001 From: Ansley Manke Date: Wed, 31 Oct 2018 14:35:29 -0700 Subject: [PATCH] for diff plots of variables on grids of diff. shapes --- .../ferret/scripts/LAS_check_multi_regions.jnl | 8 ++++---- JavaSource/resources/ferret/scripts/LAS_results.jnl | 10 ++++++++++ 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/JavaSource/resources/ferret/scripts/LAS_check_multi_regions.jnl b/JavaSource/resources/ferret/scripts/LAS_check_multi_regions.jnl index 0a987cd7f..56b7871fd 100644 --- a/JavaSource/resources/ferret/scripts/LAS_check_multi_regions.jnl +++ b/JavaSource/resources/ferret/scripts/LAS_check_multi_regions.jnl @@ -16,6 +16,7 @@ ! The LET ($data_var)_test = '($data_var)' takes care of the possiblity of variables whose ! names are pseudo-variables +! set_add_for_region sets up to add 0*var if needed, so variables have the same grids. cancel symbol fer_last_error LET nc = `($data_count) - 1` @@ -30,10 +31,8 @@ SET DATA ($test_url); \ LET ($test_var)_test = '($test_var)';\ DEFINE SYMBOL shape($ivar) = `($test_var)_test,RETURN=shape`; \ DEFINE SYMBOL dset($ivar) = `($test_var)_test,RETURN=dsetnum`;\ -CANCEL DATA ($test_url)) - -! Set up to add 0*var if needed -REPEAT/RANGE=0:`nc`/NAME=ivar (GO set_add_for_region `ivar`) +GO set_add_for_region `ivar`;\ +) ! Now set up to add to the region spec if needed. @@ -97,6 +96,7 @@ IF ($add_region_z"0|*>1") THEN ENDIF !CANCEL DATA/ALL +CANCEL DATA ($test_url) IF ($add_region_z"0|*>1") THEN GO LAS_initialize_region IF ($add_region_t"0|*>1") THEN GO LAS_initialize_region diff --git a/JavaSource/resources/ferret/scripts/LAS_results.jnl b/JavaSource/resources/ferret/scripts/LAS_results.jnl index 1c341b17b..44ddd2fa1 100644 --- a/JavaSource/resources/ferret/scripts/LAS_results.jnl +++ b/JavaSource/resources/ferret/scripts/LAS_results.jnl @@ -15,6 +15,7 @@ ! 10/2017 Add an annotation on the plot when data selection results in no data ! 10/2017 fixes for map-scale file, monthly time axis such as monthly_navy_winds ! 11/2017 add report map resolution to the log if this was a map plot +! 10/2018 changing animation product to make all the frames in one PyFerret session ! ....................................................................................... ! ! LAS_results.jnl creates the result files. @@ -23,6 +24,9 @@ cancel region +! If its a difference plot, use dataset 1 e.g. for the coordnames getting axis directions +set data 1 + IF ($have_las_plotvar"0") THEN LET the_plot_var = las_plotvar ! from LAS_auto_levels ELSE @@ -82,6 +86,12 @@ SAY _________________ END Saving the image: clock seconds: SAY _________________ total time Saving the image, seconds ----- `($clock_secs) - pre_plot` +! When we are making all the images for an animation in one go, that's it. +! We do not need a map-scale file, we aren't doing annotations. + +IF ($is_animation_frame"0|0|*>1") THEN EXIT/SCRIPT + + ! Result map_scale_file is output map scale file ! Write the output immediately after drawing the plot; it uses symbols ! that are set when making the plot. If a colorbar is made, do that after the