diff --git a/coupledmodeldriver/generate/adcirc/configure.py b/coupledmodeldriver/generate/adcirc/configure.py index 7782f59a..136edc4f 100644 --- a/coupledmodeldriver/generate/adcirc/configure.py +++ b/coupledmodeldriver/generate/adcirc/configure.py @@ -307,16 +307,21 @@ def read_directory(cls, directory: PathLike) -> 'NEMSADCIRCRunConfiguration': else: raise FileNotFoundError(f'missing required configuration file "{filename}"') + driver, nems, slurm, adcirc = configurations + forcings = [] for configuration_class in cls.forcings: filename = directory / configuration_class.default_filename if filename.exists(): forcings.append(configuration_class.from_file(filename)) + nems['models'] = [entry.nemspy_entry for entry in (adcirc, *forcings) + if isinstance(entry, NEMSCapJSON)] + return cls.from_configurations( - driver=configurations[0], - nems=configurations[1], - slurm=configurations[2], - adcirc=configurations[3], + driver=driver, + nems=nems, + slurm=slurm, + adcirc=adcirc, forcings=forcings, ) diff --git a/setup.py b/setup.py index 7c6b9b17..3dd8fa1f 100644 --- a/setup.py +++ b/setup.py @@ -78,7 +78,7 @@ packages=find_packages(), python_requires='>=3.6', setup_requires=['dunamai', 'setuptools>=41.2'], - install_requires=['adcircpy>=1.0.28', 'nemspy>=0.6.13', 'numpy', 'requests'], + install_requires=['adcircpy>=1.0.29', 'nemspy>=0.6.13', 'numpy', 'requests'], extras_require={ 'testing': ['flake8', 'pytest', 'pytest-cov', 'wget'], 'development': ['oitnb'], diff --git a/tests/data/reference/adcirc/hera_shinnecock_ike/coldstart/fort.15 b/tests/data/reference/adcirc/hera_shinnecock_ike/coldstart/fort.15 index b3b97e49..e459b4f3 100644 --- a/tests/data/reference/adcirc/hera_shinnecock_ike/coldstart/fort.15 +++ b/tests/data/reference/adcirc/hera_shinnecock_ike/coldstart/fort.15 @@ -1,4 +1,4 @@ -created on 2021-04-07 17:49 ! RUNDES +created on 2021-04-08 11:21 ! RUNDES Shinacock Inlet Coarse Grid ! RUNID 1 ! NFOVER 1 ! NABOUT @@ -31,38 +31,38 @@ primitive_weighting_in_continuity_equation 0 ! CORI 8 ! NTIF Q1 -0.019256 6.49585E-05 0.695 1.14647 45.2841 +0.019256 6.49585E-05 0.695 1.1459 103.157 O1 -0.100514 6.75977E-05 0.695 1.14647 51.0784 +0.100514 6.75977E-05 0.695 1.1459 272.96 P1 -0.046843 7.25229E-05 0.706 1 322.487 +0.046843 7.25229E-05 0.706 1 131.152 K1 -0.141565 7.29212E-05 0.736 1.09047 42.801 +0.141565 7.29212E-05 0.736 1.09012 234.173 N2 -0.046398 0.00013788 0.693 0.972523 90.2443 +0.046398 0.00013788 0.693 0.972665 339.505 M2 -0.242334 0.000140519 0.693 0.972523 96.0386 +0.242334 0.000140519 0.693 0.972665 149.308 S2 0.112841 0.000145444 0.693 1 0 K2 -0.030704 0.000145842 0.693 1.23912 266.15 +0.030704 0.000145842 0.693 1.23794 288.895 8 Q1 -6.49585E-05 1.14647 45.2841 +6.49585E-05 1.1459 103.157 O1 -6.75977E-05 1.14647 51.0784 +6.75977E-05 1.1459 272.96 P1 -7.25229E-05 1 322.487 +7.25229E-05 1 131.152 K1 -7.29212E-05 1.09047 42.801 +7.29212E-05 1.09012 234.173 N2 -0.00013788 0.972523 90.2443 +0.00013788 0.972665 339.505 M2 -0.000140519 0.972523 96.0386 +0.000140519 0.972665 149.308 S2 0.000145444 1 0 K2 -0.000145842 1.23912 266.15 +0.000145842 1.23794 288.895 Q1 1.13893401e-02 1.83698935e+02 1.21085823e-02 1.73352953e+02 diff --git a/tests/data/reference/adcirc/hera_shinnecock_ike/runs/test_case_1/fort.15 b/tests/data/reference/adcirc/hera_shinnecock_ike/runs/test_case_1/fort.15 index 5a78bd96..c81bc4d2 100644 --- a/tests/data/reference/adcirc/hera_shinnecock_ike/runs/test_case_1/fort.15 +++ b/tests/data/reference/adcirc/hera_shinnecock_ike/runs/test_case_1/fort.15 @@ -1,4 +1,4 @@ -created on 2021-04-07 17:50 ! RUNDES +created on 2021-04-08 11:21 ! RUNDES Shinacock Inlet Coarse Grid ! RUNID 1 ! NFOVER 1 ! NABOUT @@ -31,38 +31,38 @@ primitive_weighting_in_continuity_equation 0 ! CORI 8 ! NTIF Q1 -0.019256 6.49585E-05 0.695 1.14647 45.2841 +0.019256 6.49585E-05 0.695 1.1459 103.157 O1 -0.100514 6.75977E-05 0.695 1.14647 51.0784 +0.100514 6.75977E-05 0.695 1.1459 272.96 P1 -0.046843 7.25229E-05 0.706 1 322.487 +0.046843 7.25229E-05 0.706 1 131.152 K1 -0.141565 7.29212E-05 0.736 1.09047 42.801 +0.141565 7.29212E-05 0.736 1.09012 234.173 N2 -0.046398 0.00013788 0.693 0.972523 90.2443 +0.046398 0.00013788 0.693 0.972665 339.505 M2 -0.242334 0.000140519 0.693 0.972523 96.0386 +0.242334 0.000140519 0.693 0.972665 149.308 S2 0.112841 0.000145444 0.693 1 0 K2 -0.030704 0.000145842 0.693 1.23912 266.15 +0.030704 0.000145842 0.693 1.23794 288.895 8 Q1 -6.49585E-05 1.14647 45.2841 +6.49585E-05 1.1459 103.157 O1 -6.75977E-05 1.14647 51.0784 +6.75977E-05 1.1459 272.96 P1 -7.25229E-05 1 322.487 +7.25229E-05 1 131.152 K1 -7.29212E-05 1.09047 42.801 +7.29212E-05 1.09012 234.173 N2 -0.00013788 0.972523 90.2443 +0.00013788 0.972665 339.505 M2 -0.000140519 0.972523 96.0386 +0.000140519 0.972665 149.308 S2 0.000145444 1 0 K2 -0.000145842 1.23912 266.15 +0.000145842 1.23794 288.895 Q1 1.13893401e-02 1.83698935e+02 1.21085823e-02 1.73352953e+02 diff --git a/tests/data/reference/adcirc/local_shinnecock_ike/coldstart/fort.15 b/tests/data/reference/adcirc/local_shinnecock_ike/coldstart/fort.15 index b3b97e49..e459b4f3 100644 --- a/tests/data/reference/adcirc/local_shinnecock_ike/coldstart/fort.15 +++ b/tests/data/reference/adcirc/local_shinnecock_ike/coldstart/fort.15 @@ -1,4 +1,4 @@ -created on 2021-04-07 17:49 ! RUNDES +created on 2021-04-08 11:21 ! RUNDES Shinacock Inlet Coarse Grid ! RUNID 1 ! NFOVER 1 ! NABOUT @@ -31,38 +31,38 @@ primitive_weighting_in_continuity_equation 0 ! CORI 8 ! NTIF Q1 -0.019256 6.49585E-05 0.695 1.14647 45.2841 +0.019256 6.49585E-05 0.695 1.1459 103.157 O1 -0.100514 6.75977E-05 0.695 1.14647 51.0784 +0.100514 6.75977E-05 0.695 1.1459 272.96 P1 -0.046843 7.25229E-05 0.706 1 322.487 +0.046843 7.25229E-05 0.706 1 131.152 K1 -0.141565 7.29212E-05 0.736 1.09047 42.801 +0.141565 7.29212E-05 0.736 1.09012 234.173 N2 -0.046398 0.00013788 0.693 0.972523 90.2443 +0.046398 0.00013788 0.693 0.972665 339.505 M2 -0.242334 0.000140519 0.693 0.972523 96.0386 +0.242334 0.000140519 0.693 0.972665 149.308 S2 0.112841 0.000145444 0.693 1 0 K2 -0.030704 0.000145842 0.693 1.23912 266.15 +0.030704 0.000145842 0.693 1.23794 288.895 8 Q1 -6.49585E-05 1.14647 45.2841 +6.49585E-05 1.1459 103.157 O1 -6.75977E-05 1.14647 51.0784 +6.75977E-05 1.1459 272.96 P1 -7.25229E-05 1 322.487 +7.25229E-05 1 131.152 K1 -7.29212E-05 1.09047 42.801 +7.29212E-05 1.09012 234.173 N2 -0.00013788 0.972523 90.2443 +0.00013788 0.972665 339.505 M2 -0.000140519 0.972523 96.0386 +0.000140519 0.972665 149.308 S2 0.000145444 1 0 K2 -0.000145842 1.23912 266.15 +0.000145842 1.23794 288.895 Q1 1.13893401e-02 1.83698935e+02 1.21085823e-02 1.73352953e+02 diff --git a/tests/data/reference/adcirc/local_shinnecock_ike/runs/test_case_1/fort.15 b/tests/data/reference/adcirc/local_shinnecock_ike/runs/test_case_1/fort.15 index 297e7cd1..c81bc4d2 100644 --- a/tests/data/reference/adcirc/local_shinnecock_ike/runs/test_case_1/fort.15 +++ b/tests/data/reference/adcirc/local_shinnecock_ike/runs/test_case_1/fort.15 @@ -1,4 +1,4 @@ -created on 2021-04-07 17:49 ! RUNDES +created on 2021-04-08 11:21 ! RUNDES Shinacock Inlet Coarse Grid ! RUNID 1 ! NFOVER 1 ! NABOUT @@ -31,38 +31,38 @@ primitive_weighting_in_continuity_equation 0 ! CORI 8 ! NTIF Q1 -0.019256 6.49585E-05 0.695 1.14647 45.2841 +0.019256 6.49585E-05 0.695 1.1459 103.157 O1 -0.100514 6.75977E-05 0.695 1.14647 51.0784 +0.100514 6.75977E-05 0.695 1.1459 272.96 P1 -0.046843 7.25229E-05 0.706 1 322.487 +0.046843 7.25229E-05 0.706 1 131.152 K1 -0.141565 7.29212E-05 0.736 1.09047 42.801 +0.141565 7.29212E-05 0.736 1.09012 234.173 N2 -0.046398 0.00013788 0.693 0.972523 90.2443 +0.046398 0.00013788 0.693 0.972665 339.505 M2 -0.242334 0.000140519 0.693 0.972523 96.0386 +0.242334 0.000140519 0.693 0.972665 149.308 S2 0.112841 0.000145444 0.693 1 0 K2 -0.030704 0.000145842 0.693 1.23912 266.15 +0.030704 0.000145842 0.693 1.23794 288.895 8 Q1 -6.49585E-05 1.14647 45.2841 +6.49585E-05 1.1459 103.157 O1 -6.75977E-05 1.14647 51.0784 +6.75977E-05 1.1459 272.96 P1 -7.25229E-05 1 322.487 +7.25229E-05 1 131.152 K1 -7.29212E-05 1.09047 42.801 +7.29212E-05 1.09012 234.173 N2 -0.00013788 0.972523 90.2443 +0.00013788 0.972665 339.505 M2 -0.000140519 0.972523 96.0386 +0.000140519 0.972665 149.308 S2 0.000145444 1 0 K2 -0.000145842 1.23912 266.15 +0.000145842 1.23794 288.895 Q1 1.13893401e-02 1.83698935e+02 1.21085823e-02 1.73352953e+02 diff --git a/tests/data/reference/adcirc/stampede2_shinnecock_ike/coldstart/fort.15 b/tests/data/reference/adcirc/stampede2_shinnecock_ike/coldstart/fort.15 index 54e32c99..e459b4f3 100644 --- a/tests/data/reference/adcirc/stampede2_shinnecock_ike/coldstart/fort.15 +++ b/tests/data/reference/adcirc/stampede2_shinnecock_ike/coldstart/fort.15 @@ -1,4 +1,4 @@ -created on 2021-04-07 17:50 ! RUNDES +created on 2021-04-08 11:21 ! RUNDES Shinacock Inlet Coarse Grid ! RUNID 1 ! NFOVER 1 ! NABOUT @@ -31,38 +31,38 @@ primitive_weighting_in_continuity_equation 0 ! CORI 8 ! NTIF Q1 -0.019256 6.49585E-05 0.695 1.14647 45.2841 +0.019256 6.49585E-05 0.695 1.1459 103.157 O1 -0.100514 6.75977E-05 0.695 1.14647 51.0784 +0.100514 6.75977E-05 0.695 1.1459 272.96 P1 -0.046843 7.25229E-05 0.706 1 322.487 +0.046843 7.25229E-05 0.706 1 131.152 K1 -0.141565 7.29212E-05 0.736 1.09047 42.801 +0.141565 7.29212E-05 0.736 1.09012 234.173 N2 -0.046398 0.00013788 0.693 0.972523 90.2443 +0.046398 0.00013788 0.693 0.972665 339.505 M2 -0.242334 0.000140519 0.693 0.972523 96.0386 +0.242334 0.000140519 0.693 0.972665 149.308 S2 0.112841 0.000145444 0.693 1 0 K2 -0.030704 0.000145842 0.693 1.23912 266.15 +0.030704 0.000145842 0.693 1.23794 288.895 8 Q1 -6.49585E-05 1.14647 45.2841 +6.49585E-05 1.1459 103.157 O1 -6.75977E-05 1.14647 51.0784 +6.75977E-05 1.1459 272.96 P1 -7.25229E-05 1 322.487 +7.25229E-05 1 131.152 K1 -7.29212E-05 1.09047 42.801 +7.29212E-05 1.09012 234.173 N2 -0.00013788 0.972523 90.2443 +0.00013788 0.972665 339.505 M2 -0.000140519 0.972523 96.0386 +0.000140519 0.972665 149.308 S2 0.000145444 1 0 K2 -0.000145842 1.23912 266.15 +0.000145842 1.23794 288.895 Q1 1.13893401e-02 1.83698935e+02 1.21085823e-02 1.73352953e+02 diff --git a/tests/data/reference/adcirc/stampede2_shinnecock_ike/runs/test_case_1/fort.15 b/tests/data/reference/adcirc/stampede2_shinnecock_ike/runs/test_case_1/fort.15 index 5a78bd96..c81bc4d2 100644 --- a/tests/data/reference/adcirc/stampede2_shinnecock_ike/runs/test_case_1/fort.15 +++ b/tests/data/reference/adcirc/stampede2_shinnecock_ike/runs/test_case_1/fort.15 @@ -1,4 +1,4 @@ -created on 2021-04-07 17:50 ! RUNDES +created on 2021-04-08 11:21 ! RUNDES Shinacock Inlet Coarse Grid ! RUNID 1 ! NFOVER 1 ! NABOUT @@ -31,38 +31,38 @@ primitive_weighting_in_continuity_equation 0 ! CORI 8 ! NTIF Q1 -0.019256 6.49585E-05 0.695 1.14647 45.2841 +0.019256 6.49585E-05 0.695 1.1459 103.157 O1 -0.100514 6.75977E-05 0.695 1.14647 51.0784 +0.100514 6.75977E-05 0.695 1.1459 272.96 P1 -0.046843 7.25229E-05 0.706 1 322.487 +0.046843 7.25229E-05 0.706 1 131.152 K1 -0.141565 7.29212E-05 0.736 1.09047 42.801 +0.141565 7.29212E-05 0.736 1.09012 234.173 N2 -0.046398 0.00013788 0.693 0.972523 90.2443 +0.046398 0.00013788 0.693 0.972665 339.505 M2 -0.242334 0.000140519 0.693 0.972523 96.0386 +0.242334 0.000140519 0.693 0.972665 149.308 S2 0.112841 0.000145444 0.693 1 0 K2 -0.030704 0.000145842 0.693 1.23912 266.15 +0.030704 0.000145842 0.693 1.23794 288.895 8 Q1 -6.49585E-05 1.14647 45.2841 +6.49585E-05 1.1459 103.157 O1 -6.75977E-05 1.14647 51.0784 +6.75977E-05 1.1459 272.96 P1 -7.25229E-05 1 322.487 +7.25229E-05 1 131.152 K1 -7.29212E-05 1.09047 42.801 +7.29212E-05 1.09012 234.173 N2 -0.00013788 0.972523 90.2443 +0.00013788 0.972665 339.505 M2 -0.000140519 0.972523 96.0386 +0.000140519 0.972665 149.308 S2 0.000145444 1 0 K2 -0.000145842 1.23912 266.15 +0.000145842 1.23794 288.895 Q1 1.13893401e-02 1.83698935e+02 1.21085823e-02 1.73352953e+02 diff --git a/tests/data/reference/nems/hera_shinnecock_ike/coldstart/config.rc b/tests/data/reference/nems/hera_shinnecock_ike/coldstart/config.rc index 0b87bbee..61dc2650 100644 --- a/tests/data/reference/nems/hera_shinnecock_ike/coldstart/config.rc +++ b/tests/data/reference/nems/hera_shinnecock_ike/coldstart/config.rc @@ -1,2 +1,2 @@ -# `config.rc` generated with NEMSpy 1.2.6.post15.dev0+79ef4e6 +# `config.rc` generated with NEMSpy 1.2.8.post5.dev0+434c79d diff --git a/tests/data/reference/nems/hera_shinnecock_ike/coldstart/fort.15 b/tests/data/reference/nems/hera_shinnecock_ike/coldstart/fort.15 index 7cc1ae68..7fa90691 100644 --- a/tests/data/reference/nems/hera_shinnecock_ike/coldstart/fort.15 +++ b/tests/data/reference/nems/hera_shinnecock_ike/coldstart/fort.15 @@ -1,4 +1,4 @@ -created on 2021-04-07 17:27 ! RUNDES +created on 2021-04-08 11:18 ! RUNDES Shinacock Inlet Coarse Grid ! RUNID 1 ! NFOVER 1 ! NABOUT @@ -31,38 +31,38 @@ primitive_weighting_in_continuity_equation 0 ! CORI 8 ! NTIF Q1 -0.019256 6.49585E-05 0.695 1.14647 45.2841 +0.019256 6.49585E-05 0.695 1.1459 103.157 O1 -0.100514 6.75977E-05 0.695 1.14647 51.0784 +0.100514 6.75977E-05 0.695 1.1459 272.96 P1 -0.046843 7.25229E-05 0.706 1 322.487 +0.046843 7.25229E-05 0.706 1 131.152 K1 -0.141565 7.29212E-05 0.736 1.09047 42.801 +0.141565 7.29212E-05 0.736 1.09012 234.173 N2 -0.046398 0.00013788 0.693 0.972523 90.2443 +0.046398 0.00013788 0.693 0.972665 339.505 M2 -0.242334 0.000140519 0.693 0.972523 96.0386 +0.242334 0.000140519 0.693 0.972665 149.308 S2 0.112841 0.000145444 0.693 1 0 K2 -0.030704 0.000145842 0.693 1.23912 266.15 +0.030704 0.000145842 0.693 1.23794 288.895 8 Q1 -6.49585E-05 1.14647 45.2841 +6.49585E-05 1.1459 103.157 O1 -6.75977E-05 1.14647 51.0784 +6.75977E-05 1.1459 272.96 P1 -7.25229E-05 1 322.487 +7.25229E-05 1 131.152 K1 -7.29212E-05 1.09047 42.801 +7.29212E-05 1.09012 234.173 N2 -0.00013788 0.972523 90.2443 +0.00013788 0.972665 339.505 M2 -0.000140519 0.972523 96.0386 +0.000140519 0.972665 149.308 S2 0.000145444 1 0 K2 -0.000145842 1.23912 266.15 +0.000145842 1.23794 288.895 Q1 1.13893401e-02 1.83698935e+02 1.21085823e-02 1.73352953e+02 diff --git a/tests/data/reference/nems/hera_shinnecock_ike/coldstart/model_configure b/tests/data/reference/nems/hera_shinnecock_ike/coldstart/model_configure index 09be1f19..dc355c02 100644 --- a/tests/data/reference/nems/hera_shinnecock_ike/coldstart/model_configure +++ b/tests/data/reference/nems/hera_shinnecock_ike/coldstart/model_configure @@ -1,4 +1,4 @@ -# `model_configure` generated with NEMSpy 1.2.6.post15.dev0+79ef4e6 +# `model_configure` generated with NEMSpy 1.2.8.post5.dev0+434c79d total_member: 1 print_esmf: .true. namelist: atm_namelist diff --git a/tests/data/reference/nems/hera_shinnecock_ike/coldstart/nems.configure b/tests/data/reference/nems/hera_shinnecock_ike/coldstart/nems.configure index 91fdd08a..1b16e30e 100644 --- a/tests/data/reference/nems/hera_shinnecock_ike/coldstart/nems.configure +++ b/tests/data/reference/nems/hera_shinnecock_ike/coldstart/nems.configure @@ -1,4 +1,4 @@ -# `nems.configure` generated with NEMSpy 1.2.6.post15.dev0+79ef4e6 +# `nems.configure` generated with NEMSpy 1.2.8.post5.dev0+434c79d # EARTH # EARTH_component_list: OCN EARTH_attributes:: diff --git a/tests/data/reference/nems/hera_shinnecock_ike/config.rc.coldstart b/tests/data/reference/nems/hera_shinnecock_ike/config.rc.coldstart index 0b87bbee..61dc2650 100644 --- a/tests/data/reference/nems/hera_shinnecock_ike/config.rc.coldstart +++ b/tests/data/reference/nems/hera_shinnecock_ike/config.rc.coldstart @@ -1,2 +1,2 @@ -# `config.rc` generated with NEMSpy 1.2.6.post15.dev0+79ef4e6 +# `config.rc` generated with NEMSpy 1.2.8.post5.dev0+434c79d diff --git a/tests/data/reference/nems/hera_shinnecock_ike/config.rc.hotstart b/tests/data/reference/nems/hera_shinnecock_ike/config.rc.hotstart index 0b87bbee..62524df7 100644 --- a/tests/data/reference/nems/hera_shinnecock_ike/config.rc.hotstart +++ b/tests/data/reference/nems/hera_shinnecock_ike/config.rc.hotstart @@ -1,2 +1,5 @@ -# `config.rc` generated with NEMSpy 1.2.6.post15.dev0+79ef4e6 - +# `config.rc` generated with NEMSpy 1.2.8.post5.dev0+434c79d + atm_dir: input/shinnecock_ike/forcings + atm_nam: wind_atm_fin_ch_time_vec.nc + wav_dir: input/shinnecock_ike/forcings + wav_nam: ww3.Constant.20151214_sxy_ike_date.nc diff --git a/tests/data/reference/nems/hera_shinnecock_ike/model_configure.coldstart b/tests/data/reference/nems/hera_shinnecock_ike/model_configure.coldstart index 09be1f19..dc355c02 100644 --- a/tests/data/reference/nems/hera_shinnecock_ike/model_configure.coldstart +++ b/tests/data/reference/nems/hera_shinnecock_ike/model_configure.coldstart @@ -1,4 +1,4 @@ -# `model_configure` generated with NEMSpy 1.2.6.post15.dev0+79ef4e6 +# `model_configure` generated with NEMSpy 1.2.8.post5.dev0+434c79d total_member: 1 print_esmf: .true. namelist: atm_namelist diff --git a/tests/data/reference/nems/hera_shinnecock_ike/model_configure.hotstart b/tests/data/reference/nems/hera_shinnecock_ike/model_configure.hotstart index a53f8813..b9d20dc1 100644 --- a/tests/data/reference/nems/hera_shinnecock_ike/model_configure.hotstart +++ b/tests/data/reference/nems/hera_shinnecock_ike/model_configure.hotstart @@ -1,4 +1,4 @@ -# `model_configure` generated with NEMSpy 1.2.6.post15.dev0+79ef4e6 +# `model_configure` generated with NEMSpy 1.2.8.post5.dev0+434c79d total_member: 1 print_esmf: .true. namelist: atm_namelist diff --git a/tests/data/reference/nems/hera_shinnecock_ike/nems.configure.coldstart b/tests/data/reference/nems/hera_shinnecock_ike/nems.configure.coldstart index 91fdd08a..1b16e30e 100644 --- a/tests/data/reference/nems/hera_shinnecock_ike/nems.configure.coldstart +++ b/tests/data/reference/nems/hera_shinnecock_ike/nems.configure.coldstart @@ -1,4 +1,4 @@ -# `nems.configure` generated with NEMSpy 1.2.6.post15.dev0+79ef4e6 +# `nems.configure` generated with NEMSpy 1.2.8.post5.dev0+434c79d # EARTH # EARTH_component_list: OCN EARTH_attributes:: diff --git a/tests/data/reference/nems/hera_shinnecock_ike/nems.configure.hotstart b/tests/data/reference/nems/hera_shinnecock_ike/nems.configure.hotstart index edd6ac0b..7afa6d37 100644 --- a/tests/data/reference/nems/hera_shinnecock_ike/nems.configure.hotstart +++ b/tests/data/reference/nems/hera_shinnecock_ike/nems.configure.hotstart @@ -1,4 +1,4 @@ -# `nems.configure` generated with NEMSpy 1.2.6.post15.dev0+79ef4e6 +# `nems.configure` generated with NEMSpy 1.2.8.post5.dev0+434c79d # EARTH # EARTH_component_list: ATM WAV OCN EARTH_attributes:: diff --git a/tests/data/reference/nems/hera_shinnecock_ike/runs/test_case_1/config.rc b/tests/data/reference/nems/hera_shinnecock_ike/runs/test_case_1/config.rc index 0b87bbee..62524df7 100644 --- a/tests/data/reference/nems/hera_shinnecock_ike/runs/test_case_1/config.rc +++ b/tests/data/reference/nems/hera_shinnecock_ike/runs/test_case_1/config.rc @@ -1,2 +1,5 @@ -# `config.rc` generated with NEMSpy 1.2.6.post15.dev0+79ef4e6 - +# `config.rc` generated with NEMSpy 1.2.8.post5.dev0+434c79d + atm_dir: input/shinnecock_ike/forcings + atm_nam: wind_atm_fin_ch_time_vec.nc + wav_dir: input/shinnecock_ike/forcings + wav_nam: ww3.Constant.20151214_sxy_ike_date.nc diff --git a/tests/data/reference/nems/hera_shinnecock_ike/runs/test_case_1/fort.15 b/tests/data/reference/nems/hera_shinnecock_ike/runs/test_case_1/fort.15 index 950ea33d..4ffd694e 100644 --- a/tests/data/reference/nems/hera_shinnecock_ike/runs/test_case_1/fort.15 +++ b/tests/data/reference/nems/hera_shinnecock_ike/runs/test_case_1/fort.15 @@ -1,4 +1,4 @@ -created on 2021-04-07 17:27 ! RUNDES +created on 2021-04-08 11:18 ! RUNDES Shinacock Inlet Coarse Grid ! RUNID 1 ! NFOVER 1 ! NABOUT @@ -32,38 +32,38 @@ primitive_weighting_in_continuity_equation 0 ! CORI 8 ! NTIF Q1 -0.019256 6.49585E-05 0.695 1.14647 45.2841 +0.019256 6.49585E-05 0.695 1.1459 103.157 O1 -0.100514 6.75977E-05 0.695 1.14647 51.0784 +0.100514 6.75977E-05 0.695 1.1459 272.96 P1 -0.046843 7.25229E-05 0.706 1 322.487 +0.046843 7.25229E-05 0.706 1 131.152 K1 -0.141565 7.29212E-05 0.736 1.09047 42.801 +0.141565 7.29212E-05 0.736 1.09012 234.173 N2 -0.046398 0.00013788 0.693 0.972523 90.2443 +0.046398 0.00013788 0.693 0.972665 339.505 M2 -0.242334 0.000140519 0.693 0.972523 96.0386 +0.242334 0.000140519 0.693 0.972665 149.308 S2 0.112841 0.000145444 0.693 1 0 K2 -0.030704 0.000145842 0.693 1.23912 266.15 +0.030704 0.000145842 0.693 1.23794 288.895 8 Q1 -6.49585E-05 1.14647 45.2841 +6.49585E-05 1.1459 103.157 O1 -6.75977E-05 1.14647 51.0784 +6.75977E-05 1.1459 272.96 P1 -7.25229E-05 1 322.487 +7.25229E-05 1 131.152 K1 -7.29212E-05 1.09047 42.801 +7.29212E-05 1.09012 234.173 N2 -0.00013788 0.972523 90.2443 +0.00013788 0.972665 339.505 M2 -0.000140519 0.972523 96.0386 +0.000140519 0.972665 149.308 S2 0.000145444 1 0 K2 -0.000145842 1.23912 266.15 +0.000145842 1.23794 288.895 Q1 1.13893401e-02 1.83698935e+02 1.21085823e-02 1.73352953e+02 diff --git a/tests/data/reference/nems/hera_shinnecock_ike/runs/test_case_1/model_configure b/tests/data/reference/nems/hera_shinnecock_ike/runs/test_case_1/model_configure index a53f8813..b9d20dc1 100644 --- a/tests/data/reference/nems/hera_shinnecock_ike/runs/test_case_1/model_configure +++ b/tests/data/reference/nems/hera_shinnecock_ike/runs/test_case_1/model_configure @@ -1,4 +1,4 @@ -# `model_configure` generated with NEMSpy 1.2.6.post15.dev0+79ef4e6 +# `model_configure` generated with NEMSpy 1.2.8.post5.dev0+434c79d total_member: 1 print_esmf: .true. namelist: atm_namelist diff --git a/tests/data/reference/nems/hera_shinnecock_ike/runs/test_case_1/nems.configure b/tests/data/reference/nems/hera_shinnecock_ike/runs/test_case_1/nems.configure index edd6ac0b..7afa6d37 100644 --- a/tests/data/reference/nems/hera_shinnecock_ike/runs/test_case_1/nems.configure +++ b/tests/data/reference/nems/hera_shinnecock_ike/runs/test_case_1/nems.configure @@ -1,4 +1,4 @@ -# `nems.configure` generated with NEMSpy 1.2.6.post15.dev0+79ef4e6 +# `nems.configure` generated with NEMSpy 1.2.8.post5.dev0+434c79d # EARTH # EARTH_component_list: ATM WAV OCN EARTH_attributes:: diff --git a/tests/data/reference/nems/local_shinnecock_ike/coldstart/config.rc b/tests/data/reference/nems/local_shinnecock_ike/coldstart/config.rc index 0b87bbee..61dc2650 100644 --- a/tests/data/reference/nems/local_shinnecock_ike/coldstart/config.rc +++ b/tests/data/reference/nems/local_shinnecock_ike/coldstart/config.rc @@ -1,2 +1,2 @@ -# `config.rc` generated with NEMSpy 1.2.6.post15.dev0+79ef4e6 +# `config.rc` generated with NEMSpy 1.2.8.post5.dev0+434c79d diff --git a/tests/data/reference/nems/local_shinnecock_ike/coldstart/fort.15 b/tests/data/reference/nems/local_shinnecock_ike/coldstart/fort.15 index 1c94e5ba..058ce1f3 100644 --- a/tests/data/reference/nems/local_shinnecock_ike/coldstart/fort.15 +++ b/tests/data/reference/nems/local_shinnecock_ike/coldstart/fort.15 @@ -1,4 +1,4 @@ -created on 2021-04-07 17:26 ! RUNDES +created on 2021-04-08 11:17 ! RUNDES Shinacock Inlet Coarse Grid ! RUNID 1 ! NFOVER 1 ! NABOUT @@ -31,38 +31,38 @@ primitive_weighting_in_continuity_equation 0 ! CORI 8 ! NTIF Q1 -0.019256 6.49585E-05 0.695 1.14647 45.2841 +0.019256 6.49585E-05 0.695 1.1459 103.157 O1 -0.100514 6.75977E-05 0.695 1.14647 51.0784 +0.100514 6.75977E-05 0.695 1.1459 272.96 P1 -0.046843 7.25229E-05 0.706 1 322.487 +0.046843 7.25229E-05 0.706 1 131.152 K1 -0.141565 7.29212E-05 0.736 1.09047 42.801 +0.141565 7.29212E-05 0.736 1.09012 234.173 N2 -0.046398 0.00013788 0.693 0.972523 90.2443 +0.046398 0.00013788 0.693 0.972665 339.505 M2 -0.242334 0.000140519 0.693 0.972523 96.0386 +0.242334 0.000140519 0.693 0.972665 149.308 S2 0.112841 0.000145444 0.693 1 0 K2 -0.030704 0.000145842 0.693 1.23912 266.15 +0.030704 0.000145842 0.693 1.23794 288.895 8 Q1 -6.49585E-05 1.14647 45.2841 +6.49585E-05 1.1459 103.157 O1 -6.75977E-05 1.14647 51.0784 +6.75977E-05 1.1459 272.96 P1 -7.25229E-05 1 322.487 +7.25229E-05 1 131.152 K1 -7.29212E-05 1.09047 42.801 +7.29212E-05 1.09012 234.173 N2 -0.00013788 0.972523 90.2443 +0.00013788 0.972665 339.505 M2 -0.000140519 0.972523 96.0386 +0.000140519 0.972665 149.308 S2 0.000145444 1 0 K2 -0.000145842 1.23912 266.15 +0.000145842 1.23794 288.895 Q1 1.13893401e-02 1.83698935e+02 1.21085823e-02 1.73352953e+02 diff --git a/tests/data/reference/nems/local_shinnecock_ike/coldstart/model_configure b/tests/data/reference/nems/local_shinnecock_ike/coldstart/model_configure index f285d7d1..c10185ea 100644 --- a/tests/data/reference/nems/local_shinnecock_ike/coldstart/model_configure +++ b/tests/data/reference/nems/local_shinnecock_ike/coldstart/model_configure @@ -1,4 +1,4 @@ -# `model_configure` generated with NEMSpy 1.2.6.post15.dev0+79ef4e6 +# `model_configure` generated with NEMSpy 1.2.8.post5.dev0+434c79d total_member: 1 print_esmf: .true. namelist: atm_namelist diff --git a/tests/data/reference/nems/local_shinnecock_ike/coldstart/nems.configure b/tests/data/reference/nems/local_shinnecock_ike/coldstart/nems.configure index 1b5313f6..12608c53 100644 --- a/tests/data/reference/nems/local_shinnecock_ike/coldstart/nems.configure +++ b/tests/data/reference/nems/local_shinnecock_ike/coldstart/nems.configure @@ -1,4 +1,4 @@ -# `nems.configure` generated with NEMSpy 1.2.6.post15.dev0+79ef4e6 +# `nems.configure` generated with NEMSpy 1.2.8.post5.dev0+434c79d # EARTH # EARTH_component_list: OCN EARTH_attributes:: diff --git a/tests/data/reference/nems/local_shinnecock_ike/config.rc.coldstart b/tests/data/reference/nems/local_shinnecock_ike/config.rc.coldstart index 0b87bbee..61dc2650 100644 --- a/tests/data/reference/nems/local_shinnecock_ike/config.rc.coldstart +++ b/tests/data/reference/nems/local_shinnecock_ike/config.rc.coldstart @@ -1,2 +1,2 @@ -# `config.rc` generated with NEMSpy 1.2.6.post15.dev0+79ef4e6 +# `config.rc` generated with NEMSpy 1.2.8.post5.dev0+434c79d diff --git a/tests/data/reference/nems/local_shinnecock_ike/config.rc.hotstart b/tests/data/reference/nems/local_shinnecock_ike/config.rc.hotstart index 0b87bbee..62524df7 100644 --- a/tests/data/reference/nems/local_shinnecock_ike/config.rc.hotstart +++ b/tests/data/reference/nems/local_shinnecock_ike/config.rc.hotstart @@ -1,2 +1,5 @@ -# `config.rc` generated with NEMSpy 1.2.6.post15.dev0+79ef4e6 - +# `config.rc` generated with NEMSpy 1.2.8.post5.dev0+434c79d + atm_dir: input/shinnecock_ike/forcings + atm_nam: wind_atm_fin_ch_time_vec.nc + wav_dir: input/shinnecock_ike/forcings + wav_nam: ww3.Constant.20151214_sxy_ike_date.nc diff --git a/tests/data/reference/nems/local_shinnecock_ike/model_configure.coldstart b/tests/data/reference/nems/local_shinnecock_ike/model_configure.coldstart index f285d7d1..c10185ea 100644 --- a/tests/data/reference/nems/local_shinnecock_ike/model_configure.coldstart +++ b/tests/data/reference/nems/local_shinnecock_ike/model_configure.coldstart @@ -1,4 +1,4 @@ -# `model_configure` generated with NEMSpy 1.2.6.post15.dev0+79ef4e6 +# `model_configure` generated with NEMSpy 1.2.8.post5.dev0+434c79d total_member: 1 print_esmf: .true. namelist: atm_namelist diff --git a/tests/data/reference/nems/local_shinnecock_ike/model_configure.hotstart b/tests/data/reference/nems/local_shinnecock_ike/model_configure.hotstart index 0d3c0cb1..2a8b468e 100644 --- a/tests/data/reference/nems/local_shinnecock_ike/model_configure.hotstart +++ b/tests/data/reference/nems/local_shinnecock_ike/model_configure.hotstart @@ -1,4 +1,4 @@ -# `model_configure` generated with NEMSpy 1.2.6.post15.dev0+79ef4e6 +# `model_configure` generated with NEMSpy 1.2.8.post5.dev0+434c79d total_member: 1 print_esmf: .true. namelist: atm_namelist diff --git a/tests/data/reference/nems/local_shinnecock_ike/nems.configure.coldstart b/tests/data/reference/nems/local_shinnecock_ike/nems.configure.coldstart index 1b5313f6..12608c53 100644 --- a/tests/data/reference/nems/local_shinnecock_ike/nems.configure.coldstart +++ b/tests/data/reference/nems/local_shinnecock_ike/nems.configure.coldstart @@ -1,4 +1,4 @@ -# `nems.configure` generated with NEMSpy 1.2.6.post15.dev0+79ef4e6 +# `nems.configure` generated with NEMSpy 1.2.8.post5.dev0+434c79d # EARTH # EARTH_component_list: OCN EARTH_attributes:: diff --git a/tests/data/reference/nems/local_shinnecock_ike/nems.configure.hotstart b/tests/data/reference/nems/local_shinnecock_ike/nems.configure.hotstart index 17353502..60a419a3 100644 --- a/tests/data/reference/nems/local_shinnecock_ike/nems.configure.hotstart +++ b/tests/data/reference/nems/local_shinnecock_ike/nems.configure.hotstart @@ -1,4 +1,4 @@ -# `nems.configure` generated with NEMSpy 1.2.6.post15.dev0+79ef4e6 +# `nems.configure` generated with NEMSpy 1.2.8.post5.dev0+434c79d # EARTH # EARTH_component_list: ATM WAV OCN EARTH_attributes:: diff --git a/tests/data/reference/nems/local_shinnecock_ike/runs/test_case_1/config.rc b/tests/data/reference/nems/local_shinnecock_ike/runs/test_case_1/config.rc index 0b87bbee..62524df7 100644 --- a/tests/data/reference/nems/local_shinnecock_ike/runs/test_case_1/config.rc +++ b/tests/data/reference/nems/local_shinnecock_ike/runs/test_case_1/config.rc @@ -1,2 +1,5 @@ -# `config.rc` generated with NEMSpy 1.2.6.post15.dev0+79ef4e6 - +# `config.rc` generated with NEMSpy 1.2.8.post5.dev0+434c79d + atm_dir: input/shinnecock_ike/forcings + atm_nam: wind_atm_fin_ch_time_vec.nc + wav_dir: input/shinnecock_ike/forcings + wav_nam: ww3.Constant.20151214_sxy_ike_date.nc diff --git a/tests/data/reference/nems/local_shinnecock_ike/runs/test_case_1/fort.15 b/tests/data/reference/nems/local_shinnecock_ike/runs/test_case_1/fort.15 index 9ce29a57..85690867 100644 --- a/tests/data/reference/nems/local_shinnecock_ike/runs/test_case_1/fort.15 +++ b/tests/data/reference/nems/local_shinnecock_ike/runs/test_case_1/fort.15 @@ -1,4 +1,4 @@ -created on 2021-04-07 17:26 ! RUNDES +created on 2021-04-08 11:17 ! RUNDES Shinacock Inlet Coarse Grid ! RUNID 1 ! NFOVER 1 ! NABOUT @@ -32,38 +32,38 @@ primitive_weighting_in_continuity_equation 0 ! CORI 8 ! NTIF Q1 -0.019256 6.49585E-05 0.695 1.14647 45.2841 +0.019256 6.49585E-05 0.695 1.1459 103.157 O1 -0.100514 6.75977E-05 0.695 1.14647 51.0784 +0.100514 6.75977E-05 0.695 1.1459 272.96 P1 -0.046843 7.25229E-05 0.706 1 322.487 +0.046843 7.25229E-05 0.706 1 131.152 K1 -0.141565 7.29212E-05 0.736 1.09047 42.801 +0.141565 7.29212E-05 0.736 1.09012 234.173 N2 -0.046398 0.00013788 0.693 0.972523 90.2443 +0.046398 0.00013788 0.693 0.972665 339.505 M2 -0.242334 0.000140519 0.693 0.972523 96.0386 +0.242334 0.000140519 0.693 0.972665 149.308 S2 0.112841 0.000145444 0.693 1 0 K2 -0.030704 0.000145842 0.693 1.23912 266.15 +0.030704 0.000145842 0.693 1.23794 288.895 8 Q1 -6.49585E-05 1.14647 45.2841 +6.49585E-05 1.1459 103.157 O1 -6.75977E-05 1.14647 51.0784 +6.75977E-05 1.1459 272.96 P1 -7.25229E-05 1 322.487 +7.25229E-05 1 131.152 K1 -7.29212E-05 1.09047 42.801 +7.29212E-05 1.09012 234.173 N2 -0.00013788 0.972523 90.2443 +0.00013788 0.972665 339.505 M2 -0.000140519 0.972523 96.0386 +0.000140519 0.972665 149.308 S2 0.000145444 1 0 K2 -0.000145842 1.23912 266.15 +0.000145842 1.23794 288.895 Q1 1.13893401e-02 1.83698935e+02 1.21085823e-02 1.73352953e+02 diff --git a/tests/data/reference/nems/local_shinnecock_ike/runs/test_case_1/model_configure b/tests/data/reference/nems/local_shinnecock_ike/runs/test_case_1/model_configure index 0d3c0cb1..2a8b468e 100644 --- a/tests/data/reference/nems/local_shinnecock_ike/runs/test_case_1/model_configure +++ b/tests/data/reference/nems/local_shinnecock_ike/runs/test_case_1/model_configure @@ -1,4 +1,4 @@ -# `model_configure` generated with NEMSpy 1.2.6.post15.dev0+79ef4e6 +# `model_configure` generated with NEMSpy 1.2.8.post5.dev0+434c79d total_member: 1 print_esmf: .true. namelist: atm_namelist diff --git a/tests/data/reference/nems/local_shinnecock_ike/runs/test_case_1/nems.configure b/tests/data/reference/nems/local_shinnecock_ike/runs/test_case_1/nems.configure index 17353502..60a419a3 100644 --- a/tests/data/reference/nems/local_shinnecock_ike/runs/test_case_1/nems.configure +++ b/tests/data/reference/nems/local_shinnecock_ike/runs/test_case_1/nems.configure @@ -1,4 +1,4 @@ -# `nems.configure` generated with NEMSpy 1.2.6.post15.dev0+79ef4e6 +# `nems.configure` generated with NEMSpy 1.2.8.post5.dev0+434c79d # EARTH # EARTH_component_list: ATM WAV OCN EARTH_attributes:: diff --git a/tests/data/reference/nems/stampede2_shinnecock_ike/coldstart/config.rc b/tests/data/reference/nems/stampede2_shinnecock_ike/coldstart/config.rc index 0b87bbee..61dc2650 100644 --- a/tests/data/reference/nems/stampede2_shinnecock_ike/coldstart/config.rc +++ b/tests/data/reference/nems/stampede2_shinnecock_ike/coldstart/config.rc @@ -1,2 +1,2 @@ -# `config.rc` generated with NEMSpy 1.2.6.post15.dev0+79ef4e6 +# `config.rc` generated with NEMSpy 1.2.8.post5.dev0+434c79d diff --git a/tests/data/reference/nems/stampede2_shinnecock_ike/coldstart/fort.15 b/tests/data/reference/nems/stampede2_shinnecock_ike/coldstart/fort.15 index 7cc1ae68..7fa90691 100644 --- a/tests/data/reference/nems/stampede2_shinnecock_ike/coldstart/fort.15 +++ b/tests/data/reference/nems/stampede2_shinnecock_ike/coldstart/fort.15 @@ -1,4 +1,4 @@ -created on 2021-04-07 17:27 ! RUNDES +created on 2021-04-08 11:18 ! RUNDES Shinacock Inlet Coarse Grid ! RUNID 1 ! NFOVER 1 ! NABOUT @@ -31,38 +31,38 @@ primitive_weighting_in_continuity_equation 0 ! CORI 8 ! NTIF Q1 -0.019256 6.49585E-05 0.695 1.14647 45.2841 +0.019256 6.49585E-05 0.695 1.1459 103.157 O1 -0.100514 6.75977E-05 0.695 1.14647 51.0784 +0.100514 6.75977E-05 0.695 1.1459 272.96 P1 -0.046843 7.25229E-05 0.706 1 322.487 +0.046843 7.25229E-05 0.706 1 131.152 K1 -0.141565 7.29212E-05 0.736 1.09047 42.801 +0.141565 7.29212E-05 0.736 1.09012 234.173 N2 -0.046398 0.00013788 0.693 0.972523 90.2443 +0.046398 0.00013788 0.693 0.972665 339.505 M2 -0.242334 0.000140519 0.693 0.972523 96.0386 +0.242334 0.000140519 0.693 0.972665 149.308 S2 0.112841 0.000145444 0.693 1 0 K2 -0.030704 0.000145842 0.693 1.23912 266.15 +0.030704 0.000145842 0.693 1.23794 288.895 8 Q1 -6.49585E-05 1.14647 45.2841 +6.49585E-05 1.1459 103.157 O1 -6.75977E-05 1.14647 51.0784 +6.75977E-05 1.1459 272.96 P1 -7.25229E-05 1 322.487 +7.25229E-05 1 131.152 K1 -7.29212E-05 1.09047 42.801 +7.29212E-05 1.09012 234.173 N2 -0.00013788 0.972523 90.2443 +0.00013788 0.972665 339.505 M2 -0.000140519 0.972523 96.0386 +0.000140519 0.972665 149.308 S2 0.000145444 1 0 K2 -0.000145842 1.23912 266.15 +0.000145842 1.23794 288.895 Q1 1.13893401e-02 1.83698935e+02 1.21085823e-02 1.73352953e+02 diff --git a/tests/data/reference/nems/stampede2_shinnecock_ike/coldstart/model_configure b/tests/data/reference/nems/stampede2_shinnecock_ike/coldstart/model_configure index 36b3c314..eee6533b 100644 --- a/tests/data/reference/nems/stampede2_shinnecock_ike/coldstart/model_configure +++ b/tests/data/reference/nems/stampede2_shinnecock_ike/coldstart/model_configure @@ -1,4 +1,4 @@ -# `model_configure` generated with NEMSpy 1.2.6.post15.dev0+79ef4e6 +# `model_configure` generated with NEMSpy 1.2.8.post5.dev0+434c79d total_member: 1 print_esmf: .true. namelist: atm_namelist diff --git a/tests/data/reference/nems/stampede2_shinnecock_ike/coldstart/nems.configure b/tests/data/reference/nems/stampede2_shinnecock_ike/coldstart/nems.configure index 32be567a..3c1b0788 100644 --- a/tests/data/reference/nems/stampede2_shinnecock_ike/coldstart/nems.configure +++ b/tests/data/reference/nems/stampede2_shinnecock_ike/coldstart/nems.configure @@ -1,4 +1,4 @@ -# `nems.configure` generated with NEMSpy 1.2.6.post15.dev0+79ef4e6 +# `nems.configure` generated with NEMSpy 1.2.8.post5.dev0+434c79d # EARTH # EARTH_component_list: OCN EARTH_attributes:: diff --git a/tests/data/reference/nems/stampede2_shinnecock_ike/config.rc.coldstart b/tests/data/reference/nems/stampede2_shinnecock_ike/config.rc.coldstart index 0b87bbee..61dc2650 100644 --- a/tests/data/reference/nems/stampede2_shinnecock_ike/config.rc.coldstart +++ b/tests/data/reference/nems/stampede2_shinnecock_ike/config.rc.coldstart @@ -1,2 +1,2 @@ -# `config.rc` generated with NEMSpy 1.2.6.post15.dev0+79ef4e6 +# `config.rc` generated with NEMSpy 1.2.8.post5.dev0+434c79d diff --git a/tests/data/reference/nems/stampede2_shinnecock_ike/config.rc.hotstart b/tests/data/reference/nems/stampede2_shinnecock_ike/config.rc.hotstart index 0b87bbee..62524df7 100644 --- a/tests/data/reference/nems/stampede2_shinnecock_ike/config.rc.hotstart +++ b/tests/data/reference/nems/stampede2_shinnecock_ike/config.rc.hotstart @@ -1,2 +1,5 @@ -# `config.rc` generated with NEMSpy 1.2.6.post15.dev0+79ef4e6 - +# `config.rc` generated with NEMSpy 1.2.8.post5.dev0+434c79d + atm_dir: input/shinnecock_ike/forcings + atm_nam: wind_atm_fin_ch_time_vec.nc + wav_dir: input/shinnecock_ike/forcings + wav_nam: ww3.Constant.20151214_sxy_ike_date.nc diff --git a/tests/data/reference/nems/stampede2_shinnecock_ike/model_configure.coldstart b/tests/data/reference/nems/stampede2_shinnecock_ike/model_configure.coldstart index 36b3c314..eee6533b 100644 --- a/tests/data/reference/nems/stampede2_shinnecock_ike/model_configure.coldstart +++ b/tests/data/reference/nems/stampede2_shinnecock_ike/model_configure.coldstart @@ -1,4 +1,4 @@ -# `model_configure` generated with NEMSpy 1.2.6.post15.dev0+79ef4e6 +# `model_configure` generated with NEMSpy 1.2.8.post5.dev0+434c79d total_member: 1 print_esmf: .true. namelist: atm_namelist diff --git a/tests/data/reference/nems/stampede2_shinnecock_ike/model_configure.hotstart b/tests/data/reference/nems/stampede2_shinnecock_ike/model_configure.hotstart index cbfbce16..30df13ea 100644 --- a/tests/data/reference/nems/stampede2_shinnecock_ike/model_configure.hotstart +++ b/tests/data/reference/nems/stampede2_shinnecock_ike/model_configure.hotstart @@ -1,4 +1,4 @@ -# `model_configure` generated with NEMSpy 1.2.6.post15.dev0+79ef4e6 +# `model_configure` generated with NEMSpy 1.2.8.post5.dev0+434c79d total_member: 1 print_esmf: .true. namelist: atm_namelist diff --git a/tests/data/reference/nems/stampede2_shinnecock_ike/nems.configure.coldstart b/tests/data/reference/nems/stampede2_shinnecock_ike/nems.configure.coldstart index 32be567a..3c1b0788 100644 --- a/tests/data/reference/nems/stampede2_shinnecock_ike/nems.configure.coldstart +++ b/tests/data/reference/nems/stampede2_shinnecock_ike/nems.configure.coldstart @@ -1,4 +1,4 @@ -# `nems.configure` generated with NEMSpy 1.2.6.post15.dev0+79ef4e6 +# `nems.configure` generated with NEMSpy 1.2.8.post5.dev0+434c79d # EARTH # EARTH_component_list: OCN EARTH_attributes:: diff --git a/tests/data/reference/nems/stampede2_shinnecock_ike/nems.configure.hotstart b/tests/data/reference/nems/stampede2_shinnecock_ike/nems.configure.hotstart index be0aa806..b2a4b614 100644 --- a/tests/data/reference/nems/stampede2_shinnecock_ike/nems.configure.hotstart +++ b/tests/data/reference/nems/stampede2_shinnecock_ike/nems.configure.hotstart @@ -1,4 +1,4 @@ -# `nems.configure` generated with NEMSpy 1.2.6.post15.dev0+79ef4e6 +# `nems.configure` generated with NEMSpy 1.2.8.post5.dev0+434c79d # EARTH # EARTH_component_list: ATM WAV OCN EARTH_attributes:: diff --git a/tests/data/reference/nems/stampede2_shinnecock_ike/runs/test_case_1/config.rc b/tests/data/reference/nems/stampede2_shinnecock_ike/runs/test_case_1/config.rc index 0b87bbee..62524df7 100644 --- a/tests/data/reference/nems/stampede2_shinnecock_ike/runs/test_case_1/config.rc +++ b/tests/data/reference/nems/stampede2_shinnecock_ike/runs/test_case_1/config.rc @@ -1,2 +1,5 @@ -# `config.rc` generated with NEMSpy 1.2.6.post15.dev0+79ef4e6 - +# `config.rc` generated with NEMSpy 1.2.8.post5.dev0+434c79d + atm_dir: input/shinnecock_ike/forcings + atm_nam: wind_atm_fin_ch_time_vec.nc + wav_dir: input/shinnecock_ike/forcings + wav_nam: ww3.Constant.20151214_sxy_ike_date.nc diff --git a/tests/data/reference/nems/stampede2_shinnecock_ike/runs/test_case_1/fort.15 b/tests/data/reference/nems/stampede2_shinnecock_ike/runs/test_case_1/fort.15 index 950ea33d..4ffd694e 100644 --- a/tests/data/reference/nems/stampede2_shinnecock_ike/runs/test_case_1/fort.15 +++ b/tests/data/reference/nems/stampede2_shinnecock_ike/runs/test_case_1/fort.15 @@ -1,4 +1,4 @@ -created on 2021-04-07 17:27 ! RUNDES +created on 2021-04-08 11:18 ! RUNDES Shinacock Inlet Coarse Grid ! RUNID 1 ! NFOVER 1 ! NABOUT @@ -32,38 +32,38 @@ primitive_weighting_in_continuity_equation 0 ! CORI 8 ! NTIF Q1 -0.019256 6.49585E-05 0.695 1.14647 45.2841 +0.019256 6.49585E-05 0.695 1.1459 103.157 O1 -0.100514 6.75977E-05 0.695 1.14647 51.0784 +0.100514 6.75977E-05 0.695 1.1459 272.96 P1 -0.046843 7.25229E-05 0.706 1 322.487 +0.046843 7.25229E-05 0.706 1 131.152 K1 -0.141565 7.29212E-05 0.736 1.09047 42.801 +0.141565 7.29212E-05 0.736 1.09012 234.173 N2 -0.046398 0.00013788 0.693 0.972523 90.2443 +0.046398 0.00013788 0.693 0.972665 339.505 M2 -0.242334 0.000140519 0.693 0.972523 96.0386 +0.242334 0.000140519 0.693 0.972665 149.308 S2 0.112841 0.000145444 0.693 1 0 K2 -0.030704 0.000145842 0.693 1.23912 266.15 +0.030704 0.000145842 0.693 1.23794 288.895 8 Q1 -6.49585E-05 1.14647 45.2841 +6.49585E-05 1.1459 103.157 O1 -6.75977E-05 1.14647 51.0784 +6.75977E-05 1.1459 272.96 P1 -7.25229E-05 1 322.487 +7.25229E-05 1 131.152 K1 -7.29212E-05 1.09047 42.801 +7.29212E-05 1.09012 234.173 N2 -0.00013788 0.972523 90.2443 +0.00013788 0.972665 339.505 M2 -0.000140519 0.972523 96.0386 +0.000140519 0.972665 149.308 S2 0.000145444 1 0 K2 -0.000145842 1.23912 266.15 +0.000145842 1.23794 288.895 Q1 1.13893401e-02 1.83698935e+02 1.21085823e-02 1.73352953e+02 diff --git a/tests/data/reference/nems/stampede2_shinnecock_ike/runs/test_case_1/model_configure b/tests/data/reference/nems/stampede2_shinnecock_ike/runs/test_case_1/model_configure index cbfbce16..30df13ea 100644 --- a/tests/data/reference/nems/stampede2_shinnecock_ike/runs/test_case_1/model_configure +++ b/tests/data/reference/nems/stampede2_shinnecock_ike/runs/test_case_1/model_configure @@ -1,4 +1,4 @@ -# `model_configure` generated with NEMSpy 1.2.6.post15.dev0+79ef4e6 +# `model_configure` generated with NEMSpy 1.2.8.post5.dev0+434c79d total_member: 1 print_esmf: .true. namelist: atm_namelist diff --git a/tests/data/reference/nems/stampede2_shinnecock_ike/runs/test_case_1/nems.configure b/tests/data/reference/nems/stampede2_shinnecock_ike/runs/test_case_1/nems.configure index be0aa806..b2a4b614 100644 --- a/tests/data/reference/nems/stampede2_shinnecock_ike/runs/test_case_1/nems.configure +++ b/tests/data/reference/nems/stampede2_shinnecock_ike/runs/test_case_1/nems.configure @@ -1,4 +1,4 @@ -# `nems.configure` generated with NEMSpy 1.2.6.post15.dev0+79ef4e6 +# `nems.configure` generated with NEMSpy 1.2.8.post5.dev0+434c79d # EARTH # EARTH_component_list: ATM WAV OCN EARTH_attributes:: diff --git a/tests/test_generation.py b/tests/test_generation.py index 33c89664..620ad05f 100644 --- a/tests/test_generation.py +++ b/tests/test_generation.py @@ -116,6 +116,7 @@ def test_nems_local_shinnecock_ike(): check_reference_directory( test_directory=DATA_DIRECTORY / output_directory, reference_directory=DATA_DIRECTORY / reference_directory, + skip_lines=1, ) @@ -199,6 +200,7 @@ def test_nems_hera_shinnecock_ike(): check_reference_directory( test_directory=DATA_DIRECTORY / output_directory, reference_directory=DATA_DIRECTORY / reference_directory, + skip_lines=1, ) @@ -282,6 +284,7 @@ def test_nems_stampede2_shinnecock_ike(): check_reference_directory( test_directory=DATA_DIRECTORY / output_directory, reference_directory=DATA_DIRECTORY / reference_directory, + skip_lines=1, ) @@ -338,6 +341,7 @@ def test_adcirc_local_shinnecock_ike(): check_reference_directory( test_directory=DATA_DIRECTORY / output_directory, reference_directory=DATA_DIRECTORY / reference_directory, + skip_lines=1, ) @@ -394,6 +398,7 @@ def test_adcirc_hera_shinnecock_ike(): check_reference_directory( test_directory=DATA_DIRECTORY / output_directory, reference_directory=DATA_DIRECTORY / reference_directory, + skip_lines=1, ) @@ -450,6 +455,7 @@ def test_adcirc_stampede2_shinnecock_ike(): check_reference_directory( test_directory=DATA_DIRECTORY / output_directory, reference_directory=DATA_DIRECTORY / reference_directory, + skip_lines=1, ) @@ -515,18 +521,20 @@ def extract_download( os.remove(temporary_filename) -def check_reference_directory(test_directory: PathLike, reference_directory: PathLike): +def check_reference_directory(test_directory: PathLike, reference_directory: PathLike, skip_lines: int = None): if not isinstance(test_directory, Path): test_directory = Path(test_directory) if not isinstance(reference_directory, Path): reference_directory = Path(reference_directory) + if skip_lines is None: + skip_lines = 0 for reference_filename in reference_directory.iterdir(): if reference_filename.is_dir(): - check_reference_directory( - test_directory / reference_filename.name, reference_filename - ) + check_reference_directory(test_directory / reference_filename.name, + reference_filename, skip_lines) else: test_filename = test_directory / reference_filename.name with open(test_filename) as test_file, open(reference_filename) as reference_file: - assert test_file.readlines()[1:] == reference_file.readlines()[1:] + assert test_file.readlines()[skip_lines:] == reference_file.readlines()[skip_lines:], \ + f'"{test_filename}" != "{reference_filename}"'