From d974a119e385237e8ef6d4326e2681619a206646 Mon Sep 17 00:00:00 2001
From: Modellers Operational <modop@phorcys.npm.ac.uk>
Date: Mon, 4 Feb 2019 14:48:29 +0000
Subject: [PATCH] Rename plotting routing and bugfix for timing

---
 app/plot_sst/rose-app.conf                      |   4 ----
 app/plot_surf_vars/.rose-app.conf.swp           | Bin 0 -> 12288 bytes
 .../file/plot_var.py                            |   1 +
 app/plot_surf_vars/rose-app.conf                |   4 ++++
 suite.rc                                        |   5 +++--
 5 files changed, 8 insertions(+), 6 deletions(-)
 delete mode 100644 app/plot_sst/rose-app.conf
 create mode 100644 app/plot_surf_vars/.rose-app.conf.swp
 rename app/{plot_sst => plot_surf_vars}/file/plot_var.py (99%)
 create mode 100644 app/plot_surf_vars/rose-app.conf

diff --git a/app/plot_sst/rose-app.conf b/app/plot_sst/rose-app.conf
deleted file mode 100644
index 6889885..0000000
--- a/app/plot_sst/rose-app.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-[command]
-default = today_output=/${ARCHIVE_DIR}/${START_DAY}/${GRID}_0001.nc;
-		python3 plot_var.py ${today_output} temp 8 18; python3 plot_var.py ${today_output} salinity 31 36;
-		mkdir /${PLOT_DIR}/${START_DAY}/; mv *.png /${PLOT_DIR}/${START_DAY}/
diff --git a/app/plot_surf_vars/.rose-app.conf.swp b/app/plot_surf_vars/.rose-app.conf.swp
new file mode 100644
index 0000000000000000000000000000000000000000..95192f329170780da4b62efb106354a713f916a4
GIT binary patch
literal 12288
zcmeI&&uiN-6bJB^(Mt~9Mt3i7YkC>PKN=W;kV9xo7ihcTWP!33quI_95?jKS116;X
z6L#F8e@d_WTekmTyG{-%jIwq)cH=7$&yt=W(&uKZkItZb!cEI1)1DIbwtF9bUVW{6
z-X)4<C{;QCm!?KC4T{W4RBVaB$|rZ^Un~pSp3EXY%f~v(?BOhsv9CoeQd=lxtEtpx
zEgkwZk!E&kQtM{k3S=_8qbjB$0D<)cHmR}aI%V$8i|71o>)m><AqxT!fB*y_009U<
z00I#BF9fuz(4{%aqt$6PR<Uv`u7(H@fB*y_009U<00Izz00bZa0SNqq0wN^3eoXY;
z^z#4z&G-M0Cq!RN-!r{j`&O=_K>z{}fB*y_009U<00Izz00bVkK(!iA!g0!V#ddA}
z_V`WTKj?Z3^W5uqJTvH=E$kM@Gk$5Q<kLM#RIRE)k7Ux|<z;nqPu)@l*XCM=qVQ#|
zRjwDTqgZj1-DZo|NzcS|oQ!qB4VN3QS`<b@kxw<Z`S-GIv)_)l|GGOk{KNKZ^CPc&
g;GcF*4i~=TIIfihEslbbyuCYmZ*JYkA_>pw7fY^>5C8xG

literal 0
HcmV?d00001

diff --git a/app/plot_sst/file/plot_var.py b/app/plot_surf_vars/file/plot_var.py
similarity index 99%
rename from app/plot_sst/file/plot_var.py
rename to app/plot_surf_vars/file/plot_var.py
index 7ac24e4..54b5582 100644
--- a/app/plot_sst/file/plot_var.py
+++ b/app/plot_surf_vars/file/plot_var.py
@@ -48,6 +48,7 @@ fname = sys.argv[1]
 var = sys.argv[2]
 clim = [float(sys.argv[3]), float(sys.argv[4])]
 
+print(fname)
 
 cmap = pt.plotting.pmlcmaps(var)
 pool_size = 4
diff --git a/app/plot_surf_vars/rose-app.conf b/app/plot_surf_vars/rose-app.conf
new file mode 100644
index 0000000..35e6f7b
--- /dev/null
+++ b/app/plot_surf_vars/rose-app.conf
@@ -0,0 +1,4 @@
+[command]
+default = today_output=/${ARCHIVE_DIR}/${START_DAY}/${GRID_NAME}_0001.nc; echo ${today_output}
+		python3 plot_var.py ${today_output} temp 8 18; python3 plot_var.py ${today_output} salinity 31 36;
+		mkdir -p /${PLOT_DIR}/${START_DAY}/; mv *.png /${PLOT_DIR}/${START_DAY}/
diff --git a/suite.rc b/suite.rc
index 400e258..599f4da 100644
--- a/suite.rc
+++ b/suite.rc
@@ -67,7 +67,8 @@
 {% else %}
 					write_run_namelist => run_fvcom => transfer_data
 {% endif %}
-					run_fvcom => nan_check & plot_sst
+					run_fvcom => nan_check 
+					transfer_data => plot_surf_vars
 
 
 					"""
@@ -303,4 +304,4 @@
 			"""
 	[[nan_check]]
 		inherit = remote_job
-	[[plot_sst]]	
+	[[plot_surf_vars]]	
-- 
GitLab