Test script updates and input tests #800

rem1776 · 2021-08-13T17:16:03Z

Description
Was gonna make this off of the branch from #654 , but figured it might be better to make a separate PR since the comparison was huge with the updates to FMS.

takes Seth's updates from 209 darwin.test.fix #654 and converts each test script to use the new harness
Adds environment variables for verbose test output when set (TEST_VERBOSE)
Adjusts logic so SKIP_TESTS can be used with two digit test numbers and ranges
Adds in/fixes some tests that were in PRs or skipped previously
Adds a configure flag, --enable-test-input=/path, that enables tests in FMS that require input files. The input directory and structure it needs to be in is on both dev boxes at /home/fms_test_input

Fixes #209
Fixes #322
Fixes #482
Fixes #484

How Has This Been Tested?
Tested on amd and skylake with intel and gnu compilers

Checklist:

My code follows the style guidelines of this project
I have performed a self-review of my own code
I have commented my code, particularly in hard-to-understand areas
I have made corresponding changes to the documentation
My changes generate no new warnings
Any dependent changes have been merged and published in downstream modules
New check tests, if applicable, are included
make distcheck passes

Fix not casting `void*` to the correct type when dereferencing.

This is to keep the `include` of mkmods.mk from creating the .mod directory

This has the beginnings of the new test harness for autoconf (and hopefully CMake). This uses a new test-lib.sh test library that outputs in TAP. This only has affinity, axis_utils, data_override, and diag_manager configured for the new tests. All other tests are currently commented out.

Needed for the new test harness

This is to better track if the updated tests are working as expected

Missing ./ to allow test to run on systems that do not have . in PATH

Some of the past changes did not allow make dist to work. This corrects that problem

…dually

…stingUpdates

bensonr

Nice job breaking up the mpp_domains test into easier to handle individual tests.

bensonr · 2022-03-04T15:06:52Z

mosaic/read_mosaic.c

@@ -259,13 +259,13 @@ void get_var_data(const char *file, const char *name, void *data)
  switch (vartype) {
    case NC_DOUBLE:case NC_FLOAT:
 #ifdef OVERLOAD_R4
-      status = nc_get_var_float(ncid, varid, data);
+      status = nc_get_var_float(ncid, varid, (float *)data);


Is this OVERLOAD potentially affecting how things work and should the NC_DOUBLE and NC_FLOAT cases be broken into individual cases?

These changes were put in by seth in #654 actually to fix some compile issues on darwin, but they look good to me. With the previous logic it would read in data as float or double based on whichever is the fortran default kind so this just adds the cast to data since its a void pointer.

bensonr · 2022-03-04T15:07:14Z

mosaic/read_mosaic.c

@@ -319,13 +319,13 @@ void get_var_data_region(const char *file, const char *name, const size_t *start
  switch (vartype) {
    case NC_DOUBLE:case NC_FLOAT:
 #ifdef OVERLOAD_R4
-      status = nc_get_vara_float(ncid, varid, start, nread, data);
+      status = nc_get_vara_float(ncid, varid, start, nread, (float *)data);


Same as above

test_fms/drifters/test_drifters_comm.F90

test_fms/mpp/test_domains_utility_mod.F90

test_fms/mpp/test_mpp_domains.F90

test_fms/mpp_io/test_io_mosaic_R4_R8.F90

test_fms/mpp_io/test_mpp_io.F90

rem1776 · 2022-03-04T17:23:53Z

@bensonr This should be ready now, I put in fixes for everything but the mosaic changes

* get_unit warning now only prints on root_pe (NOAA-GFDL#872) Co-authored-by: Eric Stofferahn <[email protected]> * Update changelog, version numbers and build info (NOAA-GFDL#873) Co-authored-by: rem1776 <[email protected]> * chore: Change version number to next development version (NOAA-GFDL#874) * CI: Update build action for yaml parser (NOAA-GFDL#871) Update build actions Change images to organization's repo and fix mixed mode parser test failure * test(parser): Change real comparison value to double (NOAA-GFDL#886) Co-authored-by: rem1776 <[email protected]> * Make 'unsupported kind' error messages more descriptive. Change author of constants4.F90 * Add doxygen comment to valid_types in sat_vapor_pres/sat_vapor_pres_k.F90 * Modify codes for r8-r4 conversion to remove compiler warnings * Remove OVERLOAD_R8 directives regarding send_data_*d_r8 subroutines * Add Doxygen comments to constants4.F90 * Updates AM4 regression test suite to run intel 21 only on PW (NOAA-GFDL#893) * feat: emc changes for mixedmode (NOAA-GFDL#857) (NOAA-GFDL#898) * Change send_data interface and any necessary routines for mixed real precision support * Adds an r4 size constants file BREAKING CHANGE: changes some argument types in diag_manager, tracer_manager, sat_vapor_pres, and time_manager from real to class(*) Co-authored-by: Minsuk Ji <[email protected]> * feat: adds option to override (ignore) checksum test when reading restarts (NOAA-GFDL#889) * update to fms2_io to allow reads to ignore embedded checksums on a fileobj basis * added fms2_io test cases for the ignore_checksum option to restart reads tests the domain, domain_wrap, and bc restart options * docs: add CI information file (NOAA-GFDL#899) * test: Adds check_nml_error after reading a namelist, so it could crash only as expected (NOAA-GFDL#904) * Revert "feat: emc changes for mixedmode (NOAA-GFDL#857) (NOAA-GFDL#898)" (NOAA-GFDL#914) This reverts commit 516a5ef. * fix: clean up unused/uninitialized variables and other warnings (NOAA-GFDL#859) Remove unused variables throughout and changes/removals for other warnings such as uninitialized values and implicit casts * docs: update function style and branch names * Changes master to main in CONTRIBUTING.md * Claifies function return documentation in CODE_STYLE.md * feat: adds support for logical variables in the yaml parser (NOAA-GFDL#907) * Adds support for logical variables in the yaml parser * correctly determines if a string is true or false * fix: add check for affinity to self-initialize and update test program (NOAA-GFDL#917) * fix: adds casts to class(*) calls to match doubles in C routines (NOAA-GFDL#920) Co-authored-by: rem1776 <[email protected]> * build: add intel code coverage build option to autotools (NOAA-GFDL#895) * refactor: change to inclusive variable names (NOAA-GFDL#926) * feat: Allow maximum number of restart variables to be set at build time (NOAA-GFDL#909) * fix: Fixes for linter action and code style (NOAA-GFDL#869) * test: Test script updates and input tests (NOAA-GFDL#800) Rewrites test script to use added testing shell functions Adds previously skipped or removed unit tests and support for testing with input files Co-authored-by: Seth Underwood <[email protected]> Co-authored-by: Uriel Ramirez <[email protected]> * chore: 2022.01 release changes (NOAA-GFDL#941) * chore: change version number to next development version (NOAA-GFDL#945) * Add option for position independent code (NOAA-GFDL#930) * fix: document and change parameter names for grid versions (NOAA-GFDL#918) * fix: Moving empty and non-existent data table handling inside data_override (NOAA-GFDL#933) Enables the processing of an empty or non-existent data_table or data_table.yaml from within data_override, so that any routine can call data_override_init without worry * fix: Removal of internal FMS use of fms_io and mpp_io (NOAA-GFDL#928) * fix: mpp changes to solve compile issues with serial builds (NOAA-GFDL#949) * feat: adds build option for compiling with different sets of constants (NOAA-GFDL#929) * feat: add and aggregate mpp_chksum unit tests (NOAA-GFDL#946) * feat: add module for string utility routines (NOAA-GFDL#911) Adds module and accompanying test for common string operations * revert: reinstated the mpp_io routines and put them at the end for future elimination. (NOAA-GFDL#952) * fix: add back in small_fac parameter to constants .h files (NOAA-GFDL#954) * fix: root pe bug with fms2_io::flush_file (NOAA-GFDL#958) * fix: clean up string routines for fms_string_utils_mod (NOAA-GFDL#953) * Make changes to lines with more than 120 columns Co-authored-by: Ryan Mulhall <[email protected]> Co-authored-by: Eric Stofferahn <[email protected]> Co-authored-by: rem1776 <[email protected]> Co-authored-by: Tom Robinson <[email protected]> Co-authored-by: Rusty Benson <[email protected]> Co-authored-by: uramirez8707 <[email protected]> Co-authored-by: Raffaele Montuoro <[email protected]> Co-authored-by: Seth Underwood <[email protected]> Co-authored-by: Uriel Ramirez <[email protected]> Co-authored-by: Matthew Thompson <[email protected]> Co-authored-by: Eric <[email protected]>

* get_unit warning now only prints on root_pe (NOAA-GFDL#872) Co-authored-by: Eric Stofferahn <[email protected]> * Update changelog, version numbers and build info (NOAA-GFDL#873) Co-authored-by: rem1776 <[email protected]> * chore: Change version number to next development version (NOAA-GFDL#874) * CI: Update build action for yaml parser (NOAA-GFDL#871) Update build actions Change images to organization's repo and fix mixed mode parser test failure * test(parser): Change real comparison value to double (NOAA-GFDL#886) Co-authored-by: rem1776 <[email protected]> * Make 'unsupported kind' error messages more descriptive. Change author of constants4.F90 * Add doxygen comment to valid_types in sat_vapor_pres/sat_vapor_pres_k.F90 * Modify codes for r8-r4 conversion to remove compiler warnings * Remove OVERLOAD_R8 directives regarding send_data_*d_r8 subroutines * Add Doxygen comments to constants4.F90 * Updates AM4 regression test suite to run intel 21 only on PW (NOAA-GFDL#893) * feat: emc changes for mixedmode (NOAA-GFDL#857) (NOAA-GFDL#898) * Change send_data interface and any necessary routines for mixed real precision support * Adds an r4 size constants file BREAKING CHANGE: changes some argument types in diag_manager, tracer_manager, sat_vapor_pres, and time_manager from real to class(*) Co-authored-by: Minsuk Ji <[email protected]> * feat: adds option to override (ignore) checksum test when reading restarts (NOAA-GFDL#889) * update to fms2_io to allow reads to ignore embedded checksums on a fileobj basis * added fms2_io test cases for the ignore_checksum option to restart reads tests the domain, domain_wrap, and bc restart options * docs: add CI information file (NOAA-GFDL#899) * test: Adds check_nml_error after reading a namelist, so it could crash only as expected (NOAA-GFDL#904) * Revert "feat: emc changes for mixedmode (NOAA-GFDL#857) (NOAA-GFDL#898)" (NOAA-GFDL#914) This reverts commit 516a5ef. * fix: clean up unused/uninitialized variables and other warnings (NOAA-GFDL#859) Remove unused variables throughout and changes/removals for other warnings such as uninitialized values and implicit casts * docs: update function style and branch names * Changes master to main in CONTRIBUTING.md * Claifies function return documentation in CODE_STYLE.md * feat: adds support for logical variables in the yaml parser (NOAA-GFDL#907) * Adds support for logical variables in the yaml parser * correctly determines if a string is true or false * fix: add check for affinity to self-initialize and update test program (NOAA-GFDL#917) * fix: adds casts to class(*) calls to match doubles in C routines (NOAA-GFDL#920) Co-authored-by: rem1776 <[email protected]> * build: add intel code coverage build option to autotools (NOAA-GFDL#895) * refactor: change to inclusive variable names (NOAA-GFDL#926) * feat: Allow maximum number of restart variables to be set at build time (NOAA-GFDL#909) * fix: Fixes for linter action and code style (NOAA-GFDL#869) * test: Test script updates and input tests (NOAA-GFDL#800) Rewrites test script to use added testing shell functions Adds previously skipped or removed unit tests and support for testing with input files Co-authored-by: Seth Underwood <[email protected]> Co-authored-by: Uriel Ramirez <[email protected]> * chore: 2022.01 release changes (NOAA-GFDL#941) * chore: change version number to next development version (NOAA-GFDL#945) * Add option for position independent code (NOAA-GFDL#930) * fix: document and change parameter names for grid versions (NOAA-GFDL#918) * fix: Moving empty and non-existent data table handling inside data_override (NOAA-GFDL#933) Enables the processing of an empty or non-existent data_table or data_table.yaml from within data_override, so that any routine can call data_override_init without worry * fix: Removal of internal FMS use of fms_io and mpp_io (NOAA-GFDL#928) * fix: mpp changes to solve compile issues with serial builds (NOAA-GFDL#949) * feat: adds build option for compiling with different sets of constants (NOAA-GFDL#929) * feat: add and aggregate mpp_chksum unit tests (NOAA-GFDL#946) * feat: add module for string utility routines (NOAA-GFDL#911) Adds module and accompanying test for common string operations * revert: reinstated the mpp_io routines and put them at the end for future elimination. (NOAA-GFDL#952) * fix: add back in small_fac parameter to constants .h files (NOAA-GFDL#954) * fix: root pe bug with fms2_io::flush_file (NOAA-GFDL#958) * fix: clean up string routines for fms_string_utils_mod (NOAA-GFDL#953) * chore: update libFMS module with new routines (NOAA-GFDL#912) * fix: removes fms_c.c and fms_c.h (NOAA-GFDL#961) * Make changes to lines with more than 120 columns Co-authored-by: Ryan Mulhall <[email protected]> Co-authored-by: Eric Stofferahn <[email protected]> Co-authored-by: rem1776 <[email protected]> Co-authored-by: Tom Robinson <[email protected]> Co-authored-by: Rusty Benson <[email protected]> Co-authored-by: uramirez8707 <[email protected]> Co-authored-by: Raffaele Montuoro <[email protected]> Co-authored-by: Seth Underwood <[email protected]> Co-authored-by: Uriel Ramirez <[email protected]> Co-authored-by: Matthew Thompson <[email protected]> Co-authored-by: Eric <[email protected]>

underwoo and others added 30 commits December 30, 2020 15:23

Fix C type issues causing errors for some compiles

d3d2c7b

Fix not casting `void*` to the correct type when dereferencing.

Merge branch 'fix.c.types' into 209-darwin.test.fix

ef54abe

Move mkdir of .mods to part of .F90.mod target

96ff432

This is to keep the `include` of mkmods.mk from creating the .mod directory

Forgot to add configure.ac

79368af

Needed for the new test harness

Additional changes to allow the truncated tests to pass CI

7211826

This is to better track if the updated tests are working as expected

Write all output to screen/log in test-lib

da7f3e7

Add ./ to affinity and axis_utils tests

a3c71d3

Missing ./ to allow test to run on systems that do not have . in PATH

Adding back drifters test

c77bc4b

Add exchange to test

2e8c4cf

Merge branch '649-test_unstruct_fms_io.fix' into 209-darwin.test.fix

8ade115

Add exchange, field_manager fms2_io and horiz_interp tests back

c618529

A few fixes to allow make dist work

bc54858

Some of the past changes did not allow make dist to work. This corrects that problem

Added ./ to test_drifters2.sh tests

a96d67f

Updated time_manager test to use new harness and run each test indivi…

fdb9d42

…dually

Updated mpp_io script and fixed failing test in time manager

b37a6d7

Allows testing harness to skip double digit test numbers

040eb17

Add automake generated log driver file

ca789a8

Add option for verbose output

cdd72f9

Update most test scripts for mpp

9d27d14

Output fixes + fix npes test

a7ac82b

fix whitespace + input issues

a33383a

mpp test fixes

9407722

Merge branch 'master' into pr654

0267771

Add test_fms/mpp dir to build tools

aad8238

Update test_mpp.F90 to latest version

9165160

Update makefiles

c503ff6

Update mixed prec test scripts

b611eae

Fix typo

48bf8f4

Merge remote-tracking branch 'origin/mixedPrecTestingUpdates' into te…

24704af

…stingUpdates

rem1776 mentioned this pull request Oct 20, 2021

Non-blocking domain updates bug fix #848

Merged

8 tasks

rem1776 added 2 commits October 20, 2021 15:33

Remove checksum skips and cleanup

fda55c0

Add mpp_exit call to nesting test

c9f5cac

rem1776 mentioned this pull request Oct 27, 2021

Fix NaN check in mpp_efp.F90 and add unit test #852

Closed

8 tasks

Merge remote-tracking branch 'upstream/main' into testingUpdates

b9c4942

uramirez8707 mentioned this pull request Nov 8, 2021

Yaml Parser #858

Merged

10 tasks

rem1776 added 9 commits February 22, 2022 16:56

Merge remote-tracking branch 'upstream/main' into testingUpdates

6b60dcd

Fix fms2_io typo and failing from leftover files

11eb5fd

Update yaml test script, makefile

14ede33

Merge remote-tracking branch 'upstream/main' into testingUpdates

fd994e0

Remove a line from the warnings clean up causing redistributes to fail

502ba81

Merge remote-tracking branch 'upstream/main' into testingUpdates

73cfd1d

Fix line lengths for the linter

c94610f

missed some whitespace

ec1c5f8

lost a comma

47f88a7

rem1776 assigned bensonr, wrongkindofdoctor and thomas-robinson Mar 4, 2022

bensonr reviewed Mar 4, 2022

View reviewed changes

rem1776 added 3 commits March 4, 2022 12:07

Address review comments

7291341

Missed an error message fix

56cf82b

modified: test_fms/mpp/test_domains_utility_mod.F90

7771478

bensonr approved these changes Mar 4, 2022

View reviewed changes

thomas-robinson approved these changes Mar 4, 2022

View reviewed changes

rem1776 merged commit 7b78a73 into NOAA-GFDL:main Mar 4, 2022

rem1776 mentioned this pull request Mar 8, 2022

209 darwin.test.fix #654

Closed

8 tasks

rem1776 mentioned this pull request Mar 24, 2022

Moving empty and non-existent data table handling inside data_override #933

Merged

8 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Test script updates and input tests #800

Test script updates and input tests #800

rem1776 commented Aug 13, 2021 •

edited

Loading

bensonr left a comment

bensonr Mar 4, 2022

rem1776 Mar 4, 2022

bensonr Mar 4, 2022

rem1776 commented Mar 4, 2022

Test script updates and input tests #800

Test script updates and input tests #800

Conversation

rem1776 commented Aug 13, 2021 • edited Loading

bensonr left a comment

Choose a reason for hiding this comment

bensonr Mar 4, 2022

Choose a reason for hiding this comment

rem1776 Mar 4, 2022

Choose a reason for hiding this comment

bensonr Mar 4, 2022

Choose a reason for hiding this comment

rem1776 commented Mar 4, 2022

rem1776 commented Aug 13, 2021 •

edited

Loading