diff --git a/CONSTSteps_MPS.wnd b/#Archive/CONSTSteps_MPS.wnd similarity index 98% rename from CONSTSteps_MPS.wnd rename to #Archive/CONSTSteps_MPS.wnd index 34125790..8a8e670a 100644 --- a/CONSTSteps_MPS.wnd +++ b/#Archive/CONSTSteps_MPS.wnd @@ -1,46 +1,46 @@ -!Wind file for Trivial turbine. -!Time Wind Wind Vert. Horiz. Vert. LinV Gust -! Speed Dir Speed Shear Shear Shear Speed -0.00 7.0 0.00 0.00 0.00 0.00 0.00 0.00 -0.10 7.0 0.00 0.00 0.00 0.00 0.00 0.00 -100.00 7.0 0.00 0.00 0.00 0.00 0.00 0.00 -100.10 8.0 0.00 0.00 0.00 0.00 0.00 0.00 -200.00 8.0 0.00 0.00 0.00 0.00 0.00 0.00 -200.10 9.0 0.00 0.00 0.00 0.00 0.00 0.00 -300.00 9.0 0.00 0.00 0.00 0.00 0.00 0.00 -300.10 10.0 0.00 0.00 0.00 0.00 0.00 0.00 -400.00 10.0 0.00 0.00 0.00 0.00 0.00 0.00 -400.10 11.0 0.00 0.00 0.00 0.00 0.00 0.00 -500.00 11.0 00.0 0.00 0.00 0.00 0.00 0.00 -500.10 10.00 0.00 0.00 0.00 0.00 0.00 0.00 -600.00 10.00 0.00 0.00 0.00 0.00 0.00 0.00 -600.10 11.00 0.00 0.00 0.00 0.00 0.00 0.00 -700.00 11.00 0.00 0.00 0.00 0.00 0.00 0.00 -700.10 12.00 0.00 0.00 0.00 0.00 0.00 0.00 -800.00 12.00 0.00 0.00 0.00 0.00 0.00 0.00 -800.10 13.00 0.00 0.00 0.00 0.00 0.00 0.00 -900.00 13.00 0.00 0.00 0.00 0.00 0.00 0.00 -900.10 14.00 0.00 0.00 0.00 0.00 0.00 0.00 -1000.00 14.00 0.00 0.00 0.00 0.00 0.00 0.00 -1000.10 15.00 0.00 0.00 0.00 0.00 0.00 0.00 -1100.00 15.00 0.00 0.00 0.00 0.00 0.00 0.00 -1100.10 16.00 0.00 0.00 0.00 0.00 0.00 0.00 -1200.00 16.00 0.00 0.00 0.00 0.00 0.00 0.00 -1200.10 17.00 0.00 0.00 0.00 0.00 0.00 0.00 -1300.00 17.00 0.00 0.00 0.00 0.00 0.00 0.00 -1300.10 18.00 0.00 0.00 0.00 0.00 0.00 0.00 -1400.00 18.00 0.00 0.00 0.00 0.00 0.00 0.00 -1400.10 19.00 0.00 0.00 0.00 0.00 0.00 0.00 -1500.00 19.00 0.00 0.00 0.00 0.00 0.00 0.00 -1500.10 20.00 0.00 0.00 0.00 0.00 0.00 0.00 -1600.00 20.00 0.00 0.00 0.00 0.00 0.00 0.00 -1600.10 21.00 0.00 0.00 0.00 0.00 0.00 0.00 -1700.00 21.00 0.00 0.00 0.00 0.00 0.00 0.00 -1700.10 22.00 0.00 0.00 0.00 0.00 0.00 0.00 -1800.00 22.00 0.00 0.00 0.00 0.00 0.00 0.00 -1800.10 23.00 0.00 0.00 0.00 0.00 0.00 0.00 -1900.00 23.00 0.00 0.00 0.00 0.00 0.00 0.00 -1900.10 24.00 0.00 0.00 0.00 0.00 0.00 0.00 -2000.00 24.00 0.00 0.00 0.00 0.00 0.00 0.00 -2000.10 25.00 0.00 0.00 0.00 0.00 0.00 0.00 -2100.00 25.00 0.00 0.00 0.00 0.00 0.00 0.00 +!Wind file for Trivial turbine. +!Time Wind Wind Vert. Horiz. Vert. LinV Gust +! Speed Dir Speed Shear Shear Shear Speed +0.00 7.0 0.00 0.00 0.00 0.00 0.00 0.00 +0.10 7.0 0.00 0.00 0.00 0.00 0.00 0.00 +100.00 7.0 0.00 0.00 0.00 0.00 0.00 0.00 +100.10 8.0 0.00 0.00 0.00 0.00 0.00 0.00 +200.00 8.0 0.00 0.00 0.00 0.00 0.00 0.00 +200.10 9.0 0.00 0.00 0.00 0.00 0.00 0.00 +300.00 9.0 0.00 0.00 0.00 0.00 0.00 0.00 +300.10 10.0 0.00 0.00 0.00 0.00 0.00 0.00 +400.00 10.0 0.00 0.00 0.00 0.00 0.00 0.00 +400.10 11.0 0.00 0.00 0.00 0.00 0.00 0.00 +500.00 11.0 00.0 0.00 0.00 0.00 0.00 0.00 +500.10 10.00 0.00 0.00 0.00 0.00 0.00 0.00 +600.00 10.00 0.00 0.00 0.00 0.00 0.00 0.00 +600.10 11.00 0.00 0.00 0.00 0.00 0.00 0.00 +700.00 11.00 0.00 0.00 0.00 0.00 0.00 0.00 +700.10 12.00 0.00 0.00 0.00 0.00 0.00 0.00 +800.00 12.00 0.00 0.00 0.00 0.00 0.00 0.00 +800.10 13.00 0.00 0.00 0.00 0.00 0.00 0.00 +900.00 13.00 0.00 0.00 0.00 0.00 0.00 0.00 +900.10 14.00 0.00 0.00 0.00 0.00 0.00 0.00 +1000.00 14.00 0.00 0.00 0.00 0.00 0.00 0.00 +1000.10 15.00 0.00 0.00 0.00 0.00 0.00 0.00 +1100.00 15.00 0.00 0.00 0.00 0.00 0.00 0.00 +1100.10 16.00 0.00 0.00 0.00 0.00 0.00 0.00 +1200.00 16.00 0.00 0.00 0.00 0.00 0.00 0.00 +1200.10 17.00 0.00 0.00 0.00 0.00 0.00 0.00 +1300.00 17.00 0.00 0.00 0.00 0.00 0.00 0.00 +1300.10 18.00 0.00 0.00 0.00 0.00 0.00 0.00 +1400.00 18.00 0.00 0.00 0.00 0.00 0.00 0.00 +1400.10 19.00 0.00 0.00 0.00 0.00 0.00 0.00 +1500.00 19.00 0.00 0.00 0.00 0.00 0.00 0.00 +1500.10 20.00 0.00 0.00 0.00 0.00 0.00 0.00 +1600.00 20.00 0.00 0.00 0.00 0.00 0.00 0.00 +1600.10 21.00 0.00 0.00 0.00 0.00 0.00 0.00 +1700.00 21.00 0.00 0.00 0.00 0.00 0.00 0.00 +1700.10 22.00 0.00 0.00 0.00 0.00 0.00 0.00 +1800.00 22.00 0.00 0.00 0.00 0.00 0.00 0.00 +1800.10 23.00 0.00 0.00 0.00 0.00 0.00 0.00 +1900.00 23.00 0.00 0.00 0.00 0.00 0.00 0.00 +1900.10 24.00 0.00 0.00 0.00 0.00 0.00 0.00 +2000.00 24.00 0.00 0.00 0.00 0.00 0.00 0.00 +2000.10 25.00 0.00 0.00 0.00 0.00 0.00 0.00 +2100.00 25.00 0.00 0.00 0.00 0.00 0.00 0.00 diff --git a/Debug/CompileRunAndDebug.cmd b/#Archive/Debug/CompileRunAndDebug.cmd similarity index 96% rename from Debug/CompileRunAndDebug.cmd rename to #Archive/Debug/CompileRunAndDebug.cmd index b57698aa..be4b20b1 100644 --- a/Debug/CompileRunAndDebug.cmd +++ b/#Archive/Debug/CompileRunAndDebug.cmd @@ -1,53 +1,53 @@ -:: Compiling and Testing Discon.f90 - -echo off - -:: Set this to the absolute path of FAST. In that -:: case also make sure the correct drive is selected -set "FASTdir=C:\FAST" - -:: Set these to the absolute path of your archive directory. Does not necessarily have -:: to be the current directory -set "ArchiveDir=C:\FASTArchive" - -:: Go to the drive where FAST is located -C: - -Remove old .dll file -DEL %FASTdir%\CertTest\5MW_Baseline\ServoData\DISCON_gwin32.dll - -:: Compile new .dll file -cd %FASTdir%\Compiling -mingw32-make.exe - -:: Run Test18 -echo off -cd ..\CertTest -echo on -FAST_Win32.exe Test18.fst - -echo off -:: Make new directory with correct timestamp - -Get the timestamp -for /f "tokens=2 delims==" %%a in ('wmic OS Get localdatetime /value') do set "dt=%%a" -set "YYYY=%dt:~0,4%" & set "MM=%dt:~4,2%" & set "DD=%dt:~6,2%" -set "HH=%dt:~8,2%" & set "Min=%dt:~10,2%" -set "stamp=%YYYY%_%MM%_%DD%_%HH%%Min%" - -:: Put together the directory name and create it -set "dbFolder=%ArchiveDir%\%stamp%" -mkdir %dbFolder% - -:: Copy debug files to this directory -copy Test18.sum %dbFolder%\Test18.sum -copy Test18.AD.sum %dbFolder%\Test18.AD.sum -copy Test18.ED.sum %dbFolder%\Test18.ED.sum -copy Test18.out %dbFolder%\Test18.out -copy Test18.SrvD.dbg %dbFolder%\Test18.SrvD.dbg -copy Test18.SrvD.dbg2 %dbFolder%\Test18.SrvD.dbg2 - - -:: Echo the debug directory so matlab can potentially pick it up -echo %dbFolder% +:: Compiling and Testing Discon.f90 + +echo off + +:: Set this to the absolute path of FAST. In that +:: case also make sure the correct drive is selected +set "FASTdir=C:\FAST" + +:: Set these to the absolute path of your archive directory. Does not necessarily have +:: to be the current directory +set "ArchiveDir=C:\FASTArchive" + +:: Go to the drive where FAST is located +C: + +Remove old .dll file +DEL %FASTdir%\CertTest\5MW_Baseline\ServoData\DISCON_gwin32.dll + +:: Compile new .dll file +cd %FASTdir%\Compiling +mingw32-make.exe + +:: Run Test18 +echo off +cd ..\CertTest +echo on +FAST_Win32.exe Test18.fst + +echo off +:: Make new directory with correct timestamp + +Get the timestamp +for /f "tokens=2 delims==" %%a in ('wmic OS Get localdatetime /value') do set "dt=%%a" +set "YYYY=%dt:~0,4%" & set "MM=%dt:~4,2%" & set "DD=%dt:~6,2%" +set "HH=%dt:~8,2%" & set "Min=%dt:~10,2%" +set "stamp=%YYYY%_%MM%_%DD%_%HH%%Min%" + +:: Put together the directory name and create it +set "dbFolder=%ArchiveDir%\%stamp%" +mkdir %dbFolder% + +:: Copy debug files to this directory +copy Test18.sum %dbFolder%\Test18.sum +copy Test18.AD.sum %dbFolder%\Test18.AD.sum +copy Test18.ED.sum %dbFolder%\Test18.ED.sum +copy Test18.out %dbFolder%\Test18.out +copy Test18.SrvD.dbg %dbFolder%\Test18.SrvD.dbg +copy Test18.SrvD.dbg2 %dbFolder%\Test18.SrvD.dbg2 + + +:: Echo the debug directory so matlab can potentially pick it up +echo %dbFolder% pause \ No newline at end of file diff --git a/Debug/CompileRunAndPause.cmd b/#Archive/Debug/CompileRunAndPause.cmd similarity index 95% rename from Debug/CompileRunAndPause.cmd rename to #Archive/Debug/CompileRunAndPause.cmd index 5c447075..d1b40fe5 100644 --- a/Debug/CompileRunAndPause.cmd +++ b/#Archive/Debug/CompileRunAndPause.cmd @@ -1,22 +1,22 @@ -:: Compiling DISCON dll and run Test 18 -:: Pauses afterwards so command window output can be read - -:: Change these to the absolute path of FAST. In that -:: case also make sure the correct drive is selected -set "FASTdir=C:\FAST" - -:: Go to the correct drive -C: - -:: Remove old .dll file -DEL %FASTdir%\CertTest\5MW_Baseline\ServoData\DISCON_gwin32.dll - -:: Compile new .dll file -cd %FASTdir%\Compiling -mingw32-make.exe - -:: Run Test18 -cd ..\CertTest -FAST_Win32.exe Test18.fst - -pause +:: Compiling DISCON dll and run Test 18 +:: Pauses afterwards so command window output can be read + +:: Change these to the absolute path of FAST. In that +:: case also make sure the correct drive is selected +set "FASTdir=C:\FAST" + +:: Go to the correct drive +C: + +:: Remove old .dll file +DEL %FASTdir%\CertTest\5MW_Baseline\ServoData\DISCON_gwin32.dll + +:: Compile new .dll file +cd %FASTdir%\Compiling +mingw32-make.exe + +:: Run Test18 +cd ..\CertTest +FAST_Win32.exe Test18.fst + +pause diff --git a/Debug/PlotDebugData.m b/#Archive/Debug/PlotDebugData.m similarity index 95% rename from Debug/PlotDebugData.m rename to #Archive/Debug/PlotDebugData.m index 71e933e2..8f53b925 100644 --- a/Debug/PlotDebugData.m +++ b/#Archive/Debug/PlotDebugData.m @@ -1,170 +1,170 @@ -%% PlotDebugData -% Imports and plots data from dbg and dbg2 files - -%% Cleaning -close all -clearvars -clc - -%% Settings -% set timeStamp (format: YYYY_MM_DD_TTTT or 2017_01_01_1200) to the test -% directory you want to import and plot -timeStamp = '2017_08_17_1448'; -% Run the CompileRunAndDebug.cmd file from this matlab script -runCmdFromHere = false; - -%% Loading -totalTime = tic; -if(runCmdFromHere) % Run CompileRunAndDebug.cmd and get the correct folder - - [~,output] = dos('CompileRunAndDebug.cmd', '-echo'); - i = strfind(output,'C:'); - i = i(end); - debugFolder = [output(i:end-1) '\']; - clearvars output TimeStamp - -else % otherwise get the debugfolder with the manual timestamp - - debugFolder = [timeStamp '\']; - clearvars d order - -end - -% Import data from Test18.out and put in the debug structure -dbRaw = dlmread([debugFolder 'Test18.SrvD.dbg'],'\t',8,0); -[~,vars] = size(dbRaw); - -fid = fopen([debugFolder 'Test18.SrvD.dbg']); -header = textscan(fid,'%s','delimiter','\t'); -fclose(fid); - -header = strtrim(header{1,1}(1:vars)); -for i = 1:vars - db.(header{i}) = dbRaw(:,i); -end - -% Import avrSWAP debug file - avrSWAP = dlmread([debugFolder 'Test18.SrvD.dbg2'],'\t',8,0); - avrTime = avrSWAP(:,1); - avrSWAP = avrSWAP(:,2:end); - - -%% Plotting -figure -title('GenSpeed') -hold on -plot(db.Time,db.GenSpeed) -plot(db.Time,db.GenSpeedF) -legend('GenSpeed','GenSpeedF') -ylabel('Speed [rpm]') - -figure -title('GenTorque') -hold on -plot(avrTime,avrSWAP(:,47)) - -% figure -% title('Pitch') -% hold on -% subplot(2,1,1), plot(Time,PitCom1) -% legend('PitCom1') -% subplot(2,1,2), plot(Time,PitRate1) -% legend('PitRate1') -% -figure -title('Pitch') -hold on -plot(db.Time,db.PitCom1) -% plot(Time,PitRate1) -plot(db.Time,db.BlPitch1) -plot(db.Time,db.PitComT1) -% plot(Time,PitComT) -% plot(Time,GenTrq) -legend('PitCom1','BlPitch1','PitComT') - -figure -title('rootMOOP') -hold on -plot(db.Time,db.rootMOOP1) -% plot(Time,rootMOOPF1) -% plot(Time,rootMOOP2) -% % plot(Time,rootMOOPF2) -% plot(Time,rootMOOP3) -% plot(Time,rootMOOPF3) -legend('rootMOOP1') - -figure -title('PitComIPC') -hold on -plot(db.Time,db.PitComF1) -% plot(Time,PitComIPCF2) -% plot(Time,PitComIPCF3) -legend('PitComIPCF1') -% -figure -title('WindVelocity') -hold on -plot(db.Time,db.HorWindV) -legend('HorWindV') - -% figure -% title('PitComT') -% hold on -% plot(Time,PitComT1) -% plot(Time,PitComT2) -% plot(Time,PitComT3) -% legend('PitComT1','PitComT2','PitComT3') -% -% figure -% title('PitRate') -% hold on -% plot(Time,PitRate1) -% plot(Time,PitRate2) -% plot(Time,PitRate3) -% legend('PitRate1','PiRate2','PitRate3') -% -% figure -% title('PitCom') -% hold on -% plot(Time,PitCom1) -% plot(Time,PitCom2) -% plot(Time,PitCom3) -% legend('PitCom1','PitCom2','PitCom3') -% -% figure -% title('Measured yaw error') -% hold on -% plot(db.Time,db.MErr) -% plot(db.Time,db.ErrLPFFast) -% plot(db.Time,db.ErrLPFSlow) -% plot(db.Time,rad2deg(avrSWAP(:,37))) -% legend('MErr','ErrLPFFast','ErrLPFSlow','Turibine yaw') -% -% figure -% title('Integral of fast yaw error') -% hold on -% grid on -% plot(db.Time,db.ErrLPFFast) -% plot(db.Time,db.Y_AccErr) -% legend('ErrLPFFast','AccErr') - -% figure -% title('Yaw Rate') -% hold on -% grid on -% plot(db.Time,avrSWAP(:,48)) -% legend('Yaw Rate') - -% figure -% title('YawTorque') -% hold on -% grid on -% plot(avrTime,avrSWAP(:,41)) -% legend('YawTorque') -% -% figure -% title('Yaw end time') -% hold on -% plot(db.Time,db.Y_YawEndT) -% plot(db.Time,db.Time) -% legend('YawEndT','Time') +%% PlotDebugData +% Imports and plots data from dbg and dbg2 files + +%% Cleaning +close all +clearvars +clc + +%% Settings +% set timeStamp (format: YYYY_MM_DD_TTTT or 2017_01_01_1200) to the test +% directory you want to import and plot +timeStamp = '2017_08_17_1448'; +% Run the CompileRunAndDebug.cmd file from this matlab script +runCmdFromHere = false; + +%% Loading +totalTime = tic; +if(runCmdFromHere) % Run CompileRunAndDebug.cmd and get the correct folder + + [~,output] = dos('CompileRunAndDebug.cmd', '-echo'); + i = strfind(output,'C:'); + i = i(end); + debugFolder = [output(i:end-1) '\']; + clearvars output TimeStamp + +else % otherwise get the debugfolder with the manual timestamp + + debugFolder = [timeStamp '\']; + clearvars d order + +end + +% Import data from Test18.out and put in the debug structure +dbRaw = dlmread([debugFolder 'Test18.SrvD.dbg'],'\t',8,0); +[~,vars] = size(dbRaw); + +fid = fopen([debugFolder 'Test18.SrvD.dbg']); +header = textscan(fid,'%s','delimiter','\t'); +fclose(fid); + +header = strtrim(header{1,1}(1:vars)); +for i = 1:vars + db.(header{i}) = dbRaw(:,i); +end + +% Import avrSWAP debug file + avrSWAP = dlmread([debugFolder 'Test18.SrvD.dbg2'],'\t',8,0); + avrTime = avrSWAP(:,1); + avrSWAP = avrSWAP(:,2:end); + + +%% Plotting +figure +title('GenSpeed') +hold on +plot(db.Time,db.GenSpeed) +plot(db.Time,db.GenSpeedF) +legend('GenSpeed','GenSpeedF') +ylabel('Speed [rpm]') + +figure +title('GenTorque') +hold on +plot(avrTime,avrSWAP(:,47)) + +% figure +% title('Pitch') +% hold on +% subplot(2,1,1), plot(Time,PitCom1) +% legend('PitCom1') +% subplot(2,1,2), plot(Time,PitRate1) +% legend('PitRate1') +% +figure +title('Pitch') +hold on +plot(db.Time,db.PitCom1) +% plot(Time,PitRate1) +plot(db.Time,db.BlPitch1) +plot(db.Time,db.PitComT1) +% plot(Time,PitComT) +% plot(Time,GenTrq) +legend('PitCom1','BlPitch1','PitComT') + +figure +title('rootMOOP') +hold on +plot(db.Time,db.rootMOOP1) +% plot(Time,rootMOOPF1) +% plot(Time,rootMOOP2) +% % plot(Time,rootMOOPF2) +% plot(Time,rootMOOP3) +% plot(Time,rootMOOPF3) +legend('rootMOOP1') + +figure +title('PitComIPC') +hold on +plot(db.Time,db.PitComF1) +% plot(Time,PitComIPCF2) +% plot(Time,PitComIPCF3) +legend('PitComIPCF1') +% +figure +title('WindVelocity') +hold on +plot(db.Time,db.HorWindV) +legend('HorWindV') + +% figure +% title('PitComT') +% hold on +% plot(Time,PitComT1) +% plot(Time,PitComT2) +% plot(Time,PitComT3) +% legend('PitComT1','PitComT2','PitComT3') +% +% figure +% title('PitRate') +% hold on +% plot(Time,PitRate1) +% plot(Time,PitRate2) +% plot(Time,PitRate3) +% legend('PitRate1','PiRate2','PitRate3') +% +% figure +% title('PitCom') +% hold on +% plot(Time,PitCom1) +% plot(Time,PitCom2) +% plot(Time,PitCom3) +% legend('PitCom1','PitCom2','PitCom3') +% +% figure +% title('Measured yaw error') +% hold on +% plot(db.Time,db.MErr) +% plot(db.Time,db.ErrLPFFast) +% plot(db.Time,db.ErrLPFSlow) +% plot(db.Time,rad2deg(avrSWAP(:,37))) +% legend('MErr','ErrLPFFast','ErrLPFSlow','Turibine yaw') +% +% figure +% title('Integral of fast yaw error') +% hold on +% grid on +% plot(db.Time,db.ErrLPFFast) +% plot(db.Time,db.Y_AccErr) +% legend('ErrLPFFast','AccErr') + +% figure +% title('Yaw Rate') +% hold on +% grid on +% plot(db.Time,avrSWAP(:,48)) +% legend('Yaw Rate') + +% figure +% title('YawTorque') +% hold on +% grid on +% plot(avrTime,avrSWAP(:,41)) +% legend('YawTorque') +% +% figure +% title('Yaw end time') +% hold on +% plot(db.Time,db.Y_YawEndT) +% plot(db.Time,db.Time) +% legend('YawEndT','Time') diff --git a/Debug/saveFigs.m b/#Archive/Debug/saveFigs.m similarity index 97% rename from Debug/saveFigs.m rename to #Archive/Debug/saveFigs.m index c13265d6..a814e9a7 100644 --- a/Debug/saveFigs.m +++ b/#Archive/Debug/saveFigs.m @@ -1,10 +1,10 @@ -%% saveFigs -% Saves all current figures. Can only be used after plotData is excecuted. -% Same code as in plotData, used so it can easily be executed from the -% command window. - figArray=findall(0,'type','figure'); - for i = 1:length(figArray) - figure(figArray(i).Number) - saveas(figArray(i),[debugFolder 'fig' get(get(gca,'title'),'string') '.fig']); - end +%% saveFigs +% Saves all current figures. Can only be used after plotData is excecuted. +% Same code as in plotData, used so it can easily be executed from the +% command window. + figArray=findall(0,'type','figure'); + for i = 1:length(figArray) + figure(figArray(i).Number) + saveas(figArray(i),[debugFolder 'fig' get(get(gca,'title'),'string') '.fig']); + end disp(['Saved all figures to ' debugFolder(1:end-1)]); \ No newline at end of file diff --git a/README.docx b/#Archive/README.docx similarity index 100% rename from README.docx rename to #Archive/README.docx diff --git a/.gitignore b/.gitignore index 84be9d34..6b411484 100644 --- a/.gitignore +++ b/.gitignore @@ -4,6 +4,7 @@ Source/Obj_win32 *.mod Source/x64/ Source/Release/ +#Archive/ Scripts/CompileDISCONHereCopyRun\.cmd diff --git a/DISCON/DISCON_gwin32.dll b/DISCON/DISCON_gwin32.dll deleted file mode 100644 index e3f9f939..00000000 Binary files a/DISCON/DISCON_gwin32.dll and /dev/null differ diff --git a/DISCON/DISCON_gwin64.dll b/DISCON/DISCON_gwin64.dll deleted file mode 100644 index 1ffef85d..00000000 Binary files a/DISCON/DISCON_gwin64.dll and /dev/null differ diff --git a/bin/DISCON_x64.dll b/bin/DISCON_x64.dll new file mode 100644 index 00000000..dce78645 Binary files /dev/null and b/bin/DISCON_x64.dll differ diff --git a/bin/DISCON_x86.dll b/bin/DISCON_x86.dll new file mode 100644 index 00000000..37454609 Binary files /dev/null and b/bin/DISCON_x86.dll differ diff --git a/bin/Readme.txt b/bin/Readme.txt new file mode 100644 index 00000000..4e95c9e1 --- /dev/null +++ b/bin/Readme.txt @@ -0,0 +1,2 @@ +In order to use the compiled version of the DRC, install the "Redistributable Libraries for 32- and 64-bit msi files for the IntelĀ® Parallel Studio XE Composer Edition for Fortran" first: +https://software.intel.com/sites/default/files/managed/01/70/ww_ifort_redist_msi_2017.1.143.zip \ No newline at end of file