Changeset 159 for trunk/src/civ.m

Timestamp:

Dec 23, 2010, 8:09:20 AM (14 years ago)

Author:

sommeria

Message:

bug in civ corrected: civ2 was not lauched for Windows system
various bugs corrections and cleaning

File:

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

trunk/src/civ.m

@@ -1597 +1597 @@
 index_first=min(index);
 index_last=max(index);
-box_used=box_test([index_first : index_last]);
+box_used=box_test(index_first : index_last);
 [box_missing,ind_missing]=min(box_used);
 if isequal(box_missing,0)
@@ -1870 +1870 @@
         filename_cmx=filecell.nc.civ1{ifile,j};%output netcdf file
         filename_cmx(end-1:end+1)='cmx';%name of cmx file
+        if batch
+            [Rootbat,Filebat,extbat]=fileparts(filename_cmx);
+            filename_bat=fullfile(Rootbat,['job_' Filebat extbat]);
+         else
+            filename_bat=filename_cmx;
+        end
+        filename_bat(end-2:end)='bat';
         
         %CIV1
@@ -2211 +2218 @@
         end
         % create the .bat file:
-        if batch
-            [Rootbat,Filebat,extbat]=fileparts(filename_cmx);
-            filename_bat=fullfile(Rootbat,['job_' Filebat extbat]);
-         else
-            filename_bat=filename_cmx;
-        end
-        filename_bat(end-2:end)='bat';
-        fid=fopen(filename_bat,'w');
+        [fid,message]=fopen(filename_bat,'w');
+        if isequal(fid,-1)
+            msgbox_uvmat('ERROR', ['creation of .bat file: ' message])
+            return
+        end
         fprintf(fid,cmd);
         fclose(fid);
@@ -2246 +2250 @@
 
 if ~batch
-    [Rootbat,Filebat,extbat]=fileparts(filename_cmx);
+    [Rootbat,Filebat,extbat]=fileparts(filename_bat);
     filename_superbat=fullfile(Rootbat,['job_list.bat']);
     fid=fopen(filename_superbat,'w');