Merge remote-tracking branch 'remotes/vlab/master' into develop

NOAA-EMC · Jul 29, 2019 · cb3385a · cb3385a
2 parents 0cf6a92 + 1da4c87
commit cb3385a
Show file tree

Hide file tree

Showing 68 changed files with 6 additions and 1 deletion.
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1 @@
+__pycache__
diff --git a/examples/ecflow/ecftest.py b/examples/ecflow/ecftest.py
diff --git a/examples/real-workflow/flat-py/test.py b/examples/real-workflow/flat-py/test.py
diff --git a/examples/real-workflow/flat-sh/test.sh b/examples/real-workflow/flat-sh/test.sh
diff --git a/examples/real-workflow/jobs/JANALYSIS b/examples/real-workflow/jobs/JANALYSIS
diff --git a/examples/real-workflow/jobs/JCLIM_FCST b/examples/real-workflow/jobs/JCLIM_FCST
diff --git a/examples/real-workflow/jobs/JCLIM_INIT b/examples/real-workflow/jobs/JCLIM_INIT
diff --git a/examples/real-workflow/jobs/JENS_FCST b/examples/real-workflow/jobs/JENS_FCST
diff --git a/examples/real-workflow/jobs/JFCST b/examples/real-workflow/jobs/JFCST
diff --git a/examples/real-workflow/jobs/JFINAL b/examples/real-workflow/jobs/JFINAL
diff --git a/examples/real-workflow/jobs/JPOST b/examples/real-workflow/jobs/JPOST
diff --git a/examples/real-workflow/jobs/JSTART_CYCLE b/examples/real-workflow/jobs/JSTART_CYCLE
diff --git a/examples/real-workflow/scripts/exanalysis.sh b/examples/real-workflow/scripts/exanalysis.sh
diff --git a/examples/real-workflow/scripts/exclim_init.py b/examples/real-workflow/scripts/exclim_init.py
diff --git a/examples/real-workflow/scripts/exfcst.py b/examples/real-workflow/scripts/exfcst.py
diff --git a/examples/real-workflow/scripts/expost.sh b/examples/real-workflow/scripts/expost.sh
diff --git a/examples/real-workflow/ush/wait_for_file.sh b/examples/real-workflow/ush/wait_for_file.sh
diff --git a/examples/real-workflow/workflow/job_wrapper.sh b/examples/real-workflow/workflow/job_wrapper.sh
diff --git a/examples/real-workflow/workflow/setup_expt.py b/examples/real-workflow/workflow/setup_expt.py
diff --git a/examples/run/test.py b/examples/run/test.py
diff --git a/examples/run/test_aprun.py b/examples/run/test_aprun.py
diff --git a/examples/run/test_hydra.py b/examples/run/test_hydra.py
diff --git a/examples/sqltest/python_test.py b/examples/sqltest/python_test.py
diff --git a/examples/sqltest/shell_prep.py b/examples/sqltest/shell_prep.py
diff --git a/examples/sqltest/shell_test.sh b/examples/sqltest/shell_test.sh
diff --git a/examples/sqltest/yaml_test.py b/examples/sqltest/yaml_test.py
diff --git a/examples/taskarray/doit.py b/examples/taskarray/doit.py
diff --git a/examples/test_suite/output/test_suite/family1/.gitignore b/examples/test_suite/output/test_suite/family1/.gitignore
@@ -0,0 +1 @@
+
diff --git a/examples/test_suite/submit/test_suite/family1/.gitignore b/examples/test_suite/submit/test_suite/family1/.gitignore
@@ -0,0 +1 @@
+
diff --git a/examples/to_sh/test.sh b/examples/to_sh/test.sh
diff --git a/examples/toy-yaml/example-config.py b/examples/toy-yaml/example-config.py
diff --git a/examples/yaml-read-write/test.py b/examples/yaml-read-write/test.py
diff --git a/tests/__init__.py b/tests/__init__.py
diff --git a/tests/regression/compare_GFS_comdirs.py b/tests/regression/compare_GFS_comdirs.py
diff --git a/tests/regression/fv3gfs_regression.sh b/tests/regression/fv3gfs_regression.sh
diff --git a/tests/regression/get_warmstart_ICs.sh b/tests/regression/get_warmstart_ICs.sh
diff --git a/tests/test_data/regtest/config/anal.yaml b/tests/test_data/regtest/config/anal.yaml
@@ -34,7 +34,7 @@ config_anal:
     export SSMITBF=/dev/null
     export AMSR2BF=/dev/null
 
-    export REALTIME="{tools.YES_NO(doc.settings.REALTIME)}"   # Run GFS AWIPS
+    export REALTIME="{tools.YES_NO(doc.settings.realtime)}"   # Run GFS AWIPS
     
     # Set CONVINFO and SATINFO for retrospective parallels
     if [ $REALTIME = "NO" ]; then

diff --git a/tests/test_data/regtest/control/expdir/regtest_tmp/config/.DS_Store b/tests/test_data/regtest/control/expdir/regtest_tmp/config/.DS_Store
diff --git a/tests/test_data/regtest/control/expdir/regtest_tmp/runtime/.DS_Store b/tests/test_data/regtest/control/expdir/regtest_tmp/runtime/.DS_Store
diff --git a/tests/test_data/regtest/control/expdir/regtest_tmp/schema/.DS_Store b/tests/test_data/regtest/control/expdir/regtest_tmp/schema/.DS_Store
diff --git a/tests/unittests/moab/__init__.py b/tests/unittests/moab/__init__.py
diff --git a/tests/unittests/moab/run_tests.sh b/tests/unittests/moab/run_tests.sh
diff --git a/tests/unittests/moab/test_AprunCrayMPI.py b/tests/unittests/moab/test_AprunCrayMPI.py
diff --git a/tests/unittests/moab/test_HydraIMPI.py b/tests/unittests/moab/test_HydraIMPI.py
diff --git a/tests/unittests/moab/test_ShellCommand.py b/tests/unittests/moab/test_ShellCommand.py
diff --git a/tests/unittests/moab/test_exampleConfig.py b/tests/unittests/moab/test_exampleConfig.py
diff --git a/tests/unittests/moab/test_jobs.py b/tests/unittests/moab/test_jobs.py
diff --git a/tests/unittests/moab/test_simplify.py b/tests/unittests/moab/test_simplify.py
diff --git a/tests/unittests/moab/test_util.py b/tests/unittests/moab/test_util.py
diff --git a/tests/unittests/slurm/__init__.py b/tests/unittests/slurm/__init__.py
diff --git a/tests/unittests/slurm/run_tests.sh b/tests/unittests/slurm/run_tests.sh
diff --git a/tests/unittests/slurm/test_HydraIMPI.py b/tests/unittests/slurm/test_HydraIMPI.py
diff --git a/tests/unittests/slurm/test_ShellCommand.py b/tests/unittests/slurm/test_ShellCommand.py
diff --git a/tests/unittests/slurm/test_SrunMPI.py b/tests/unittests/slurm/test_SrunMPI.py
diff --git a/tests/unittests/slurm/test_exampleConfig.py b/tests/unittests/slurm/test_exampleConfig.py
diff --git a/tests/unittests/slurm/test_jobs.py b/tests/unittests/slurm/test_jobs.py
diff --git a/tests/unittests/slurm/test_simplify.py b/tests/unittests/slurm/test_simplify.py
diff --git a/tests/unittests/slurm/test_util.py b/tests/unittests/slurm/test_util.py
diff --git a/update_ecflow_workflow.sh b/update_ecflow_workflow.sh
diff --git a/utils/crow_dataflow_cycle_sh.py b/utils/crow_dataflow_cycle_sh.py
diff --git a/utils/crow_dataflow_deliver_sh.py b/utils/crow_dataflow_deliver_sh.py
diff --git a/utils/crow_dataflow_find_sh.py b/utils/crow_dataflow_find_sh.py
diff --git a/utils/execute.sh b/utils/execute.sh
diff --git a/utils/feedback.py b/utils/feedback.py
diff --git a/utils/make-half-cycle.sh b/utils/make-half-cycle.sh
diff --git a/utils/rocoto_viewer_CROW.py b/utils/rocoto_viewer_CROW.py
diff --git a/utils/to_sh.py b/utils/to_sh.py
diff --git a/worktools.py b/worktools.py
@@ -652,6 +652,8 @@ def setup_case(command_line_arguments):
         logger.warning('Using manual mode \n ')
         YAML_FILES_TO_COPY={ '../_expdir_main_manual.yaml': '_main.yaml',
                              '../top.yaml':'top.yaml',
+                             '../schema/task.yaml':'schema.yaml',
+                             '../schema/varnames.yaml':'varnames.yaml',
                              '../defaults/resources.yaml':'resources.yaml',
                              '../defaults/base.yaml':'base.yaml',
                              '../defaults/places.yaml':'places.yaml',