From 76dbc0563a6250635144d6be4f5618187316697c Mon Sep 17 00:00:00 2001
From: ignis <ignis@postech.ac.kr>
Date: Sat, 1 Feb 2020 09:02:11 +0900
Subject: [PATCH] update arguments in itape.py and removed redundant lines

---
 code/sample/itape.py | 92 ++++++++++++++++++++++----------------------
 1 file changed, 47 insertions(+), 45 deletions(-)

diff --git a/code/sample/itape.py b/code/sample/itape.py
index e52fb6e..c611ed9 100644
--- a/code/sample/itape.py
+++ b/code/sample/itape.py
@@ -4,32 +4,53 @@ import os, sys
 
 import argparse
 
+from pprint import pprint
+
 parser = argparse.ArgumentParser()
 file_parser = argparse.ArgumentParser()
 
-param_dict = {
-"nx"		:512,
-"l_0"		:4.,
-"int_pr"	:400,
-"tar_lo"	:0.60,
-"dt"		:0.001,
-"sc"		:0.75,
-"vis"		:0.020,
-"pre"		:2.10E+4,
-"ac"		:26.7,
-"bc"		:3.,
-"u0"		:0.21,
-"tf"		:100.,
-"dt_uf"		:0.4,
-"ctmp"		:0.,
-"c_cut"		:0.001,
-"c_ref"		:0.01,
-"min_wr"	:0.,
-"prof_wr"	:1.0,
-"rvis"		:1.0,
-"cstar"		:1.0,
-"sigw"		:100.0,
-}
+# Default values for all parameters
+raw_defaults = (
+'''\
+nx        512
+l_0       4.
+int_pr    400
+tar_lo    0.60
+dt        0.0005
+sc        0.75
+vis       0.020
+pre       2.10E+4
+ac        26.7
+bc        3.
+u0        0.21
+tf        100.
+dt_uf     0.4
+ctmp      0.
+c_cut     0.001
+c_ref     0.01
+min_wr    0.
+prof_wr   1.0
+lewis     1.0
+lambda1   6.25E+4
+lambda2   318E+4
+beta1     5
+hrp       0.75
+le_a      1.
+le_x      0.20
+'''
+).split()
+
+ordered_args = raw_defaults[::2]
+
+ordered_values = []
+for v in raw_defaults[1::2]:
+    try:
+        ordered_values.append(int(v))
+    except ValueError:
+        ordered_values.append(float(v))
+
+param_dict = dict(zip(ordered_args, ordered_values))
+
 
 file_parser.add_argument("--default", help="file containing override default values")
 
@@ -53,29 +74,10 @@ args = parser.parse_args(others)
 
 params = vars(args)
 
-itape = '''        nx     {0[nx]}
-       l_0     {0[l_0]}
-    int_pr     {0[int_pr]}
-    tar_lo     {0[tar_lo]}
-        dt     {0[dt]}
-        sc     {0[sc]}
-       vis     {0[vis]}
-       pre     {0[pre]}
-        ac     {0[ac]}
-        bc     {0[bc]}
-        u0     {0[u0]}
-        tf     {0[tf]}
-     dt_uf     {0[dt_uf]}
-      ctmp     {0[ctmp]}
-     c_cut     {0[c_cut]}
-     c_ref     {0[c_ref]}
-    min_wr     {0[min_wr]}
-   prof_wr     {0[prof_wr]}
-      rvis     {0[rvis]}
-     cstar     {0[cstar]}
-      sigw     {0[sigw]} '''
+line_new = '{:>12}     {}'
 
-print itape.format( params )
+for a in ordered_args:
+    print line_new.format(a, params[a])
 
 # for i in range(15,60,5):
     # with open("itape", 'w') as itape: