diff --git a/test/run_fortran_tests.sh b/test/run_fortran_tests.sh index cd6436fb..ccfc85f9 100755 --- a/test/run_fortran_tests.sh +++ b/test/run_fortran_tests.sh @@ -37,12 +37,12 @@ if [ $res -ne 0 ]; then echo "Failure running advection test" fi -# Run var_compatability test - ./var_compatability_test/run_test +# Run var_compatibility test + ./var_compatibility_test/run_test res=$? errcnt=$((errcnt + res)) if [ $res -ne 0 ]; then - echo "Failure running var_compatability test" + echo "Failure running var_compatibility test" fi if [ $errcnt -eq 0 ]; then diff --git a/test/var_compatability_test/.gitignore b/test/var_compatibility_test/.gitignore similarity index 100% rename from test/var_compatability_test/.gitignore rename to test/var_compatibility_test/.gitignore diff --git a/test/var_compatability_test/CMakeLists.txt b/test/var_compatibility_test/CMakeLists.txt similarity index 98% rename from test/var_compatability_test/CMakeLists.txt rename to test/var_compatibility_test/CMakeLists.txt index 11899446..8cbd7e44 100644 --- a/test/var_compatability_test/CMakeLists.txt +++ b/test/var_compatibility_test/CMakeLists.txt @@ -19,9 +19,9 @@ get_filename_component(CCPP_ROOT "${TEST_ROOT}" DIRECTORY) # Paths should be relative to CMAKE_SOURCE_DIR (this file's directory) # #------------------------------------------------------------------------------ -LIST(APPEND SCHEME_FILES "var_compatability_files.txt") +LIST(APPEND SCHEME_FILES "var_compatibility_files.txt") LIST(APPEND HOST_FILES "test_host_data" "test_host_mod") -LIST(APPEND SUITE_FILES "var_compatability_suite.xml") +LIST(APPEND SUITE_FILES "var_compatibility_suite.xml") # HOST is the name of the executable we will build. # We assume there are files ${HOST}.meta and ${HOST}.F90 in CMAKE_SOURCE_DIR SET(HOST "${CMAKE_PROJECT_NAME}") diff --git a/test/var_compatability_test/README.md b/test/var_compatibility_test/README.md similarity index 58% rename from test/var_compatability_test/README.md rename to test/var_compatibility_test/README.md index 066cf771..9b56ec9c 100644 --- a/test/var_compatability_test/README.md +++ b/test/var_compatibility_test/README.md @@ -1,6 +1,6 @@ -var_compatability test +var_compatibility test ================ -To build and run the var_compatability test, run ./run_test +To build and run the var_compatibility test, run ./run_test This script will build and run the test. The exit code is zero (0) on PASS and non-zero on FAIL. diff --git a/test/var_compatability_test/effr_calc.F90 b/test/var_compatibility_test/effr_calc.F90 similarity index 100% rename from test/var_compatability_test/effr_calc.F90 rename to test/var_compatibility_test/effr_calc.F90 diff --git a/test/var_compatability_test/effr_calc.meta b/test/var_compatibility_test/effr_calc.meta similarity index 100% rename from test/var_compatability_test/effr_calc.meta rename to test/var_compatibility_test/effr_calc.meta diff --git a/test/var_compatability_test/run_test b/test/var_compatibility_test/run_test similarity index 95% rename from test/var_compatability_test/run_test rename to test/var_compatibility_test/run_test index 548a34b1..ac86bf6f 100755 --- a/test/var_compatability_test/run_test +++ b/test/var_compatibility_test/run_test @@ -118,18 +118,18 @@ frame_src="${framework}/src" ## NB: This has to be after build_dir is finalized ## host_files="${build_dir}/ccpp/test_host_ccpp_cap.F90" -suite_files="${build_dir}/ccpp/ccpp_var_compatability_suite_cap.F90" +suite_files="${build_dir}/ccpp/ccpp_var_compatibility_suite_cap.F90" utility_files="${build_dir}/ccpp/ccpp_kinds.F90" utility_files="${utility_files},${frame_src}/ccpp_constituent_prop_mod.F90" utility_files="${utility_files},${frame_src}/ccpp_hashable.F90" utility_files="${utility_files},${frame_src}/ccpp_hash_table.F90" ccpp_files="${utility_files}" ccpp_files="${ccpp_files},${build_dir}/ccpp/test_host_ccpp_cap.F90" -ccpp_files="${ccpp_files},${build_dir}/ccpp/ccpp_var_compatability_suite_cap.F90" +ccpp_files="${ccpp_files},${build_dir}/ccpp/ccpp_var_compatibility_suite_cap.F90" #process_list="" module_list="effr_calc" #dependencies="" -suite_list="var_compatability_suite" +suite_list="var_compatibility_suite" required_vars_var_compatibility="ccpp_error_code,ccpp_error_message" required_vars_var_compatibility="${required_vars_var_compatibility},effective_radius_of_stratiform_cloud_ice_particle" required_vars_var_compatibility="${required_vars_var_compatibility},effective_radius_of_stratiform_cloud_liquid_water_particle" @@ -217,13 +217,13 @@ check_datatable ${report_prog} ${datafile} "--module-list" ${module_list} #check_datatable ${report_prog} ${datafile} "--dependencies" ${dependencies} check_datatable ${report_prog} ${datafile} "--suite-list" ${suite_list} \ --sep ";" -echo -e "\nChecking variables for var_compatability suite from command line" +echo -e "\nChecking variables for var_compatibility suite from command line" check_datatable ${report_prog} ${datafile} "--required-variables" \ - ${required_vars_var_compatability} "var_compatability_suite" + ${required_vars_var_compatibility} "var_compatibility_suite" check_datatable ${report_prog} ${datafile} "--input-variables" \ - ${input_vars_var_compatability} "var_compatability_suite" + ${input_vars_var_compatibility} "var_compatibility_suite" check_datatable ${report_prog} ${datafile} "--output-variables" \ - ${output_vars_var_compatability} "var_compatability_suite" + ${output_vars_var_compatibility} "var_compatibility_suite" # Run make make res=$? diff --git a/test/var_compatability_test/test_host.F90 b/test/var_compatibility_test/test_host.F90 similarity index 99% rename from test/var_compatability_test/test_host.F90 rename to test/var_compatibility_test/test_host.F90 index 6de9597c..25129405 100644 --- a/test/var_compatability_test/test_host.F90 +++ b/test/var_compatibility_test/test_host.F90 @@ -375,7 +375,7 @@ program test logical :: run_okay ! Setup expected test suite info - test_suites(1)%suite_name = 'var_compatability_suite' + test_suites(1)%suite_name = 'var_compatibility_suite' test_suites(1)%suite_parts => test_parts1 test_suites(1)%suite_input_vars => test_invars1 test_suites(1)%suite_output_vars => test_outvars1 diff --git a/test/var_compatability_test/test_host.meta b/test/var_compatibility_test/test_host.meta similarity index 100% rename from test/var_compatability_test/test_host.meta rename to test/var_compatibility_test/test_host.meta diff --git a/test/var_compatability_test/test_host_data.F90 b/test/var_compatibility_test/test_host_data.F90 similarity index 100% rename from test/var_compatability_test/test_host_data.F90 rename to test/var_compatibility_test/test_host_data.F90 diff --git a/test/var_compatability_test/test_host_data.meta b/test/var_compatibility_test/test_host_data.meta similarity index 100% rename from test/var_compatability_test/test_host_data.meta rename to test/var_compatibility_test/test_host_data.meta diff --git a/test/var_compatability_test/test_host_mod.F90 b/test/var_compatibility_test/test_host_mod.F90 similarity index 100% rename from test/var_compatability_test/test_host_mod.F90 rename to test/var_compatibility_test/test_host_mod.F90 diff --git a/test/var_compatability_test/test_host_mod.meta b/test/var_compatibility_test/test_host_mod.meta similarity index 100% rename from test/var_compatability_test/test_host_mod.meta rename to test/var_compatibility_test/test_host_mod.meta diff --git a/test/var_compatability_test/test_reports.py b/test/var_compatibility_test/test_reports.py similarity index 96% rename from test/var_compatability_test/test_reports.py rename to test/var_compatibility_test/test_reports.py index 33134574..4c8f9da6 100755 --- a/test/var_compatability_test/test_reports.py +++ b/test/var_compatibility_test/test_reports.py @@ -57,16 +57,16 @@ def usage(errmsg=None): # Check data _HOST_FILES = [os.path.join(_BUILD_DIR, "ccpp", "test_host_ccpp_cap.F90")] -_SUITE_FILES = [os.path.join(_BUILD_DIR, "ccpp", "ccpp_var_compatability_suite_cap.F90")] +_SUITE_FILES = [os.path.join(_BUILD_DIR, "ccpp", "ccpp_var_compatibility_suite_cap.F90")] _UTILITY_FILES = [os.path.join(_BUILD_DIR, "ccpp", "ccpp_kinds.F90"), os.path.join(_SRC_DIR, "ccpp_constituent_prop_mod.F90"), os.path.join(_SRC_DIR, "ccpp_hashable.F90"), os.path.join(_SRC_DIR, "ccpp_hash_table.F90")] _CCPP_FILES = _UTILITY_FILES + \ [os.path.join(_BUILD_DIR, "ccpp", "test_host_ccpp_cap.F90"), - os.path.join(_BUILD_DIR, "ccpp", "ccpp_var_compatability_suite_cap.F90")] + os.path.join(_BUILD_DIR, "ccpp", "ccpp_var_compatibility_suite_cap.F90")] _MODULE_LIST = ["effr_calc"] -_SUITE_LIST = ["var_compatability_suite"] +_SUITE_LIST = ["var_compatibility_suite"] _INPUT_VARS_VAR_ACTION = ["horizontal_loop_begin", "horizontal_loop_end", "horizontal_dimension", "vertical_layer_dimension", "effective_radius_of_stratiform_cloud_liquid_water_particle", "effective_radius_of_stratiform_cloud_rain_particle", @@ -140,15 +140,15 @@ def check_datatable(database, report_type, check_list, _MODULE_LIST) NUM_ERRORS += check_datatable(_DATABASE, DatatableReport("suite_list"), _SUITE_LIST) -print("\nChecking variables for var_compatability suite from python") +print("\nChecking variables for var_compatibility suite from python") NUM_ERRORS += check_datatable(_DATABASE, DatatableReport("required_variables", - value="var_compatability_suite"), + value="var_compatibility_suite"), _REQUIRED_VARS_VAR_ACTION) NUM_ERRORS += check_datatable(_DATABASE, DatatableReport("input_variables", - value="var_compatability_suite"), + value="var_compatibility_suite"), _INPUT_VARS_VAR_ACTION) NUM_ERRORS += check_datatable(_DATABASE, DatatableReport("output_variables", - value="var_compatability_suite"), + value="var_compatibility_suite"), _OUTPUT_VARS_VAR_ACTION) sys.exit(NUM_ERRORS) diff --git a/test/var_compatability_test/var_compatability_files.txt b/test/var_compatibility_test/var_compatibility_files.txt similarity index 100% rename from test/var_compatability_test/var_compatability_files.txt rename to test/var_compatibility_test/var_compatibility_files.txt diff --git a/test/var_compatability_test/var_compatability_suite.xml b/test/var_compatibility_test/var_compatibility_suite.xml similarity index 69% rename from test/var_compatability_test/var_compatability_suite.xml rename to test/var_compatibility_test/var_compatibility_suite.xml index ae75d9f7..4b70fe48 100644 --- a/test/var_compatability_test/var_compatability_suite.xml +++ b/test/var_compatibility_test/var_compatibility_suite.xml @@ -1,6 +1,6 @@ - + effr_calc