update scaling test for draco

tests/DNS/test_scaling.py

@@ -12,7 +12,11 @@ def get_DNS_parameters(
         nprocesses = 1,
         output_on = False,
         cores_per_node = 16,
-        nparticles = int(1e5)):
+        nparticles = int(1e5),
+        environment = 'express',
+        minutes = '29',
+        no_submit = True):
+    assert (N in [1024, 2048, 4096])
     simname = (DNS_type + '{0:0>4d}'.format(N))
     if output_on:
         simname = DNS_type + simname
@@ -25,15 +29,14 @@ def get_DNS_parameters(
     work_dir = 'nn{0:0>4d}np{1}'.format(nnodes, nprocesses)
     if not output_on:
         class_name += '_no_output'
-    src_simname = 'N{0:0>4d}_kMeta2'.format(N)
-    src_iteration = -1
-    if N == 512:
-        src_iteration = 3072
+    src_dirname = '/draco/ptmp/clalescu/scaling'
+    src_simname = 'fb3_N{0:0>4d}_kMeta1.5'.format(N)
     if N == 1024:
-        src_iteration = 0x4000
+        src_iteration = 32*1024
     if N == 2048:
-        src_iteration = 0x6000
+        src_iteration = 20*1024
     if N == 4096:
+        src_simname = 'fb3_N2048x2_kMeta1.5'
         src_iteration = 0
     DNS_parameters = [
             class_name,
@@ -45,9 +48,8 @@ def get_DNS_parameters(
             '--niter_todo', '12',
             '--niter_out', '12',
             '--niter_stat', '3']
-    if src_iteration >= 0:
-        DNS_parameters += [
-            '--src-wd', 'database',
+    DNS_parameters += [
+            '--src-wd', src_dirname,
             '--src-simname', src_simname,
             '--src-iteration', '{0}'.format(src_iteration)]
     if DNS_type != 'A':
@@ -63,6 +65,8 @@ def get_DNS_parameters(
                 '--tracers0_neighbours', '{0}'.format(nneighbours),
                 '--tracers0_smoothness', '{0}'.format(smoothness),
                 '--particle-rand-seed', '2']
+    if no_submit:
+        DNS_parameters += ['--no-submit']
     return simname, work_dir, DNS_parameters
 
 def main():
@@ -86,18 +90,21 @@ def main():
     parser.add_argument(
             '--nnodes',
             type = int,
+            help = 'how many nodes to use',
             dest = 'nnodes',
             default = 1)
     parser.add_argument(
             '--nprocesses',
             type = int,
+            help = 'how many MPI processes to use',
             dest = 'nprocesses',
             default = 1)
     parser.add_argument(
             '--ncores',
             type = int,
+            help = 'how many cores there are per node',
             dest = 'ncores',
-            default = 4)
+            default = 40)
     parser.add_argument(
             '--output-on',
             action = 'store_true',