From a99791b0b918382fa3ec9a2304c8b6fa27422f6d Mon Sep 17 00:00:00 2001 From: wrongkindofdoctor Date: Tue, 4 Feb 2020 16:09:03 -0500 Subject: [PATCH 01/19] removed .bats files updated the makefile.am template to include test_fms2_io and test_atmosphere_io tests removed .bats references from test shell scripts and changed the program launchers to run_test changed name of input.nml to input_base.nml --- test_fms/fms2_io/Makefile.am | 13 +++++++------ test_fms/fms2_io/{input.nml => input_base.nml} | 0 test_fms/fms2_io/test_atmosphere_io.bats | 14 -------------- test_fms/fms2_io/test_atmosphere_io.sh | 12 +++++++++++- test_fms/fms2_io/test_fms2_io.bats | 11 ----------- test_fms/fms2_io/test_fms2_io.sh | 17 +++++++++++++++-- 6 files changed, 33 insertions(+), 34 deletions(-) rename test_fms/fms2_io/{input.nml => input_base.nml} (100%) delete mode 100755 test_fms/fms2_io/test_atmosphere_io.bats delete mode 100755 test_fms/fms2_io/test_fms2_io.bats diff --git a/test_fms/fms2_io/Makefile.am b/test_fms/fms2_io/Makefile.am index 76294d63ef..c4fe47d0be 100644 --- a/test_fms/fms2_io/Makefile.am +++ b/test_fms/fms2_io/Makefile.am @@ -1,12 +1,13 @@ # This is an automake file for the test_fms/diag_manager directory of the FMS # package. -LOG_DRIVER = env AM_TAP_AWK='$(AWK)' $(SHELL) \ - $(top_srcdir)/tap-driver.sh +# J.Liptak, R.Menzel # Find the fms_mod.mod file. -AM_CPPFLAGS = -I${top_builddir}/mpp -AM_CPPFLAGS += -I${top_builddir}/fms2_io +AM_CPPFLAGS = -I${top_builddir}/mpp -I${top_builddir}/fms2_io + +# Link to the FMS library. +LDADD = ${top_builddir}/libFMS/libFMS.la # Build this test program. check_PROGRAMS = test_atmosphere_io @@ -14,7 +15,7 @@ check_PROGRAMS = test_atmosphere_io # This is the source code for the test. test_atmosphere_io_SOURCES = argparse.F90 setup.F90 test_atmosphere_io.F90 test_atmosphere_io_LDADD = ${top_builddir}/libFMS/libFMS.la -EXTRA_DIST = test_atmosphere_io.sh test_atmosphere_io.bats input.nml +EXTRA_DIST = test_atmosphere_io.sh input.nml argparse.mod: argparse.$(OBJEXT) setup.mod: setup.$(OBJEXT) @@ -27,7 +28,7 @@ TESTS = test_atmosphere_io.sh # Set srcdir as evironment variable to be reference in the job script TESTS_ENVIRONMENT = srcdir="$(top_srcdir)" -CLEANFILES = *.mod *.nc logfile.000000.out +CLEANFILES = *.mod *.nc input.nml logfile.000000.out ## Build this test program. #check_PROGRAMS = test_fms2_io diff --git a/test_fms/fms2_io/input.nml b/test_fms/fms2_io/input_base.nml similarity index 100% rename from test_fms/fms2_io/input.nml rename to test_fms/fms2_io/input_base.nml diff --git a/test_fms/fms2_io/test_atmosphere_io.bats b/test_fms/fms2_io/test_atmosphere_io.bats deleted file mode 100755 index 5db5c152a1..0000000000 --- a/test_fms/fms2_io/test_atmosphere_io.bats +++ /dev/null @@ -1,14 +0,0 @@ -setup() { - # Clear out any previous test files - rm -f *.nc > /dev/null 2>&1 - rm -f *.nc.* > /dev/null 2>&1 - rm -f logfile.*.out > /dev/null 2>&1 - rm -f input.nml - ln -s ${srcdir}/test_fms/fms2_io/input.nml input.nml -} - -@test "1" { - skip - run mpirun -n 6 ./test_atmosphere_io - [ "$status" -eq 0 ] -} diff --git a/test_fms/fms2_io/test_atmosphere_io.sh b/test_fms/fms2_io/test_atmosphere_io.sh index 20427061e3..f80693c301 100755 --- a/test_fms/fms2_io/test_atmosphere_io.sh +++ b/test_fms/fms2_io/test_atmosphere_io.sh @@ -1,2 +1,12 @@ #!/bin/sh -bats ${srcdir}/test_fms/fms2_io/test_atmosphere_io.bats +# This is part of the GFDL FMS package. This is a shell script to +# execute tests in the test_fms/fms2_io directory. + +# Set common test settings. +. ../test_common.sh + +# link to the input namelist +ln -s ${srcdir}/test_fms/fms2_io/input.nml input.nml + +# run the tests +run_test test_atmosphere_io 6 skip diff --git a/test_fms/fms2_io/test_fms2_io.bats b/test_fms/fms2_io/test_fms2_io.bats deleted file mode 100755 index 52f6971bbd..0000000000 --- a/test_fms/fms2_io/test_fms2_io.bats +++ /dev/null @@ -1,11 +0,0 @@ -setup() { - # Clear out any previous test files - rm -f *.nc > /dev/null 2>&1 - rm -f *.nc.* > /dev/null 2>&1 - rm -f logfile.*.out > /dev/null 2>&1 -} - -@test "1" { - run mpirun -n 6 ./test_fms2_io - [ "$status" -eq 0 ] -} diff --git a/test_fms/fms2_io/test_fms2_io.sh b/test_fms/fms2_io/test_fms2_io.sh index 8b1417ee07..cae6e96e77 100755 --- a/test_fms/fms2_io/test_fms2_io.sh +++ b/test_fms/fms2_io/test_fms2_io.sh @@ -1,3 +1,16 @@ #!/bin/sh -export PATH="$PATH:../bats/bin" -bats test_fms2_io.bats + +# This is part of the GFDL FMS package. This is a shell script to +# execute tests in the test_fms/field_manager directory. + +# Ed Hartnett 11/29/19 + +# Set common test settings. +. ../test_common.sh + +# link to the input namelist +ln -s ${srcdir}/test_fms/fms2_io/input_base.nml input.nml + +# run the tests +run_test test_fms2_io 6 skip +run_test test_atmosphere_io 6 skip From 8aefbbfc93ef0abe174c2825ff2db2b5eba1e23f Mon Sep 17 00:00:00 2001 From: wrongkindofdoctor Date: Tue, 4 Feb 2020 16:24:24 -0500 Subject: [PATCH 02/19] changed input.nml to input_base.nml in makefile EXTRA_DIST definition --- test_fms/fms2_io/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test_fms/fms2_io/Makefile.am b/test_fms/fms2_io/Makefile.am index c4fe47d0be..3b78002f9a 100644 --- a/test_fms/fms2_io/Makefile.am +++ b/test_fms/fms2_io/Makefile.am @@ -15,7 +15,7 @@ check_PROGRAMS = test_atmosphere_io # This is the source code for the test. test_atmosphere_io_SOURCES = argparse.F90 setup.F90 test_atmosphere_io.F90 test_atmosphere_io_LDADD = ${top_builddir}/libFMS/libFMS.la -EXTRA_DIST = test_atmosphere_io.sh input.nml +EXTRA_DIST = test_atmosphere_io.sh input_base.nml argparse.mod: argparse.$(OBJEXT) setup.mod: setup.$(OBJEXT) From eb403ee88a75792366ac3b7d792c341d10153ca1 Mon Sep 17 00:00:00 2001 From: wrongkindofdoctor Date: Tue, 4 Feb 2020 16:46:42 -0500 Subject: [PATCH 03/19] added calls to separate test_fms2_io and test_atmosphere_io scripts removed unneeded test-specific fms library LDADD definitions from makefile --- test_fms/fms2_io/Makefile.am | 7 ++++--- test_fms/fms2_io/test_fms2_io.sh | 6 +----- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/test_fms/fms2_io/Makefile.am b/test_fms/fms2_io/Makefile.am index 3b78002f9a..e87d9e1206 100644 --- a/test_fms/fms2_io/Makefile.am +++ b/test_fms/fms2_io/Makefile.am @@ -10,20 +10,21 @@ AM_CPPFLAGS = -I${top_builddir}/mpp -I${top_builddir}/fms2_io LDADD = ${top_builddir}/libFMS/libFMS.la # Build this test program. -check_PROGRAMS = test_atmosphere_io +check_PROGRAMS = test_fms2_io test_atmosphere_io # This is the source code for the test. +test_fms2_io_SOURCES = argparse.F90 test_fms2_io.F90 test_atmosphere_io_SOURCES = argparse.F90 setup.F90 test_atmosphere_io.F90 -test_atmosphere_io_LDADD = ${top_builddir}/libFMS/libFMS.la EXTRA_DIST = test_atmosphere_io.sh input_base.nml argparse.mod: argparse.$(OBJEXT) setup.mod: setup.$(OBJEXT) setup.$(OBJEXT): argparse.mod test_atmosphere_io.$(OBJEXT): setup.mod +test_fms2_io.$(OBJEXT): argparse.mod # Run the test program. -TESTS = test_atmosphere_io.sh +TESTS = test_fms2_io test_atmosphere_io.sh # Set srcdir as evironment variable to be reference in the job script TESTS_ENVIRONMENT = srcdir="$(top_srcdir)" diff --git a/test_fms/fms2_io/test_fms2_io.sh b/test_fms/fms2_io/test_fms2_io.sh index cae6e96e77..514843bd59 100755 --- a/test_fms/fms2_io/test_fms2_io.sh +++ b/test_fms/fms2_io/test_fms2_io.sh @@ -8,9 +8,5 @@ # Set common test settings. . ../test_common.sh -# link to the input namelist -ln -s ${srcdir}/test_fms/fms2_io/input_base.nml input.nml - # run the tests -run_test test_fms2_io 6 skip -run_test test_atmosphere_io 6 skip +run_test test_fms2_io 6 From 6653506e05e7a688bbebd411c24c0ba74e84b2f9 Mon Sep 17 00:00:00 2001 From: wrongkindofdoctor Date: Tue, 4 Feb 2020 17:03:43 -0500 Subject: [PATCH 04/19] added create_atmosphere_domain.inc to the makefile test_atmosphere_io_SOURCES --- test_fms/fms2_io/Makefile.am | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test_fms/fms2_io/Makefile.am b/test_fms/fms2_io/Makefile.am index e87d9e1206..2ccb6fbfef 100644 --- a/test_fms/fms2_io/Makefile.am +++ b/test_fms/fms2_io/Makefile.am @@ -1,4 +1,4 @@ -# This is an automake file for the test_fms/diag_manager directory of the FMS +# This is an automake file for the test_fms/fms2_io directory of the FMS # package. # J.Liptak, R.Menzel @@ -14,7 +14,7 @@ check_PROGRAMS = test_fms2_io test_atmosphere_io # This is the source code for the test. test_fms2_io_SOURCES = argparse.F90 test_fms2_io.F90 -test_atmosphere_io_SOURCES = argparse.F90 setup.F90 test_atmosphere_io.F90 +test_atmosphere_io_SOURCES = argparse.F90 setup.F90 test_atmosphere_io.F90 create_atmosphere_domain.inc EXTRA_DIST = test_atmosphere_io.sh input_base.nml argparse.mod: argparse.$(OBJEXT) From 50fb1c9cb813823b2d2ab5f8820e220388419569 Mon Sep 17 00:00:00 2001 From: wrongkindofdoctor Date: Thu, 6 Feb 2020 11:13:07 -0500 Subject: [PATCH 05/19] added missing .inc files to test_atmos_io_SOURCES in Makefile.am --- test_fms/fms2_io/Makefile.am | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/test_fms/fms2_io/Makefile.am b/test_fms/fms2_io/Makefile.am index 2ccb6fbfef..36c9be3b72 100644 --- a/test_fms/fms2_io/Makefile.am +++ b/test_fms/fms2_io/Makefile.am @@ -14,7 +14,11 @@ check_PROGRAMS = test_fms2_io test_atmosphere_io # This is the source code for the test. test_fms2_io_SOURCES = argparse.F90 test_fms2_io.F90 -test_atmosphere_io_SOURCES = argparse.F90 setup.F90 test_atmosphere_io.F90 create_atmosphere_domain.inc +test_atmosphere_io_SOURCES = argparse.F90 setup.F90 test_atmosphere_io.F90 \ + create_atmosphere_domain.inc create_land_domain.inc create_ocean_domain.inc \ + atmosphere_restart_file_test.inc ocean_restart_file_test.inc \ + land_compressed_restart_file_test.inc land_unstructured_restart_file_test.inc + EXTRA_DIST = test_atmosphere_io.sh input_base.nml argparse.mod: argparse.$(OBJEXT) From 5298ecd249a6d31cddb0d76592b35ec22361000d Mon Sep 17 00:00:00 2001 From: wrongkindofdoctor Date: Thu, 6 Feb 2020 11:35:52 -0500 Subject: [PATCH 06/19] removed subroutine open_check from test_fms2_io b/c already defined in fms2_io code --- test_fms/fms2_io/test_fms2_io.F90 | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/test_fms/fms2_io/test_fms2_io.F90 b/test_fms/fms2_io/test_fms2_io.F90 index 0fcb895d8e..12ccd1f42e 100644 --- a/test_fms/fms2_io/test_fms2_io.F90 +++ b/test_fms/fms2_io/test_fms2_io.F90 @@ -186,17 +186,6 @@ subroutine mpi_check(err) endif end subroutine mpi_check - -subroutine open_check(flag) - - logical, intent(in) :: flag - - if (.not. flag) then - call mpp_error(fatal, "Error occured while opening file.") - endif -end subroutine open_check - - subroutine chksum_match(out_chksum, in_chksum, var_name, debug) integer(kind=int64), intent(in) :: out_chksum From 4a30bb1ec04644c84d50facbf644110d6871ebd2 Mon Sep 17 00:00:00 2001 From: wrongkindofdoctor Date: Thu, 6 Feb 2020 11:52:08 -0500 Subject: [PATCH 07/19] replaced write_restart with write_data calls --- test_fms/fms2_io/atmosphere_restart_file_test.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test_fms/fms2_io/atmosphere_restart_file_test.inc b/test_fms/fms2_io/atmosphere_restart_file_test.inc index e29eec846e..f5623aedc5 100644 --- a/test_fms/fms2_io/atmosphere_restart_file_test.inc +++ b/test_fms/fms2_io/atmosphere_restart_file_test.inc @@ -241,11 +241,11 @@ subroutine atmosphere_restart_file(domain, nz, nt, debug_flag) !Write out "intermdiate" restart files. tstamp = "" write(tstamp, *) i - call write_restart(fileobj, unlim_dim_level=1, timestamp=trim(tstamp)) + call write_data(fileobj, unlim_dim_level=1, timestamp=trim(tstamp)) enddo !Write out the restart file. - call write_restart(fileobj, unlim_dim_level=nt) + call write_data(fileobj, unlim_dim_level=nt) out_chksum(1) = mpp_chksum(temperature_data, pelist=(/mpp_pe()/)) chksum_unlim_level(1) = nt From 26cabd2ea9e4ef1b97515058cd160d21643a3058 Mon Sep 17 00:00:00 2001 From: wrongkindofdoctor Date: Thu, 6 Feb 2020 13:42:24 -0500 Subject: [PATCH 08/19] removed unsupported write_data call with timestamp argument --- test_fms/fms2_io/atmosphere_restart_file_test.inc | 5 ----- 1 file changed, 5 deletions(-) diff --git a/test_fms/fms2_io/atmosphere_restart_file_test.inc b/test_fms/fms2_io/atmosphere_restart_file_test.inc index f5623aedc5..170de0dcc0 100644 --- a/test_fms/fms2_io/atmosphere_restart_file_test.inc +++ b/test_fms/fms2_io/atmosphere_restart_file_test.inc @@ -237,11 +237,6 @@ subroutine atmosphere_restart_file(domain, nz, nt, debug_flag) !Write out the times of each "time step". call write_data(fileobj, "time", 1950. + real(i,kind=real32), unlim_dim_level=i) - - !Write out "intermdiate" restart files. - tstamp = "" - write(tstamp, *) i - call write_data(fileobj, unlim_dim_level=1, timestamp=trim(tstamp)) enddo !Write out the restart file. From f793f00a2f2bbe1a1920b1d1cb9abe843c9e41b3 Mon Sep 17 00:00:00 2001 From: wrongkindofdoctor Date: Thu, 6 Feb 2020 14:06:39 -0500 Subject: [PATCH 09/19] replaced write_data with write_restart where restart file is written in atmosphere_restart_file_test.inc --- test_fms/fms2_io/atmosphere_restart_file_test.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test_fms/fms2_io/atmosphere_restart_file_test.inc b/test_fms/fms2_io/atmosphere_restart_file_test.inc index 170de0dcc0..d6cbd744c3 100644 --- a/test_fms/fms2_io/atmosphere_restart_file_test.inc +++ b/test_fms/fms2_io/atmosphere_restart_file_test.inc @@ -240,7 +240,7 @@ subroutine atmosphere_restart_file(domain, nz, nt, debug_flag) enddo !Write out the restart file. - call write_data(fileobj, unlim_dim_level=nt) + call write_restart(fileobj, unlim_dim_level=nt) out_chksum(1) = mpp_chksum(temperature_data, pelist=(/mpp_pe()/)) chksum_unlim_level(1) = nt From b74ebc7e2e9e8bb0101e9d5c5f6c1614eaa3dd13 Mon Sep 17 00:00:00 2001 From: wrongkindofdoctor Date: Thu, 6 Feb 2020 14:24:22 -0500 Subject: [PATCH 10/19] appended .sh to test_fms2_io in makefile TESTS definition --- test_fms/fms2_io/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test_fms/fms2_io/Makefile.am b/test_fms/fms2_io/Makefile.am index 36c9be3b72..c335a1924a 100644 --- a/test_fms/fms2_io/Makefile.am +++ b/test_fms/fms2_io/Makefile.am @@ -28,7 +28,7 @@ test_atmosphere_io.$(OBJEXT): setup.mod test_fms2_io.$(OBJEXT): argparse.mod # Run the test program. -TESTS = test_fms2_io test_atmosphere_io.sh +TESTS = test_fms2_io.sh test_atmosphere_io.sh # Set srcdir as evironment variable to be reference in the job script TESTS_ENVIRONMENT = srcdir="$(top_srcdir)" From afd2725b978b69f17a4a17bd81d6d5134de57282 Mon Sep 17 00:00:00 2001 From: wrongkindofdoctor Date: Thu, 6 Feb 2020 14:38:12 -0500 Subject: [PATCH 11/19] appended test_fms2_io.sh to makefile EXTRA_DIST definition --- test_fms/fms2_io/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test_fms/fms2_io/Makefile.am b/test_fms/fms2_io/Makefile.am index c335a1924a..733a0d56af 100644 --- a/test_fms/fms2_io/Makefile.am +++ b/test_fms/fms2_io/Makefile.am @@ -19,7 +19,7 @@ test_atmosphere_io_SOURCES = argparse.F90 setup.F90 test_atmosphere_io.F90 \ atmosphere_restart_file_test.inc ocean_restart_file_test.inc \ land_compressed_restart_file_test.inc land_unstructured_restart_file_test.inc -EXTRA_DIST = test_atmosphere_io.sh input_base.nml +EXTRA_DIST = test_fms2_io.sh test_atmosphere_io.sh input_base.nml argparse.mod: argparse.$(OBJEXT) setup.mod: setup.$(OBJEXT) From dc507f78117427e1adc7dc55b207bd08b2265e8e Mon Sep 17 00:00:00 2001 From: wrongkindofdoctor Date: Thu, 6 Feb 2020 15:12:28 -0500 Subject: [PATCH 12/19] moved some .inc files to test_fms2_io_SOURCES definition --- test_fms/fms2_io/Makefile.am | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/test_fms/fms2_io/Makefile.am b/test_fms/fms2_io/Makefile.am index 733a0d56af..e458f441aa 100644 --- a/test_fms/fms2_io/Makefile.am +++ b/test_fms/fms2_io/Makefile.am @@ -13,11 +13,12 @@ LDADD = ${top_builddir}/libFMS/libFMS.la check_PROGRAMS = test_fms2_io test_atmosphere_io # This is the source code for the test. -test_fms2_io_SOURCES = argparse.F90 test_fms2_io.F90 -test_atmosphere_io_SOURCES = argparse.F90 setup.F90 test_atmosphere_io.F90 \ - create_atmosphere_domain.inc create_land_domain.inc create_ocean_domain.inc \ - atmosphere_restart_file_test.inc ocean_restart_file_test.inc \ - land_compressed_restart_file_test.inc land_unstructured_restart_file_test.inc +test_fms2_io_SOURCES = argparse.F90 test_fms2_io.F90 create_atmosphere_domain.inc \ + create_land_domain.inc create_ocean_domain.inc \ + ocean_restart_file_test.inc land_compressed_restart_file_test.inc \ + land_unstructured_restart_file_test.inc +test_atmosphere_io_SOURCES = argparse.F90 setup.F90 test_atmosphere_io.F90 \ + atmosphere_restart_file_test.inc EXTRA_DIST = test_fms2_io.sh test_atmosphere_io.sh input_base.nml From 1bc7818f7ca024a2806b7803bab9e03f9525b8e3 Mon Sep 17 00:00:00 2001 From: wrongkindofdoctor Date: Wed, 25 Mar 2020 14:46:46 -0400 Subject: [PATCH 13/19] updated authors, fixed directory patah, added lines to remove existing netcdf and log files --- test_fms/fms2_io/test_fms2_io.sh | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/test_fms/fms2_io/test_fms2_io.sh b/test_fms/fms2_io/test_fms2_io.sh index 514843bd59..5f5c8d7144 100755 --- a/test_fms/fms2_io/test_fms2_io.sh +++ b/test_fms/fms2_io/test_fms2_io.sh @@ -1,12 +1,16 @@ #!/bin/sh # This is part of the GFDL FMS package. This is a shell script to -# execute tests in the test_fms/field_manager directory. +# execute tests in the test_fms/fms2_io directory. -# Ed Hartnett 11/29/19 +# Authors: Raymond Menzel +# Jessica Liptak # Set common test settings. . ../test_common.sh - +# Clear out any previous test files +rm -f *.nc > /dev/null 2>&1 +rm -f *.nc.* > /dev/null 2>&1 +rm -f logfile.*.out > /dev/null 2>&1 # run the tests run_test test_fms2_io 6 From 2f489f52814dee78544585d0d07cbd900c0111c1 Mon Sep 17 00:00:00 2001 From: wrongkindofdoctor Date: Wed, 25 Mar 2020 17:39:18 -0400 Subject: [PATCH 14/19] added lines to remove netcdf files from run directory changed soft link to input.nml to a cp added statement to create input.nml from input_base.nml to test_fms2_io.sh --- test_fms/fms2_io/test_atmosphere_io.sh | 2 +- test_fms/fms2_io/test_fms2_io.sh | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/test_fms/fms2_io/test_atmosphere_io.sh b/test_fms/fms2_io/test_atmosphere_io.sh index f80693c301..c5fc98fd86 100755 --- a/test_fms/fms2_io/test_atmosphere_io.sh +++ b/test_fms/fms2_io/test_atmosphere_io.sh @@ -6,7 +6,7 @@ . ../test_common.sh # link to the input namelist -ln -s ${srcdir}/test_fms/fms2_io/input.nml input.nml +cp ${srcdir}/test_fms/fms2_io/input_base.nml input.nml # run the tests run_test test_atmosphere_io 6 skip diff --git a/test_fms/fms2_io/test_fms2_io.sh b/test_fms/fms2_io/test_fms2_io.sh index 5f5c8d7144..d2f01e28b7 100755 --- a/test_fms/fms2_io/test_fms2_io.sh +++ b/test_fms/fms2_io/test_fms2_io.sh @@ -12,5 +12,7 @@ rm -f *.nc > /dev/null 2>&1 rm -f *.nc.* > /dev/null 2>&1 rm -f logfile.*.out > /dev/null 2>&1 +rm -f input.nml > /dev/null 2>&1 +cp input_base.nml input.nml # run the tests run_test test_fms2_io 6 From d61b5ac9e2a03bb1788ae448d857d60bde62588f Mon Sep 17 00:00:00 2001 From: wrongkindofdoctor Date: Thu, 26 Mar 2020 15:55:59 -0400 Subject: [PATCH 15/19] removed whitespace from Makefile added *.nc.* to CLEANFILES in fms2_io Makefile removed -rm statements from test_fms2_io.sh added skip option to test_fms2_io.sh while fixing fillvalue type mismatch bug --- test_fms/fms2_io/Makefile.am | 4 ++-- test_fms/fms2_io/test_fms2_io.sh | 10 +++------- 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/test_fms/fms2_io/Makefile.am b/test_fms/fms2_io/Makefile.am index e458f441aa..12a7d42157 100644 --- a/test_fms/fms2_io/Makefile.am +++ b/test_fms/fms2_io/Makefile.am @@ -17,7 +17,7 @@ test_fms2_io_SOURCES = argparse.F90 test_fms2_io.F90 create_atmosphere_domain.in create_land_domain.inc create_ocean_domain.inc \ ocean_restart_file_test.inc land_compressed_restart_file_test.inc \ land_unstructured_restart_file_test.inc -test_atmosphere_io_SOURCES = argparse.F90 setup.F90 test_atmosphere_io.F90 \ +test_atmosphere_io_SOURCES = argparse.F90 setup.F90 test_atmosphere_io.F90 \ atmosphere_restart_file_test.inc EXTRA_DIST = test_fms2_io.sh test_atmosphere_io.sh input_base.nml @@ -34,7 +34,7 @@ TESTS = test_fms2_io.sh test_atmosphere_io.sh # Set srcdir as evironment variable to be reference in the job script TESTS_ENVIRONMENT = srcdir="$(top_srcdir)" -CLEANFILES = *.mod *.nc input.nml logfile.000000.out +CLEANFILES = *.mod *.nc *.nc.* input.nml logfile.000000.out ## Build this test program. #check_PROGRAMS = test_fms2_io diff --git a/test_fms/fms2_io/test_fms2_io.sh b/test_fms/fms2_io/test_fms2_io.sh index d2f01e28b7..a4e8ff4f34 100755 --- a/test_fms/fms2_io/test_fms2_io.sh +++ b/test_fms/fms2_io/test_fms2_io.sh @@ -8,11 +8,7 @@ # Set common test settings. . ../test_common.sh -# Clear out any previous test files -rm -f *.nc > /dev/null 2>&1 -rm -f *.nc.* > /dev/null 2>&1 -rm -f logfile.*.out > /dev/null 2>&1 -rm -f input.nml > /dev/null 2>&1 -cp input_base.nml input.nml +# create a new input namelist from template +cp ${srcdir}/test_fms/fms2_io/input_base.nml input.nml # run the tests -run_test test_fms2_io 6 +run_test test_fms2_io 6 skip From ecb77ccf73c30b4d524444033d137e68a5f2e732 Mon Sep 17 00:00:00 2001 From: wrongkindofdoctor Date: Fri, 27 Mar 2020 09:08:59 -0400 Subject: [PATCH 16/19] removed input_base.nml and statements to copy this file to input.nml from shell scripts added input.nml to directory since this file is just a dummy to test the namelist functionality removed input.nml from Makefile.am Cleanfiles line --- test_fms/fms2_io/Makefile.am | 17 +---------------- test_fms/fms2_io/{input_base.nml => input.nml} | 0 test_fms/fms2_io/test_atmosphere_io.sh | 3 --- test_fms/fms2_io/test_fms2_io.sh | 2 -- 4 files changed, 1 insertion(+), 21 deletions(-) rename test_fms/fms2_io/{input_base.nml => input.nml} (100%) diff --git a/test_fms/fms2_io/Makefile.am b/test_fms/fms2_io/Makefile.am index 12a7d42157..9d65602044 100644 --- a/test_fms/fms2_io/Makefile.am +++ b/test_fms/fms2_io/Makefile.am @@ -34,19 +34,4 @@ TESTS = test_fms2_io.sh test_atmosphere_io.sh # Set srcdir as evironment variable to be reference in the job script TESTS_ENVIRONMENT = srcdir="$(top_srcdir)" -CLEANFILES = *.mod *.nc *.nc.* input.nml logfile.000000.out - -## Build this test program. -#check_PROGRAMS = test_fms2_io -# -## This is the source code for the test. -#test_fms2_io_SOURCES = argparse.F90 test_fms2_io.F90 -#test_fms2_io_LDADD = ${top_builddir}/libFMS/libFMS.la -# -#argparse.mod: argparse.$(OBJEXT) -#test_fms2_io.$(OBJEXT): argparse.mod -# -#CLEANFILES = *.mod -# -## Run the test program. -#TESTS = test_fms2_io.sh +CLEANFILES = *.mod *.nc *.nc.* logfile.000000.out diff --git a/test_fms/fms2_io/input_base.nml b/test_fms/fms2_io/input.nml similarity index 100% rename from test_fms/fms2_io/input_base.nml rename to test_fms/fms2_io/input.nml diff --git a/test_fms/fms2_io/test_atmosphere_io.sh b/test_fms/fms2_io/test_atmosphere_io.sh index c5fc98fd86..6d666031c6 100755 --- a/test_fms/fms2_io/test_atmosphere_io.sh +++ b/test_fms/fms2_io/test_atmosphere_io.sh @@ -5,8 +5,5 @@ # Set common test settings. . ../test_common.sh -# link to the input namelist -cp ${srcdir}/test_fms/fms2_io/input_base.nml input.nml - # run the tests run_test test_atmosphere_io 6 skip diff --git a/test_fms/fms2_io/test_fms2_io.sh b/test_fms/fms2_io/test_fms2_io.sh index a4e8ff4f34..0184ecb466 100755 --- a/test_fms/fms2_io/test_fms2_io.sh +++ b/test_fms/fms2_io/test_fms2_io.sh @@ -8,7 +8,5 @@ # Set common test settings. . ../test_common.sh -# create a new input namelist from template -cp ${srcdir}/test_fms/fms2_io/input_base.nml input.nml # run the tests run_test test_fms2_io 6 skip From 862808f01ac23ae0bea62284f758720742d9437a Mon Sep 17 00:00:00 2001 From: wrongkindofdoctor Date: Fri, 27 Mar 2020 09:26:28 -0400 Subject: [PATCH 17/19] removed input.nml from directory --- test_fms/fms2_io/input.nml | 1 - 1 file changed, 1 deletion(-) delete mode 100644 test_fms/fms2_io/input.nml diff --git a/test_fms/fms2_io/input.nml b/test_fms/fms2_io/input.nml deleted file mode 100644 index 2ed53b12dd..0000000000 --- a/test_fms/fms2_io/input.nml +++ /dev/null @@ -1 +0,0 @@ -aljds;falkjsd From a7556c273d48fbde1672764e6fd849fb11f471ac Mon Sep 17 00:00:00 2001 From: wrongkindofdoctor Date: Fri, 27 Mar 2020 09:39:03 -0400 Subject: [PATCH 18/19] added input.nml back to test_fms/fms2_io directory, removed input_base.nml from test_fms/fms2_io/Makefile.am --- test_fms/fms2_io/Makefile.am | 2 +- test_fms/fms2_io/input.nml | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) create mode 100644 test_fms/fms2_io/input.nml diff --git a/test_fms/fms2_io/Makefile.am b/test_fms/fms2_io/Makefile.am index 9d65602044..e88c9225f0 100644 --- a/test_fms/fms2_io/Makefile.am +++ b/test_fms/fms2_io/Makefile.am @@ -20,7 +20,7 @@ test_fms2_io_SOURCES = argparse.F90 test_fms2_io.F90 create_atmosphere_domain.in test_atmosphere_io_SOURCES = argparse.F90 setup.F90 test_atmosphere_io.F90 \ atmosphere_restart_file_test.inc -EXTRA_DIST = test_fms2_io.sh test_atmosphere_io.sh input_base.nml +EXTRA_DIST = test_fms2_io.sh test_atmosphere_io.sh argparse.mod: argparse.$(OBJEXT) setup.mod: setup.$(OBJEXT) diff --git a/test_fms/fms2_io/input.nml b/test_fms/fms2_io/input.nml new file mode 100644 index 0000000000..61680cab3b --- /dev/null +++ b/test_fms/fms2_io/input.nml @@ -0,0 +1 @@ +blah;blahblah From a9e48443d1c5c7709837963423c76d9d6b2cfb8b Mon Sep 17 00:00:00 2001 From: wrongkindofdoctor Date: Fri, 27 Mar 2020 14:34:08 -0400 Subject: [PATCH 19/19] removed input.nml and replaced with lines to create a dummy namelist file in test_atmosphere_io.sh and test_fms2_io.sh --- test_fms/fms2_io/Makefile.am | 2 +- test_fms/fms2_io/input.nml | 1 - test_fms/fms2_io/test_atmosphere_io.sh | 3 ++- test_fms/fms2_io/test_fms2_io.sh | 4 +++- 4 files changed, 6 insertions(+), 4 deletions(-) delete mode 100644 test_fms/fms2_io/input.nml diff --git a/test_fms/fms2_io/Makefile.am b/test_fms/fms2_io/Makefile.am index e88c9225f0..dc7628845e 100644 --- a/test_fms/fms2_io/Makefile.am +++ b/test_fms/fms2_io/Makefile.am @@ -34,4 +34,4 @@ TESTS = test_fms2_io.sh test_atmosphere_io.sh # Set srcdir as evironment variable to be reference in the job script TESTS_ENVIRONMENT = srcdir="$(top_srcdir)" -CLEANFILES = *.mod *.nc *.nc.* logfile.000000.out +CLEANFILES = *.mod *.nc *.nc.* input.nml logfile.000000.out diff --git a/test_fms/fms2_io/input.nml b/test_fms/fms2_io/input.nml deleted file mode 100644 index 61680cab3b..0000000000 --- a/test_fms/fms2_io/input.nml +++ /dev/null @@ -1 +0,0 @@ -blah;blahblah diff --git a/test_fms/fms2_io/test_atmosphere_io.sh b/test_fms/fms2_io/test_atmosphere_io.sh index 6d666031c6..6e3831103e 100755 --- a/test_fms/fms2_io/test_atmosphere_io.sh +++ b/test_fms/fms2_io/test_atmosphere_io.sh @@ -4,6 +4,7 @@ # Set common test settings. . ../test_common.sh - +# make an input.nml for mpp_init to read +printf "EOF\n&dummy\nEOF" | cat > input.nml # run the tests run_test test_atmosphere_io 6 skip diff --git a/test_fms/fms2_io/test_fms2_io.sh b/test_fms/fms2_io/test_fms2_io.sh index 0184ecb466..98621a8daf 100755 --- a/test_fms/fms2_io/test_fms2_io.sh +++ b/test_fms/fms2_io/test_fms2_io.sh @@ -5,8 +5,10 @@ # Authors: Raymond Menzel # Jessica Liptak - +# # Set common test settings. . ../test_common.sh +# make a dummy file for mpp_init to read +printf "EOF\n&dummy\nEOF" | cat > input.nml # run the tests run_test test_fms2_io 6 skip