Extended remote delete, to clean everything after completion of jobs on remote machines.

matlab/closeSlave.m

@@ -19,13 +19,28 @@ function closeSlave(Parallel),
 % You should have received a copy of the GNU General Public License
 % along with Dynare.  If not, see <http://www.gnu.org/licenses/>.
 
+try
     delete( 'slaveParallel_input*.mat');
+
     for indPC=1:length(Parallel),
-    if Parallel(indPC).Local==0,
+        if (Parallel(indPC).Local==0),
             if isunix || (~matlab_ver_less_than('7.4') && ismac),
                 system(['ssh ',Parallel(indPC).user,'@',Parallel(indPC).PcName,' rm -fr ',Parallel(indPC).RemoteFolder,'/slaveParallel_input*.mat']);
+                system(['ssh ',Parallel(indPC).user,'@',Parallel(indPC).PcName,' rm -fr ',Parallel(indPC).RemoteFolder,'/*']);
             else
                 mydelete('slaveParallel_input*.mat',['\\',Parallel(indPC).PcName,'\',Parallel(indPC).RemoteDrive,'$\',Parallel(indPC).RemoteFolder,'\']);
+                mydelete('*.*',['\\',Parallel(indPC).PcName,'\',Parallel(indPC).RemoteDrive,'$\',Parallel(indPC).RemoteFolder,'\']);
+                adir=dir(['\\',Parallel(indPC).PcName,'\',Parallel(indPC).RemoteDrive,'$\',Parallel(indPC).RemoteFolder,'\']);
+                for jdir=3:length(adir)
+                    STATUS = rmdir(['\\',Parallel(indPC).PcName,'\',Parallel(indPC).RemoteDrive,'$\',Parallel(indPC).RemoteFolder,'\',adir(jdir).name],'s');
+                    if STATUS == 0,
+                        disp(['Warning!: Directory ',adir(jdir).name,' could not be removed from ',Parallel(indPC).PcName,'.'])
+                    end
+                end
+            end
         end
     end
+catch
+    E1=fopen('Errore1-closeSlave.txt','w+');
+    fclose(E1);
 end
\ No newline at end of file