Changeset 422 for trunk/src

Timestamp:

May 14, 2012, 7:04:39 AM (13 years ago)

Author:

sommeria

Message:

corrections in merge_proj and time_series: Conventions='uvmat' written in the result files

Location:

trunk/src/series

Files:

• merge_proj.m (modified) (1 diff)
• time_series.m (modified) (1 diff)

trunk/src/series/merge_proj.m

@@ -403 +403 @@
             display([filebase_merge '.xml saved'])
         else
-            MergeData.ListGlobalAttribute={'Project','InputFile_1','InputFile_end','nb_coord','nb_dim','dt','Time','civ'};        
+            MergeData.ListGlobalAttribute={'Conventions','Project','InputFile_1','InputFile_end','nb_coord','nb_dim','dt','Time','civ'};        
+            MergeData.Conventions='uvmat';
             MergeData.nb_coord=2;
             MergeData.nb_dim=2;

trunk/src/series/time_series.m

@@ -455 +455 @@
    
     %remove time for global attributes if exists
-    for iattr=1:numel(RecordData.ListGlobalAttribute)
-        if strcmp(RecordData.ListGlobalAttribute{iattr},'Time')
-            RecordData.ListGlobalAttribute(iattr)=[];
-            break
-        end
-    end
+    Time_index=find(strcmp('Time',RecordData.ListGlobalAttribute));
+    if ~isempty(Time_search)
+        RecordData.ListGlobalAttribute(Time_index)=[];
+    end
+    RecordData.Conventions='uvmat';
+%     for iattr=1:numel(RecordData.ListGlobalAttribute)
+%         if strcmp(RecordData.ListGlobalAttribute{iattr},'Time')
+%             RecordData.ListGlobalAttribute(iattr)=[];
+%             break
+%         end
+%     end
     for ivar=1:numel(RecordData.ListVarName)
         VarName=RecordData.ListVarName{ivar};