Commit 189a2b95 authored by Sergey Kireev's avatar Sergey Kireev
Browse files

cpp scripts modified

parent 1a50add8
......@@ -13,13 +13,13 @@ export cell="sqr8"
export nsize=3
# Array sizes
export nx=400
export ny=400
export nx=300
export ny=300
# Number of simulation steps
export nt=100000
export nt=100
# Steps between saving to file
export nts=1000
export nts=10
# Steps between printing output: ntp = default
# Model parameters
......@@ -46,8 +46,8 @@ export prefix="data"
export suffix=".dat"
# Picture size, pixels (1098,1098 for 500,500)
export pic_size_x=1098
export pic_size_y=1098
export pic_size_x=698
export pic_size_y=698
# Picture colors (https://www.google.ru/search?q=gnuplot+color+names)
export colorN=yellow
......@@ -80,7 +80,7 @@ export gnuplot_scripts_dir="../gnuplot"
export step=20
export min=0
export max=500
export max=40
export minl=${min}
export maxl=${max}
......
......@@ -16,15 +16,6 @@ if [ ! -d $name ]; then
exit
fi
# Set cell geometry
if [ "$cell" != "hex" ]; then
script_png="$scripts_dir/make_png_sqr.plt"
script_gif="$scripts_dir/make_gif_sqr.plt"
else
script_png="$scripts_dir/make_png_hex.plt"
script_gif="$scripts_dir/make_gif_hex.plt"
fi
cd ${name}/dat
echo "Making gif..."
......
......@@ -18,15 +18,6 @@ if [ ! -d $name ]; then
exit
fi
# Set cell geometry
if [ "$cell" != "hex" ]; then
script_png="$scripts_dir/make_png_sqr.plt"
script_gif="$scripts_dir/make_gif_sqr.plt"
else
script_png="$scripts_dir/make_png_hex.plt"
script_gif="$scripts_dir/make_gif_hex.plt"
fi
cd ${name}/dat
echo "Making gif..."
......
......@@ -5,32 +5,32 @@
#------------------------------------------------------------
# Additional program arguments
#export nle_args="-mgslog mgs.txt -sg"
#export nle_args="-sg -fd"
# Name of the run
export name="run01"
# Cell geometry: square/hex
export cell=square
# Array sizes
export nx=200
export ny=200
# Cell geometry: sqr4/sqr8/hex
export cell="sqr8"
# Nanocrystal size
export nsize=3
# Array sizes
export nx=300
export ny=300
# Number of simulation steps
export nt=100
export nt=10
# Steps between saving to file
export nts=1
# Steps between printing output
export ntp=10
export ntp=1
# Model parameters
export en=4.6
export el=1.0
export enl=1.2
export en=3.4
export enl=3.4
export el=2.8
export kt=1.0
export mu=-2.25
......@@ -39,7 +39,7 @@ export evap=0.0
export cond=0.0
# Probability of group movement
export pgroup=0.01
export pgroup=0.0
# Initial fraction of N,L,E
export ipn=0.4
......@@ -51,8 +51,8 @@ export prefix="data"
export suffix=".dat"
# Picture sizes, pixels
export pic_size_x=600
export pic_size_y=600
export pic_size_x=698
export pic_size_y=698
# Picture colors (https://www.google.ru/search?q=gnuplot+color+names)
export colorN=yellow
......@@ -60,8 +60,25 @@ export colorL="#b52000"
export colorE=black
# Picture title
export pic_title="e_l=${el} e_{nl}=${enl} e_n=${en} Step: "
export pic_title="e_n=${en} e_{nl}=${enl} e_l=${el} Step: "
# directories
export executable="../../src/nle"
export scripts_dir="../gnuplot"
export gnuplot_scripts_dir="../gnuplot"
################################################################################
if [[ "$cell" == "hex6" ]]; then cell="hex"; fi
if [[ "$cell" != "hex" ]] && [[ "$cell" != "sqr8" ]]; then
cell="sqr4"
fi
if [[ "$cell" == "sqr4" ]] || [[ "$cell" == "sqr8" ]]; then
script_gif="${gnuplot_scripts_dir}/make_gif_sqr.plt"
script_png="${gnuplot_scripts_dir}/make_png_sqr.plt"
else
script_gif="${gnuplot_scripts_dir}/make_gif_hex.plt"
script_png="${gnuplot_scripts_dir}/make_png_hex.plt"
fi
......@@ -16,16 +16,6 @@ if [ ! -x $executable ]; then
exit
fi
# Set cell geometry
if [ "$cell" != "hex" ]; then
cell="square"
script_png="$scripts_dir/make_png_sqr.plt"
script_gif="$scripts_dir/make_gif_sqr.plt"
else
script_png="$scripts_dir/make_png_hex.plt"
script_gif="$scripts_dir/make_gif_hex.plt"
fi
echo "Name: ${name}"
mkdir $name
......
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