[cmor] 15/190: 2010-05-25 : trying a new way to store date in file names for Jamie. Probably going to be reverted

[Alastair McKinstry]

This is an automated email from the git hooks/post-receive script.

mckinstry pushed a commit to branch debian/master
in repository cmor.

commit bd061eb018c45c005dfd7013639e2b4bfc888e22
Author: Charles Doutriaux <doutriaux1 at llnl.gov>
Date:   Tue May 25 09:48:20 2010 -0700

    2010-05-25 : trying a new way to store date in file names for Jamie. Probably going to be reverted
---
 RELEASE-NOTES | 1 +
 Src/cmor.c    | 7 +++++++
 2 files changed, 8 insertions(+)

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 803af9e..61df3b6 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -1,3 +1,4 @@
+2010-05-25 : trying a new way to store date in file names for Jamie. Probably going to be reverted
 2010-05-24 : changed the way the final file name is constructed, uses time bounds if present, otherwise as before uses time values
 2010-05-20 : tagging RC9
 2010-05-20 : fixed a bug in python interface when converting zfactor bounds array from 2D to the required 1D.
diff --git a/Src/cmor.c b/Src/cmor.c
index 570c6fd..9f97d76 100644
--- a/Src/cmor.c
+++ b/Src/cmor.c
@@ -3566,6 +3566,13 @@ int cmor_close_variable(int var_id, char *file_name, int *preserve)
 	cdRel2Comp(icalo,msg,cmor_vars[var_id].last_time,&comptime);
       }
       
+      /* ok apparently we don't like the new time format if it's ending at midnight exactly so I'm removing one second...*/
+      if (icalo==cdMixed) {
+	cdCompAddMixed(comptime,-1./3600.,&comptime);
+      }
+      else{
+	cdCompAdd(comptime,-1./3600.,icalo,&comptime);
+      }
       /* separator between first and last time */
       strncat(outname,"-",CMOR_MAX_STRING-strlen(outname));
       

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/cmor.git