Changeset 399 for trunk/src/civ.m

Timestamp:

Apr 27, 2012, 12:28:47 PM (12 years ago)

Author:

sommeria

Message:

implementation of thin plate interpolation (proj on planes with mode 'filter'), rationalisation of variable formats in civ_matlab

File:

• trunk/src/civ.m (modified) (2 diffs)

trunk/src/civ.m

@@ -1239 +1239 @@
             end
             Param.Civ1.Time=((time(i2_civ1(ifile)+1,j2_civ1(j)+1)+time(i1_civ1(ifile)+1,j1_civ1(j)+1))/2);
+            if strcmp(CivMode,'CivX')
             Param.Civ1.term_a=num2stra(j1_civ1(j),nom_type_nc);%UTILITE?
             Param.Civ1.term_b=num2stra(j2_civ1(j),nom_type_nc);%
+            end
             form=imformats(regexprep(get(handles.ImaExt,'String'),'^.',''));%look for image formats
             if isempty(form)
@@ -1390 +1392 @@
             end
             Param.Civ2.Time=(time(i2_civ2(ifile)+1,j2_civ2(j)+1)+time(i1_civ2(ifile)+1,j1_civ2(j)+1))/2;
+            if strcmp(CivMode,'CivX')
             Param.Civ2.term_a=num2stra(j1_civ2(j),nom_type_nc);
             Param.Civ2.term_b=num2stra(j2_civ2(j),nom_type_nc);
+            end
             Param.Civ2.filename_nc1=filecell.nc.civ1{ifile,j};
             Param.Civ2.filename_nc1(end-2:end)=[]; % remove '.nc'