Changeset 248 for trunk/src/civ.m

Timestamp:

May 9, 2011, 12:32:20 AM (13 years ago)

Author:

sommeria

Message:

various modifications

File:

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

trunk/src/civ.m

@@ -2152 +2152 @@
                 Param.Patch1.SubDomain=subdomain_patch1;
             end
+            if box_test(4)==1
+                Param.Civ2=par_civ2;
+            end
             [Data,erromsg]=civ_uvmat(Param,filecell.nc.civ1{ifile,j});
             if isempty(errormsg)
@@ -2705 +2708 @@
                 if ~testdiff % civ2 or patch2 are written in the same file as civ1
                     if box_test(4)==0 ; %check the existence of civ2 if it is not calculated
-                        Data=nc2struct(filename,'ListGlobalAttribute','civ2');
-                        if isempty(Data.civ2)||isequal(Data.civ2,0)
+                        Data=nc2struct(filename,'ListGlobalAttribute','CivStage','civ2');
+                        if ~isempty(Data.CivStage) && Data.CivStage<4 %test for civ files
+                            msgbox_uvmat('ERROR',['no civ2 data in ' filename])
+                            filecell=[];
+                            return
+                        elseif isempty(Data.civ2)||isequal(Data.civ2,0)
                             msgbox_uvmat('ERROR',['no civ2 data in ' filename])
                             filecell=[];
@@ -2712 +2719 @@
                         end
                     elseif box_test(3)==0; %check the existence of patch if it is not calculated
-                        Data=nc2struct(filename,'ListGlobalAttribute','patch');
-                        if isempty(Data.patch)||isequal(Data.patch,0)
+                        Data=nc2struct(filename,'ListGlobalAttribute','CivStage','patch')
+                        if ~isempty(Data.CivStage)
+                            if Data.CivStage<3 %test for civ files
+                                msgbox_uvmat('ERROR',['no patch data in ' filename])
+                                filecell=[];
+                                return
+                            end
+                        elseif isempty(Data.patch)||isequal(Data.patch,0)
                             msgbox_uvmat('ERROR',['no patch data in ' filename])
                             filecell=[];
@@ -2801 +2814 @@
                     return
                 else
-                    Data=nc2struct(filename,'ListGlobalAttribute','civ2');
-                    if isempty(Data.civ2)||isequal(Data.civ2,0)
+                    Data=nc2struct(filename,'ListGlobalAttribute','CivStage','civ2');
+                    if ~isempty(Data.CivStage) && Data.CivStage<4 %test for civ files
+                            msgbox_uvmat('ERROR',['no civ2 data in ' filename])
+                            filecell=[];
+                            return
+                    elseif isempty(Data.civ2)||isequal(Data.civ2,0)
                         msgbox_uvmat('ERROR',['no civ2 data in ' filename])
                         filecell=[];
@@ -4677 +4694 @@
     end
     [filecell,num1_civ1,num2_civ1,num_a_civ1,num_b_civ1,num1_civ2,num2_civ2,num_a_civ2,num_b_civ2,nom_type_nc,file_ref_fix1,file_ref_fix2]=...
-        set_civ_filenames(handles,ref_i,ref_j,[1 0 0 0 0 0]);
+        set_civ_filenames(handles,ref_i,ref_j,[1 0 0 0 0 0])
     Data.ListVarName={'ny','nx','A'};
     Data.VarDimName={'ny','nx',{'ny','nx'}};