This was mistakenly pushed to NCAR/... instead of jmills/...

Revert "updating json namelists and starting refactor of conftest" This reverts commit a674c96.
NCAR · Jul 23, 2018 · f697373 · f697373
1 parent a674c96
commit f697373
Show file tree

Hide file tree

Showing 5 changed files with 190 additions and 99 deletions.
diff --git a/tests/conftest.py b/tests/conftest.py
@@ -1,4 +1,8 @@
+import json
+import pathlib
 import pytest
+import sys
+import warnings
 from wrfhydropy import *
 
 
@@ -49,107 +53,145 @@ def pytest_addoption(parser):
         default='gfort',
         required=False,
         action='store',
-        help='compiler, options are intel or gfort'
+        help='compiler key from config'
     )
 
     parser.addoption(
-        '--ncores',
-        default='2',
+        '--job_default',
+        default=None,
         required=False,
         action='store',
-        help='Number of cores to use for testing'
+        help='candidate job'
     )
 
     parser.addoption(
-        '--scheduler',
+        '--job_ncores',
         default=None,
         required=False,
         action='store',
-        help='Scheduler to use for testing, options are PBSCheyenne or do not specify for no '
-             'scheduler')
+        help='ncores job'
+    )
 
     parser.addoption(
-        '--account',
-        default='NRAL0017',
+        '--scheduler',
+        default=None,
         required=False,
         action='store',
-        help='Account number to use if using a scheduler.')
-
-def _make_sim(domain_dir,
-             source_dir,
-              configuration,
-              ncores,
-              scheduler,
-              account):
+        help='scheduler for all jobs')
+
+
+def pytest_generate_tests(metafunc):
+    if 'configuration' in metafunc.fixturenames:
+        metafunc.parametrize(
+            "configuration",
+            metafunc.config.option.config,
+            scope="session"
+        )
+
+
+@pytest.fixture(scope="session")
+def candidate_setup(request, configuration):
+
+    domain_dir = request.config.getoption("--domain_dir")
+    candidate_dir = request.config.getoption("--candidate_dir")
+
     # Candidate model
-    model = Model(
-        source_dir=source_dir,
+    candidate_model = WrfHydroModel(
+        source_dir=candidate_dir,
         model_config=configuration
     )
 
     # Candidate domain
-    domain = Domain(
+    domain = WrfHydroDomain(
         domain_top_dir=domain_dir,
-        domain_config=configuration)
-
-    # Job
-    exe_command = ('mpirun -np {0} ./wrf_hydro.exe').format(str(ncores))
-    job = Job(job_id='test_job',exe_cmd=exe_command)
+        domain_config=configuration,
+        model_version=candidate_model.version
+    )
 
-    # Candidate simulation
-    sim = Simulation()
-    sim.add(model)
-    sim.add(domain)
-    sim.add(job)
+    # Candidate setup
+    candidate_setup = WrfHydroSetup(candidate_model, domain)
 
-    if scheduler is not None and scheduler == 'pbscheyenne':
-        sim.add(schedulers.PBSCheyenne(account=account,nproc=int(ncores)))
+    return candidate_setup
 
-    return sim
 
 @pytest.fixture(scope="session")
-def candidate_setup(request):
+def reference_setup(request, configuration):
 
     domain_dir = request.config.getoption("--domain_dir")
-    candidate_dir = request.config.getoption("--candidate_dir")
-    configuration = request.config.getoption("--config")
-    ncores = request.config.getoption("--ncores")
-    scheduler = str(request.config.getoption("--scheduler")).lower()
-    account = request.config.getoption("--account")
+    reference_dir = request.config.getoption("--reference_dir")
 
-    candidate_sim = _make_sim(domain_dir = domain_dir,
-              source_dir= candidate_dir,
-              configuration=configuration,
-              ncores = ncores,
-              scheduler = scheduler,
-              account = account)
+    # Reference model
+    reference_model = WrfHydroModel(
+        source_dir=reference_dir,
+        model_config=configuration
+    )
+
+    # Reference domain
+    domain = WrfHydroDomain(
+        domain_top_dir=domain_dir,
+        domain_config=configuration,
+        model_version=reference_model.version
+    )
+
+    # Reference setup
+    reference_setup = WrfHydroSetup(reference_model, domain)
+
+    return reference_setup
 
-    return candidate_sim
 
 @pytest.fixture(scope="session")
-def reference_setup(request):
+def compiler(request):
+    return request.config.getoption("--compiler")
 
-    domain_dir = request.config.getoption("--domain_dir")
-    reference_dir = request.config.getoption("--reference_dir")
-    configuration = request.config.getoption("--config")
-    ncores = request.config.getoption("--ncores")
-    scheduler = str(request.config.getoption("--scheduler")).lower()
-    account = request.config.getoption("--account")
 
-    reference_sim = _make_sim(domain_dir = domain_dir,
-              source_dir= reference_dir,
-              configuration=configuration,
-              ncores = ncores,
-              scheduler = scheduler,
-              account = account)
+@pytest.fixture(scope="session")
+def job_default(request, configuration):
+    job_in = request.config.getoption("--job_default")
+    with warnings.catch_warnings():
+        warnings.simplefilter("ignore")
+        job_dum = Job(nproc=-1)
+    if job_in is not None:
+        job_in = json.loads(job_in)
+        job_dum.__dict__.update(job_in)
+    return job_dum
 
-    return reference_sim
 
 @pytest.fixture(scope="session")
-def output_dir(request):
-    configuration = request.config.getoption("--config")
-    output_dir = request.config.getoption("--output_dir")
+def job_ncores(request, configuration):
+    job_in = request.config.getoption("--job_ncores")
+    print("job_in: ", job_in)
+
+    with warnings.catch_warnings():
+        warnings.simplefilter("ignore")
+        job_dum = Job(nproc=-1)
+    if job_in is not None:
+        job_in = json.loads(job_in)
+        job_dum.__dict__.update(job_in)
+    return job_dum
 
+
+@pytest.fixture(scope="session")
+def scheduler(request, configuration):
+    sched_in = request.config.getoption("--scheduler")
+    if sched_in is None or sched_in == 'null':
+        return None
+    else:
+        sched = json.loads(sched_in)
+        sched_dum = Scheduler(
+            job_name='default',
+            account='DUMDUM',
+            walltime='00:01:00',
+            queue='none',
+            nproc=1,
+            ppn=1
+        )
+        sched_dum.__dict__.update(sched)
+        return sched_dum
+
+
+@pytest.fixture(scope="session")
+def output_dir(request,configuration):
+    output_dir = request.config.getoption("--output_dir")
     output_dir = pathlib.Path(output_dir)
     output_dir = output_dir / configuration
     if output_dir.is_dir() is False:

diff --git a/tests/test_1_fundamental.py b/tests/test_1_fundamental.py
@@ -1,7 +1,10 @@
 import copy
 import datetime as dt
+import json
 import pickle
 import pytest
+import shutil
+import time
 import warnings
 import wrfhydropy
 
@@ -17,7 +20,7 @@
 
 ###Compile questions compiler,
 def test_compile_candidate(
-    candidate_sim,
+    candidate_setup,
     output_dir,
     compiler,
     capsys
@@ -28,19 +31,19 @@ def test_compile_candidate(
     compile_dir = output_dir / 'compile_candidate'
 
     # Compile the model
-    candidate_sim.model.compile(
+    candidate_setup.model.compile(
         compiler=compiler,
         compile_dir=compile_dir,
         overwrite=True
     )
 
     # Check compilation status
-    assert candidate_sim.model.compile_log.returncode == 0, \
+    assert candidate_setup.model.compile_log.returncode == 0, \
         "Candidate code did not compile correctly."
 
 
 def test_compile_reference(
-    reference_sim,
+    reference_setup,
     output_dir,
     compiler,
     capsys
@@ -51,14 +54,14 @@ def test_compile_reference(
     compile_dir = output_dir / 'compile_reference'
 
     # Compile the model
-    reference_sim.model.compile(
+    reference_setup.model.compile(
         compiler=compiler,
         compile_dir=compile_dir,
         overwrite=True
     )
 
     # Check compilation status
-    assert reference_sim.model.compile_log.returncode == 0, \
+    assert reference_setup.model.compile_log.returncode == 0, \
         "Reference code did not compile correctly"
 
 

diff --git a/trunk/NDHMS/compile_options.json b/trunk/NDHMS/compile_options.json
@@ -1,5 +1,5 @@
 {
-    "nwm": {
+    "NWM": {
         "WRF_HYDRO": 1,
         "HYDRO_D": 0,
         "SPATIAL_SOIL": 1,
@@ -8,7 +8,7 @@
         "NCEP_WCOSS": 0,
         "WRF_HYDRO_NUDGING": 1
     },
-    "gridded": {
+    "Gridded": {
         "WRF_HYDRO": 1,
         "HYDRO_D": 0,
         "SPATIAL_SOIL": 1,
@@ -17,7 +17,7 @@
         "NCEP_WCOSS": 0,
         "WRF_HYDRO_NUDGING": 0
     },
-    "gridded_no_lakes": {
+    "Gridded_NO_LAKES": {
         "WRF_HYDRO": 1,
         "HYDRO_D": 0,
         "SPATIAL_SOIL": 1,
@@ -26,7 +26,7 @@
         "NCEP_WCOSS": 0,
         "WRF_HYDRO_NUDGING": 0
     },
-    "reach": {
+    "Reach": {
         "WRF_HYDRO": 1,
         "HYDRO_D": 0,
         "SPATIAL_SOIL": 1,

diff --git a/trunk/NDHMS/hrldas_namelists.json b/trunk/NDHMS/hrldas_namelists.json
@@ -21,7 +21,7 @@
             "rst_bi_in": 0,
             "rst_bi_out": 0,
             "runoff_option": 3,
-            "snow_albedo_option": 1,
+            "snow_albedo_option": 2,
             "soil_thick_input": [0.1, 0.3, 0.6, 1.0],
             "spatial_filename": "NULL_specified_in_domain.json",
             "split_output_count": 1,
@@ -41,36 +41,48 @@
             "forc_typ": "NULL_specified_in_domain.json"
         }
     },
-    "nwm_ana": {
+    "NWM_ana": {
         "noahlsm_offline": {},
         "wrf_hydro_offline": {}
     },
 
-    "nwm_short_range" : {
-        "noahlsm_offline": {},
+    "NWM_short_range" : {
+        "noahlsm_offline": {
+            "khour": 18,
+            "restart_frequency_hours": 600
+        },
         "wrf_hydro_offline": {}
     },
 
-    "nwm_medium_range" : {
-        "noahlsm_offline": {},
+    "NWM_medium_range" : {
+        "noahlsm_offline": {
+            "khour": 240,
+            "output_timestep": 10800,
+            "restart_frequency_hours": 6000
+        },
         "wrf_hydro_offline": {}
     },
 
-    "nwm_long_range" : {
-        "noahlsm_offline": {},
+    "NWM_long_range" : {
+        "noahlsm_offline": {
+            "forcing_timestep": 10800,
+            "khour": 720,
+            "output_timestep": 86400,
+            "restart_frequency_hours": 6000
+        },
         "wrf_hydro_offline": {}
     },
 
-    "nwm_channel_only" : {
+    "NWM_channel_only" : {
         "noahlsm_offline": {},
         "wrf_hydro_offline": {}
     },
 
-    "gridded": {
+    "Gridded": {
         "noahlsm_offline": {},
         "wrf_hydro_offline": {}
     },
-    "reach": {
+    "Reach": {
         "noahlsm_offline": {},
         "wrf_hydro_offline": {}
     }