change tests, still need to fix solar_cal and annual test

test_fms/astronomy/Makefile.am

@@ -30,88 +30,16 @@ LDADD = $(top_builddir)/libFMS/libFMS.la
 
 # Build this test program.
 check_PROGRAMS = \
- test_set_orbital_parameters_r4 \
- test_set_orbital_parameters_r8 \
- test_get_orbital_parameters_r4 \
- test_get_orbital_parameters_r8 \
- test_diurnal_solar_r4 \
- test_diurnal_solar_r8 \
- test_dt_option_diurnal_r4 \
- test_dt_option_diurnal_r8 \
- test_diurnal_solar_cal_r4 \
- test_diurnal_solar_cal_r8 \
- test_daily_mean_r4 \
- test_daily_mean_r8 \
- test_daily_mean_cal_r4 \
- test_daily_mean_cal_r8 \
- test_annual_mean_solar_2d_r4 \
- test_annual_mean_solar_2d_r8 \
- test_annual_mean_solar_1d_r4 \
- test_annual_mean_solar_1d_r8 \
- test_annual_mean_solar_2level_r4 \
- test_annual_mean_solar_2level_r8
+ test_astronomy_r4 \
+ test_astronomy_r8
 
 # This is the source code for the test.
-test_set_orbital_parameters_r4_SOURCES = test_set_orbital_parameters.F90
-test_set_orbital_parameters_r8_SOURCES = test_set_orbital_parameters.F90
-
-test_get_orbital_parameters_r4_SOURCES = test_get_orbital_parameters.F90
-test_get_orbital_parameters_r8_SOURCES = test_get_orbital_parameters.F90
-
-test_diurnal_solar_r4_SOURCES = test_diurnal_solar.F90
-test_diurnal_solar_r8_SOURCES = test_diurnal_solar.F90
-
-test_dt_option_diurnal_r4_SOURCES = test_dt_option_diurnal.F90
-test_dt_option_diurnal_r8_SOURCES = test_dt_option_diurnal.F90
-
-test_diurnal_solar_cal_r4_SOURCES = test_diurnal_solar_cal.F90
-test_diurnal_solar_cal_r8_SOURCES = test_diurnal_solar_cal.F90
-
-test_daily_mean_r4_SOURCES = test_daily_mean.F90
-test_daily_mean_r8_SOURCES = test_daily_mean.F90
-
-test_daily_mean_cal_r4_SOURCES = test_daily_mean_cal.F90
-test_daily_mean_cal_r8_SOURCES = test_daily_mean_cal.F90
-
-test_annual_mean_solar_2d_r4_SOURCES = test_annual_mean_solar_2d.F90
-test_annual_mean_solar_2d_r8_SOURCES = test_annual_mean_solar_2d.F90
-
-test_annual_mean_solar_1d_r4_SOURCES = test_annual_mean_solar_1d.F90
-test_annual_mean_solar_1d_r8_SOURCES = test_annual_mean_solar_1d.F90
-
-test_annual_mean_solar_2level_r4_SOURCES = test_annual_mean_solar_2level.F90
-test_annual_mean_solar_2level_r8_SOURCES = test_annual_mean_solar_2level.F90
+test_astronomy_r4_SOURCES = test_astronomy.F90
+test_astronomy_r8_SOURCES = test_astronomy.F90
 
 # Set r4_kind and r8_kind
-test_set_orbital_parameters_r4_CPPFLAGS = $(AM_CPPFLAGS) -DTEST_AST_KIND_=r4_kind
-test_set_orbital_parameters_r8_CPPFLAGS= $(AM_CPPFLAGS) -DTEST_AST_KIND_=r8_kind
-
-test_get_orbital_parameters_r4_CPPFLAGS = $(AM_CPPFLAGS) -DTEST_AST_KIND_=r4_kind
-test_get_orbital_parameters_r8_CPPFLAGS= $(AM_CPPFLAGS) -DTEST_AST_KIND_=r8_kind
-
-test_diurnal_solar_r4_CPPFLAGS= $(AM_CPPFLAGS) -DTEST_AST_KIND_=r4_kind
-test_diurnal_solar_r8_CPPFLAGS= $(AM_CPPFLAGS) -DTEST_AST_KIND_=r8_kind
-
-test_dt_option_diurnal_r4_CPPFLAGS= $(AM_CPPFLAGS) -DTEST_AST_KIND_=r4_kind
-test_dt_option_diurnal_r8_CPPFLAGS= $(AM_CPPFLAGS) -DTEST_AST_KIND_=r8_kind
-
-test_diurnal_solar_cal_r4_CPPFLAGS= $(AM_CPPFLAGS) -DTEST_AST_KIND_=r4_kind
-test_diurnal_solar_cal_r8_CPPFLAGS= $(AM_CPPFLAGS) -DTEST_AST_KIND_=r8_kind
-
-test_daily_mean_r4_CPPFLAGS= $(AM_CPPFLAGS) -DTEST_AST_KIND_=r4_kind
-test_daily_mean_r8_CPPFLAGS= $(AM_CPPFLAGS) -DTEST_AST_KIND_=r8_kind
-
-test_daily_mean_cal_r4_CPPFLAGS= $(AM_CPPFLAGS) -DTEST_AST_KIND_=r4_kind
-test_daily_mean_cal_r8_CPPFLAGS= $(AM_CPPFLAGS) -DTEST_AST_KIND_=r8_kind
-
-test_annual_mean_solar_2d_r4_CPPFLAGS= $(AM_CPPFLAGS) -DTEST_AST_KIND_=r4_kind
-test_annual_mean_solar_2d_r8_CPPFLAGS= $(AM_CPPFLAGS) -DTEST_AST_KIND_=r8_kind
-
-test_annual_mean_solar_1d_r4_CPPFLAGS= $(AM_CPPFLAGS) -DTEST_AST_KIND_=r4_kind
-test_annual_mean_solar_1d_r8_CPPFLAGS= $(AM_CPPFLAGS) -DTEST_AST_KIND_=r8_kind
-
-test_annual_mean_solar_2level_r4_CPPFLAGS= $(AM_CPPFLAGS) -DTEST_AST_KIND_=r4_kind
-test_annual_mean_solar_2level_r8_CPPFLAGS= $(AM_CPPFLAGS) -DTEST_AST_KIND_=r8_kind
+test_astronomy_r4_CPPFLAGS = $(AM_CPPFLAGS) -DTEST_AST_KIND_=r4_kind
+test_astronomy_r8_CPPFLAGS = $(AM_CPPFLAGS) -DTEST_AST_KIND_=r8_kind
 
 # Run the test program.
 TESTS = test_astronomy.sh