Changeset 2301

Timestamp:

02/22/22 17:09:19 (3 years ago)

Author:

jderouillat

Message:

Enable scalar mask in the test suite

Location:

XIOS/dev/dev_ym/XIOS_COUPLING/xios_test_suite/TEST_SUITE

Files:

• default_param.json (modified) (1 diff)
• iodef.xml (modified) (1 diff)
• step1.py (modified) (1 diff)
• test_grid_algo/user_param_advanced.json (modified) (1 diff)

XIOS/dev/dev_ym/XIOS_COUPLING/xios_test_suite/TEST_SUITE/default_param.json

@@ -4 +4 @@
     "DomMask": "false",
     "AxisMask": "false",
+    "ScalarMask": "none",
     "UseServer2": "false",
     "PctServer2": 50,

XIOS/dev/dev_ym/XIOS_COUPLING/xios_test_suite/TEST_SUITE/iodef.xml

@@ -10 +10 @@
       <variable id="domain_mask"> XIOS::DomMask </variable>
       <variable id="axis_mask"> XIOS::AxisMask </variable>
+      <variable id="scalar_mask"> true </variable>
+      <variable id="scalar_mask_type"> XIOS::ScalarMask </variable>
       <variable id="init_field2D"> rank </variable>
       <variable id="ni"> 36 </variable>

XIOS/dev/dev_ym/XIOS_COUPLING/xios_test_suite/TEST_SUITE/step1.py

@@ -7 +7 @@
 import copy
 
-param_list =       ["DomMask",    "AxisMask", "Domain", "UseServer2", "NumberClients", "NumberServers", "PctServer2", "Duration", "OneSided", "NonDistTran"]
-param_short_list = ["DomMask",    "AxisMask", "Dom",    "Srv2",       "NbClnt",        "NbSrv",         "PctSrv2",    "Duration", "OneSided", "NDtTr"]
+param_list =       ["DomMask",    "AxisMask", "ScalarMask", "Domain", "UseServer2", "NumberClients", "NumberServers", "PctServer2", "Duration", "OneSided", "NonDistTran"]
+param_short_list = ["DomMask",    "AxisMask", "ScaMask",    "Dom",    "Srv2",       "NbClnt",        "NbSrv",         "PctSrv2",    "Duration", "OneSided", "NDtTr"]
 
 mode=os.getenv("mode")

XIOS/dev/dev_ym/XIOS_COUPLING/xios_test_suite/TEST_SUITE/test_grid_algo/user_param_advanced.json

@@ -2 +2 @@
         {
                 "NumberServers": [2],
+                "ScalarMask": ["none", "sparse"],
                 "OneSided": ["false"]
         }