Commit 65bc195d authored by Sergey Kireev's avatar Sergey Kireev
Browse files

windows scripts updated

parent 07c4b2b5
...@@ -2,9 +2,9 @@ ...@@ -2,9 +2,9 @@
@set SRCDIR=../src @set SRCDIR=../src
@set TARGET=%SRCDIR%/nle.exe @set TARGET=%SRCDIR%/nle.exe
@%CXX_PATH%\g++ -std=c++17 -O3 -march=native -I%SRCDIR% -o %TARGET% %SRCDIR%/main.cpp %SRCDIR%/param.cpp @"%CXX_PATH%\g++" -std=c++17 -O3 -march=native -I%SRCDIR% -o %TARGET% %SRCDIR%/main.cpp %SRCDIR%/param.cpp
@if exist %TARGET% ( echo Build done! ) else ( echo Build failed! ) @if exist %TARGET% ( echo Build done! ) else ( echo Build failed! )
@%GNUPLOT_PATH%\gnuplot.exe -e "" @"%GNUPLOT_PATH%\gnuplot" -e ""
@if %errorlevel% equ 0 ( echo gnuplot check OK! ) else ( echo gnuplot check failed! ) @if %errorlevel% equ 0 ( echo gnuplot check OK! ) else ( echo gnuplot check failed! )
...@@ -35,11 +35,11 @@ copy parameters.bat %name% >NUL ...@@ -35,11 +35,11 @@ copy parameters.bat %name% >NUL
move %file_to_load% %name%\ >NUL move %file_to_load% %name%\ >NUL
rem Run simulation rem Run simulation
%executable% -nx %nx% -ny %ny% -nt %nt% -nts %nts% -ntp %ntp% -nsize %nsize% -%cell% ^ "%executable%" -nx %nx% -ny %ny% -nt %nt% -nts %nts% -ntp %ntp% -nsize %nsize% -%cell% ^
-en %en% -el %el% -enl %enl% -kt %kt% -mu %mu% -evap %evap% -cond %cond% -g %pgroup% ^ -en %en% -el %el% -enl %enl% -kt %kt% -mu %mu% -evap %evap% -cond %cond% -g %pgroup% ^
-ipn %ipn% -ipl %ipl% -ipe %ipe% -ofp %prefix% -ofs %suffix% ^ -ipn %ipn% -ipl %ipl% -ipe %ipe% -ofp %prefix% -ofs %suffix% ^
-load %name%/%file_to_load% -it %initial_step% ^ -load %name%/%file_to_load% -it %initial_step% ^
%nle_args% %nle_args%
if %errorlevel% neq 0 ( if %errorlevel% neq 0 (
move %name%/%file_to_load% %file_to_load% move %name%/%file_to_load% %file_to_load%
echo Error! echo Error!
...@@ -47,11 +47,11 @@ if %errorlevel% neq 0 ( ...@@ -47,11 +47,11 @@ if %errorlevel% neq 0 (
) )
echo Making gif... echo Making gif...
gnuplot -e "nx=%nx%; ny=%ny%; nt=%nt%; nts=%nts%; nt0=%initial_step%; prefix=\"%prefix%\"; suffix=\"%suffix%\"; title=\"%pic_title%\"; sx=%pic_size_x%; sy=%pic_size_y%; colorn=\"%colorN%\"; colorl=\"%colorL%\"; colore=\"%colorE%\"" %script_gif% "%GNUPLOT_PATH%\gnuplot" -e "nx=%nx%; ny=%ny%; nt=%nt%; nts=%nts%; nt0=%initial_step%; prefix=\"%prefix%\"; suffix=\"%suffix%\"; title=\"%pic_title%\"; sx=%pic_size_x%; sy=%pic_size_y%; colorn=\"%colorN%\"; colorl=\"%colorL%\"; colore=\"%colorE%\"" %script_gif%
move %prefix%.gif %name%/%name%.gif >NUL move %prefix%.gif %name%/%name%.gif >NUL
echo Making png... echo Making png...
gnuplot -e "nx=%nx%; ny=%ny%; nt=%nt%; nts=%nts%; nt0=%initial_step%; prefix=\"%prefix%\"; suffix=\"%suffix%\"; title=\"%pic_title%\"; sx=%pic_size_x%; sy=%pic_size_y%; colorn=\"%colorN%\"; colorl=\"%colorL%\"; colore=\"%colorE%\"" %script_png% "%GNUPLOT_PATH%\gnuplot" -e "nx=%nx%; ny=%ny%; nt=%nt%; nts=%nts%; nt0=%initial_step%; prefix=\"%prefix%\"; suffix=\"%suffix%\"; title=\"%pic_title%\"; sx=%pic_size_x%; sy=%pic_size_y%; colorn=\"%colorN%\"; colorl=\"%colorL%\"; colore=\"%colorE%\"" %script_png%
if not exist %name%\png mkdir %name%\png if not exist %name%\png mkdir %name%\png
move *.png %name%/png >NUL move *.png %name%/png >NUL
......
...@@ -19,11 +19,11 @@ if not exist %name% ( ...@@ -19,11 +19,11 @@ if not exist %name% (
cd %name%\dat cd %name%\dat
echo Making gif... echo Making gif...
gnuplot -e "nx=%nx%; ny=%ny%; nt=%nt%; nts=%nts%; nt0=%initial_step%; prefix=\"%prefix%\"; suffix=\"%suffix%\"; title=\"%pic_title%\"; sx=%pic_size_x%; sy=%pic_size_y%; colorn=\"%colorN%\"; colorl=\"%colorL%\"; colore=\"%colorE%\"" ..\..\%script_gif% "%GNUPLOT_PATH%\gnuplot" -e "nx=%nx%; ny=%ny%; nt=%nt%; nts=%nts%; nt0=%initial_step%; prefix=\"%prefix%\"; suffix=\"%suffix%\"; title=\"%pic_title%\"; sx=%pic_size_x%; sy=%pic_size_y%; colorn=\"%colorN%\"; colorl=\"%colorL%\"; colore=\"%colorE%\"" ..\..\%script_gif%
move %prefix%.gif ..\%name%.gif >NUL move %prefix%.gif ..\%name%.gif >NUL
echo Making png... echo Making png...
gnuplot -e "nx=%nx%; ny=%ny%; nt=%nt%; nts=%nts%; nt0=%initial_step%; prefix=\"%prefix%\"; suffix=\"%suffix%\"; title=\"%pic_title%\"; sx=%pic_size_x%; sy=%pic_size_y%; colorn=\"%colorN%\"; colorl=\"%colorL%\"; colore=\"%colorE%\"" ..\..\%script_png% "%GNUPLOT_PATH%\gnuplot" -e "nx=%nx%; ny=%ny%; nt=%nt%; nts=%nts%; nt0=%initial_step%; prefix=\"%prefix%\"; suffix=\"%suffix%\"; title=\"%pic_title%\"; sx=%pic_size_x%; sy=%pic_size_y%; colorn=\"%colorN%\"; colorl=\"%colorL%\"; colore=\"%colorE%\"" ..\..\%script_png%
if not exist ..\png mkdir ..\png if not exist ..\png mkdir ..\png
move *.png ..\png >NUL move *.png ..\png >NUL
......
...@@ -21,11 +21,11 @@ if not exist %name% ( ...@@ -21,11 +21,11 @@ if not exist %name% (
cd %name%\dat cd %name%\dat
echo Making gif... echo Making gif...
gnuplot -e "nx=%nx%; ny=%ny%; nt=%nt%; nts=%nts%; nt0=%initial_step%; prefix=\"%prefix%\"; suffix=\"%suffix%\"; title=\"%pic_title%\"; sx=%pic_size_x%; sy=%pic_size_y%; colorn=\"%colorN%\"; colorl=\"%colorL%\"; colore=\"%colorE%\"; defaultpalette=1" ..\..\%script_gif% "%GNUPLOT_PATH%\gnuplot" -e "nx=%nx%; ny=%ny%; nt=%nt%; nts=%nts%; nt0=%initial_step%; prefix=\"%prefix%\"; suffix=\"%suffix%\"; title=\"%pic_title%\"; sx=%pic_size_x%; sy=%pic_size_y%; colorn=\"%colorN%\"; colorl=\"%colorL%\"; colore=\"%colorE%\"; defaultpalette=1" ..\..\%script_gif%
move %prefix%.gif ..\%name%.group.gif >NUL move %prefix%.gif ..\%name%.group.gif >NUL
echo Making png... echo Making png...
gnuplot -e "nx=%nx%; ny=%ny%; nt=%nt%; nts=%nts%; nt0=%initial_step%; prefix=\"%prefix%\"; suffix=\"%suffix%\"; title=\"%pic_title%\"; sx=%pic_size_x%; sy=%pic_size_y%; colorn=\"%colorN%\"; colorl=\"%colorL%\"; colore=\"%colorE%\"; defaultpalette=1" ..\..\%script_png% "%GNUPLOT_PATH%\gnuplot" -e "nx=%nx%; ny=%ny%; nt=%nt%; nts=%nts%; nt0=%initial_step%; prefix=\"%prefix%\"; suffix=\"%suffix%\"; title=\"%pic_title%\"; sx=%pic_size_x%; sy=%pic_size_y%; colorn=\"%colorN%\"; colorl=\"%colorL%\"; colore=\"%colorE%\"; defaultpalette=1" ..\..\%script_png%
if not exist ..\png.group mkdir ..\png.group if not exist ..\png.group mkdir ..\png.group
move *.png ..\png.group >NUL move *.png ..\png.group >NUL
......
...@@ -62,7 +62,7 @@ rem Picture title ...@@ -62,7 +62,7 @@ rem Picture title
set pic_title=e_n=%en% e_{nl}=%enl% e_l=%el% Step: set pic_title=e_n=%en% e_{nl}=%enl% e_l=%el% Step:
rem Directories rem Directories
set executable="../../src/nle.exe" set executable=../../src/nle
set gnuplot_scripts_dir=../../scripts/gnuplot set gnuplot_scripts_dir=../../scripts/gnuplot
......
...@@ -21,21 +21,21 @@ mkdir %name% ...@@ -21,21 +21,21 @@ mkdir %name%
copy parameters.bat %name% >NUL copy parameters.bat %name% >NUL
rem Run simulation rem Run simulation
%executable% -nx %nx% -ny %ny% -nt %nt% -nts %nts% -ntp %ntp% -nsize %nsize% -%cell% ^ "%executable%" -nx %nx% -ny %ny% -nt %nt% -nts %nts% -ntp %ntp% -nsize %nsize% -%cell% ^
-en %en% -el %el% -enl %enl% -kt %kt% -mu %mu% -evap %evap% -cond %cond% -g %pgroup% ^ -en %en% -el %el% -enl %enl% -kt %kt% -mu %mu% -evap %evap% -cond %cond% -g %pgroup% ^
-ipn %ipn% -ipl %ipl% -ipe %ipe% -ofp %prefix% -ofs %suffix% ^ -ipn %ipn% -ipl %ipl% -ipe %ipe% -ofp %prefix% -ofs %suffix% ^
%nle_args% %nle_args%
if %errorlevel% neq 0 ( if %errorlevel% neq 0 (
echo Error! echo Error!
exit exit
) )
echo Making gif... echo Making gif...
gnuplot -e "nx=%nx%; ny=%ny%; nt=%nt%; nts=%nts%; nt0=0; prefix=\"%prefix%\"; suffix=\"%suffix%\"; title=\"%pic_title%\"; sx=%pic_size_x%; sy=%pic_size_y%; colorn=\"%colorN%\"; colorl=\"%colorL%\"; colore=\"%colorE%\"" %script_gif% "%GNUPLOT_PATH%\gnuplot" -e "nx=%nx%; ny=%ny%; nt=%nt%; nts=%nts%; nt0=0; prefix=\"%prefix%\"; suffix=\"%suffix%\"; title=\"%pic_title%\"; sx=%pic_size_x%; sy=%pic_size_y%; colorn=\"%colorN%\"; colorl=\"%colorL%\"; colore=\"%colorE%\"" %script_gif%
move %prefix%.gif %name%/%name%.gif >NUL move %prefix%.gif %name%/%name%.gif >NUL
echo Making png... echo Making png...
gnuplot -e "nx=%nx%; ny=%ny%; nt=%nt%; nts=%nts%; nt0=0; prefix=\"%prefix%\"; suffix=\"%suffix%\"; title=\"%pic_title%\"; sx=%pic_size_x%; sy=%pic_size_y%; colorn=\"%colorN%\"; colorl=\"%colorL%\"; colore=\"%colorE%\"" %script_png% "%GNUPLOT_PATH%\gnuplot" -e "nx=%nx%; ny=%ny%; nt=%nt%; nts=%nts%; nt0=0; prefix=\"%prefix%\"; suffix=\"%suffix%\"; title=\"%pic_title%\"; sx=%pic_size_x%; sy=%pic_size_y%; colorn=\"%colorN%\"; colorl=\"%colorL%\"; colore=\"%colorE%\"" %script_png%
if not exist %name%\png mkdir %name%\png if not exist %name%\png mkdir %name%\png
move *.png %name%/png >NUL move *.png %name%/png >NUL
......
rem Please, set proper paths here. @rem Please, set proper paths here.
rem Path to g++.exe @rem Path to g++.exe
@set CXX_PATH="C:\mingw64\bin" @set CXX_PATH=C:\mingw64\bin
rem Path to gnuplot.exe @rem Path to gnuplot.exe
@set GNUPLOT_PATH="C:\Program Files\gnuplot\bin" @set GNUPLOT_PATH=C:\Program Files\gnuplot\bin
@PATH=%PATH%;%CXX_PATH%;%GNUPLOT_PATH% @PATH=%PATH%;"%CXX_PATH%";"%GNUPLOT_PATH%"
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment