Changeset 1713 for XIOS

Timestamp:

09/13/19 14:29:49 (5 years ago)

Author:

yushan

Message:

Generic_testcase : seperate param.def for generic_test_case.exe and all_param.def for the test

Location:

XIOS/dev/dev_trunk_omp

Files:

• GENERIC_TESTCASE/check.py (modified) (1 diff)
• GENERIC_TESTCASE/config.py (modified) (1 diff)
• GENERIC_TESTCASE/test_axis_algo/param.def (modified) (1 diff)
• GENERIC_TESTCASE/test_axis_algo/user_params.def (modified) (1 diff)
• GENERIC_TESTCASE/test_function/param.def (modified) (1 diff)
• src/test/generic_testcase.f90 (modified) (3 diffs)

XIOS/dev/dev_trunk_omp/GENERIC_TESTCASE/check.py

@@ -52 +52 @@
                 
                 os.system('cp param.def '+configName+'/setup/')
+                os.system('cp all_param.def '+configName+'/setup/')
                 os.system('cp iodef.xml '+configName+'/setup/')
                 os.system('cp context_atm.xml '+configName+'/setup/')

XIOS/dev/dev_trunk_omp/GENERIC_TESTCASE/config.py

@@ -10 +10 @@
 
         f.write("&params_run\n")
-        f.write('UsingServer2 = ' + UsingServer2 + '\n')
-        f.write('RatioServer2 = ' + repr(RatioServer2) + '\n')
-        f.write('NumberPoolsServer2 = ' + repr(NumberPoolsServer2) + '\n')
         f.write('nb_proc_atm = ' + repr(NumberClients) + '\n')
-        f.write('NumberServers = ' + repr(NumberServers) + '\n')
         f.write('duration = ' + repr(Duration) + '\n')
-        f.write('ATMdomain = ' + ATMdomain + '\n')
         f.write('/\n\n')
 
         f.close()
+
+
+        f=open("all_param.def", "w")
+
+        f.write("&params_run\n")
+        f.write('UsingServer2 = ' + repr(UsingServer2) + '\n')
+        f.write('RatioServer2 = ' + repr(RatioServer2) + '\n')
+        f.write('NumberPoolsServer2 = ' + repr(NumberPoolsServer2) + '\n')
+        f.write('NumberClients = ' + repr(NumberClients) + '\n')
+        f.write('NumberServers = ' + repr(NumberServers) + '\n')
+        f.write('Duration = ' + repr(Duration) + '\n')
+        f.write('ATMdomain = ' + repr(ATMdomain) + '\n')
+        f.write('/\n\n')
+
+        f.close()
+
 
         nb_proc = NumberClients+NumberServers

XIOS/dev/dev_trunk_omp/GENERIC_TESTCASE/test_axis_algo/param.def

@@ -1 +1 @@
 &params_run
-UsingServer2 = true
-RatioServer2 = 50
-NumberPoolsServer2 = 1
 nb_proc_atm = 8
-NumberServers = 4
 duration = '1d'
-ATMdomain = lmdz
 /
 

XIOS/dev/dev_trunk_omp/GENERIC_TESTCASE/test_axis_algo/user_params.def

@@ -12 +12 @@
 
 NumberServers = 2, 4
+ATMdomain='lmdz'
 UsingServer2 = 'false', 'true'
 # Duration = '1d', '2d'

XIOS/dev/dev_trunk_omp/GENERIC_TESTCASE/test_function/param.def

@@ -1 +1 @@
 &params_run
-UsingServer2 = true
-RatioServer2 = 50
-NumberPoolsServer2 = 1
 nb_proc_atm = 8
-NumberServers = 4
 duration = '1d'
-ATMdomain = lmdz
 /
 

XIOS/dev/dev_trunk_omp/src/test/generic_testcase.f90

@@ -11 +11 @@
   INTEGER :: nb_proc_oce
   INTEGER :: nb_proc_surf
-  INTEGER :: NumberPoolsServer2
-  LOGICAL :: UsingServer2
-  INTEGER :: RatioServer2
-  INTEGER :: NumberServers
   CHARACTER(LEN=len_str)  :: proc_distribution
   CHARACTER(LEN=len_str)  :: start_date
@@ -20 +16 @@
   DOUBLE PRECISION        :: sypd
   NAMELIST /params_run/    nb_proc_atm, nb_proc_surf, nb_proc_oce, & 
-                           duration, sypd, start_date, proc_distribution, NumberPoolsServer2, &
-                           UsingServer2, RatioServer2, NumberServers
+                           duration, sypd, start_date, proc_distribution
 
 
@@ -68 +63 @@
   start_date="2018-01-01"
   proc_distribution="contiguous"
-  NumberPoolsServer2=1
-  UsingServer2=.false.
-  RatioServer2=50
-  NumberServers=4
+  
   READ (unit, nml=params_run)
   CLOSE(unit)