Ecotypes unit test: Don't read parameter file.

Author: samsrabin

main/EDParamsMod.F90

@@ -268,6 +268,7 @@ module EDParamsMod
    character(len=param_string_length),parameter,public :: eca_name_plant_escalar = "fates_cnp_eca_plant_escalar"
 
    public :: FatesParamsInit
+   public :: FatesParamsInitForFactory
    public :: FatesRegisterParams
    public :: FatesReceiveParams
    public :: FatesReportParams
@@ -353,6 +354,21 @@ subroutine FatesParamsInit()
 
   end subroutine FatesParamsInit
 
+  !-----------------------------------------------------------------------
+
+  subroutine FatesParamsInitForFactory()
+    ! Initialize some parameters that are needed for unit-testing factories
+
+    allocate(ED_val_history_ageclass_bin_edges(7))
+    ED_val_history_ageclass_bin_edges = [0, 1, 2, 5, 10, 20, 50]
+
+    allocate(ED_val_history_sizeclass_bin_edges(13))
+    ED_val_history_sizeclass_bin_edges = [0, 5, 10, 15, 20, 30, 40, 50, 60, 70, 80, 90, 100]
+
+    allocate(ED_val_history_coageclass_bin_edges(13))
+    ED_val_history_coageclass_bin_edges = [0, 5]
+  end subroutine FatesParamsInitForFactory
+
   !-----------------------------------------------------------------------
   subroutine FatesRegisterParams(fates_params)
     ! Register the parameters we want the host to provide, and

testing/run_unit_tests.py

@@ -24,7 +24,6 @@
 from build_fortran_tests import build_tests
 from path_utils import add_cime_lib_to_path
 from utils import config_to_dict, parse_test_list
-from utils import check_param_file, create_param_file, _DEFAULT_CDL_PATH
 
 add_cime_lib_to_path()
 
@@ -100,26 +99,12 @@ def commandline_args():
         "for all tests. If not supplied, will run all tests.",
     )
 
-    parser.add_argument(
-        "-f",
-        "--parameter-file",
-        type=str,
-        default=_DEFAULT_CDL_PATH,
-        help="Parameter file to run the FATES tests with.\n"
-        "Can be a netcdf (.nc) or cdl (.cdl) file.\n"
-        "If no file is specified the script will use the default .cdl file in the\n"
-        "parameter_files directory.\n",
-    )
-
     args = parser.parse_args()
 
-    # check to make sure parameter file exists and is one of the correct forms
-    check_param_file(args.parameter_file)
-
     return args
 
 
-def run_unit_tests(clean, verbose_make, build_dir, make_j, test_dict, param_file):
+def run_unit_tests(clean, verbose_make, build_dir, make_j, test_dict):
     """Builds and runs the fates unit tests
 
     Args:
@@ -133,12 +118,6 @@ def run_unit_tests(clean, verbose_make, build_dir, make_j, test_dict, param_file
     # absolute path to desired build directory
     build_dir_path = os.path.abspath(build_dir)
 
-    # create parameter file, if needed
-    for _, attributes in test_dict.items():
-        if attributes["use_param_file"]:
-            param_file = create_param_file(param_file, build_dir_path)
-            break
-
     # compile code
     build_tests(
         build_dir_path, _CMAKE_BASE_DIR, make_j, clean=clean, verbose=verbose_make
@@ -151,11 +130,6 @@ def run_unit_tests(clean, verbose_make, build_dir, make_j, test_dict, param_file
         test_dir = os.path.join(build_dir_path, _TEST_SUB_DIR, attributes["test_dir"])
         ctest_command = ["ctest", "--output-on-failure"]
 
-        # Copy parameter file to test directory, if needed
-        if attributes["use_param_file"]:
-            test_param_file = os.path.join(test_dir, "params.nc")
-            copyfile(param_file, test_param_file)
-
         output = run_cmd_no_fail(
             " ".join(ctest_command), from_dir=test_dir, combine_output=True
         )
@@ -177,7 +151,6 @@ def main():
         args.build_dir,
         args.make_j,
         test_dict,
-        args.parameter_file,
     )
 
 

testing/testing_shr/FatesFactoryMod.F90

@@ -23,10 +23,13 @@ module FatesFactoryMod
   use EDParamsMod,                 only : nclmax
   use EDParamsMod,                 only : photo_temp_acclim_timescale
   use EDParamsMod,                 only : photo_temp_acclim_thome_time
+  use EDParamsMod,                 only : FatesParamsInitForFactory
   use FatesRunningMeanMod,         only : ema_24hr, fixed_24hr, ema_lpa, ema_longterm
   use FatesRunningMeanMod,         only : moving_ema_window, fixed_window
   use EDCohortDynamicsMod,         only : InitPRTObject
   use PRTParametersMod,            only : prt_params
+  use EDPftvarcon,                 only : EDPftvarcon_inst
+  use FatesParameterDerivedMod,    only : param_derived
   use PRTGenericMod,               only : element_pos
   use PRTGenericMod,               only : num_elements
   use PRTGenericMod,               only : element_list
@@ -80,6 +83,57 @@ subroutine InitializeGlobals(step_size)
 
     ! LOCALS:
     integer :: i ! looping index
+    integer, parameter :: n_pfts = 14
+    integer, parameter :: n_leafage_class = 1
+
+    ! Things from parameter file for prt_params
+    call FatesParamsInitForFactory()
+    allocate(prt_params%allom_amode(n_pfts)); prt_params%allom_amode = [3, 3, 3, 3, 3, 3, 1, 1, 1, 1, 1, 5, 5, 5]
+    allocate(prt_params%allom_agb1(n_pfts)); prt_params%allom_agb1 = [0.0673, 0.1364012, 0.0393057, 0.2653695, 0.0673, 0.0728698, 0.06896, 0.06896, 0.06896, 0.06896, 0.06896, 0.001, 0.001, 0.003]
+    allocate(prt_params%allom_agb2(n_pfts)); prt_params%allom_agb2 = [0.976, 0.9449041, 1.087335, 0.8321321, 0.976, 1.0373211, 0.572, 0.572, 0.572, 0.5289883, 0.6853945, 1.6592, 1.6592, 1.3456]
+    allocate(prt_params%allom_agb3(n_pfts)); prt_params%allom_agb3 = [1.94, 1.94, 1.94, 1.94, 1.94, 1.94, 1.94, 1.94, 1.94, 2.1010352, 1.7628613, 1.248, 1.248, 1.869]
+    allocate(prt_params%allom_agb4(n_pfts)); prt_params%allom_agb4 = [0.931, 0.931, 0.931, 0.931, 0.931, 0.931, 0.931, 0.931, 0.931, 0.931, 0.931, -999.9, -999.9, -999.9]
+    allocate(prt_params%allom_agb_frac(n_pfts)); prt_params%allom_agb_frac = [0.6, 0.6, 0.6, 0.6, 0.6, 0.6, 0.6, 0.6, 0.6, 0.6, 0.6, 1., 1., 1.]
+    allocate(prt_params%allom_blca_expnt_diff(n_pfts)); prt_params%allom_blca_expnt_diff = [-0.12, -0.34, -0.32, -0.22, -0.12, -0.35, 0., 0., 0., 0., 0., -0.487, -0.487, -0.259]
+    allocate(prt_params%allom_d2bl1(n_pfts)); prt_params%allom_d2bl1 = [0.04, 0.07, 0.07, 0.01, 0.04, 0.07, 0.07, 0.07, 0.07, 0.0481934, 0.0481934, 0.0004, 0.0004, 0.0012]
+    allocate(prt_params%allom_d2bl2(n_pfts)); prt_params%allom_d2bl2 = [1.6019679, 1.5234373, 1.3051237, 1.9621397, 1.6019679, 1.3998939, 1.3, 1.3, 1.3, 1.0600586, 1.7176758, 1.7092, 1.7092, 1.5879]
+    allocate(prt_params%allom_d2bl3(n_pfts)); prt_params%allom_d2bl3 = [0.55, 0.55, 0.55, 0.55, 0.55, 0.55, 0.55, 0.55, 0.55, 0.55, 0.55, 0.3417, 0.3417, 0.9948]
+    allocate(prt_params%allom_d2ca_coefficient_max(n_pfts)); prt_params%allom_d2ca_coefficient_max = [0.2715891, 0.3693718, 1.0787259, 0.0579297, 0.2715891, 1.1553612, 0.6568464, 0.6568464, 0.6568464, 0.4363427, 0.3166497, 0.0408, 0.0408, 0.0862]
+    allocate(prt_params%allom_d2ca_coefficient_min(n_pfts)); prt_params%allom_d2ca_coefficient_min = prt_params%allom_d2ca_coefficient_max
+    allocate(prt_params%allom_d2h1(n_pfts)); prt_params%allom_d2h1 = [78.4087704, 306.842667, 106.8745821, 104.3586841, 78.4087704, 31.4557047, 0.64, 0.64, 0.64, 0.8165625, 0.778125, 0.1812, 0.1812, 0.3353]
+    allocate(prt_params%allom_d2h2(n_pfts)); prt_params%allom_d2h2 = [0.8124383, 0.752377, 0.9471302, 1.1146973, 0.8124383, 0.9734088, 0.37, 0.37, 0.37, 0.2316113, 0.4027002, 0.6384, 0.6384, 0.4235]
+    allocate(prt_params%allom_d2h3(n_pfts)); prt_params%allom_d2h3 = [47.6666164, 196.6865691, 93.9790461, 160.6835089, 47.6666164, 16.5928174, -999.9, -999.9, -999.9, -999.9, -999.9, -999.9, -999.9, -999.9]
+    allocate(prt_params%allom_dbh_maxheight(n_pfts)); prt_params%allom_dbh_maxheight = [1000., 1000., 1000., 1000., 1000., 1000., 3., 3., 2., 2.4, 1.9, 20., 20., 30.]
+    allocate(prt_params%allom_hmode(n_pfts)); prt_params%allom_hmode = [5, 5, 5, 5, 5, 5, 1, 1, 1, 1, 1, 3, 3, 3]
+    allocate(prt_params%allom_lmode(n_pfts)); prt_params%allom_lmode = [2, 2, 2, 2, 2, 2, 1, 1, 1, 1, 1, 5, 5, 5]
+    allocate(prt_params%c2b(n_pfts)); prt_params%c2b(:) = 2
+    allocate(prt_params%phen_leaf_habit(n_pfts)); prt_params%phen_leaf_habit = [1, 1, 2, 1, 3, 2, 1, 3, 2, 1, 2, 2, 3, 3]
+    allocate(prt_params%wood_density(n_pfts)); prt_params%wood_density = [0.548327, 0.44235, 0.454845, 0.754336, 0.548327, 0.566452, 0.7, 0.7, 0.7, 0.7, 0.7, 0.7, 0.7, 0.7]
+    allocate(prt_params%allom_cmode(n_pfts)); prt_params%allom_cmode(:) = 1
+    allocate(prt_params%allom_l2fr(n_pfts)); prt_params%allom_l2fr = [1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 0.67, 0.67, 1.41]
+    allocate(prt_params%allom_fmode(n_pfts)); prt_params%allom_fmode(:) = 1
+    allocate(prt_params%allom_smode(n_pfts)); prt_params%allom_smode = [1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 2, 2, 2]
+    allocate(prt_params%slatop(n_pfts)); prt_params%slatop = [0.012, 0.005, 0.024, 0.009, 0.03, 0.03, 0.012, 0.03, 0.03, 0.01, 0.032, 0.027, 0.05, 0.05]
+    allocate(prt_params%allom_la_per_sa_int(n_pfts)); prt_params%allom_la_per_sa_int(:) = 0.8
+    allocate(prt_params%allom_la_per_sa_slp(n_pfts)); prt_params%allom_la_per_sa_slp(:) = 0.
+    allocate(prt_params%allom_stmode(n_pfts)); prt_params%allom_stmode(:) = 1
+    allocate(prt_params%cushion(n_pfts)); prt_params%cushion = [1.2, 1.2, 1.2, 1.2, 2.4, 1.2, 1.2, 2.4, 1.2, 1.5, 1.4, 1.2, 1.2, 1.2]
+    allocate(prt_params%leafn_vert_scaler_coeff1(n_pfts)); prt_params%leafn_vert_scaler_coeff1(:) = 0.00963
+    allocate(prt_params%leafn_vert_scaler_coeff2(n_pfts)); prt_params%leafn_vert_scaler_coeff2(:) = 2.43
+    allocate(prt_params%slamax(n_pfts)); prt_params%slamax = [0.0954, 0.0954, 0.0954, 0.0954, 0.0954, 0.0954, 0.012, 0.03, 0.03, 0.012, 0.032, 0.05, 0.05, 0.05]
+    allocate(prt_params%allom_sai_scaler(n_pfts)); prt_params%allom_sai_scaler(:) = 0.1
+    allocate(prt_params%phen_fnrt_drop_fraction(n_pfts)); prt_params%phen_fnrt_drop_fraction(:) = 0.
+    allocate(prt_params%phen_stem_drop_fraction(n_pfts)); prt_params%phen_stem_drop_fraction(:) = 0.
+    allocate(prt_params%leaf_long(n_pfts,n_leafage_class)); prt_params%leaf_long = reshape([1.5, 4., 1., 1.5, 1., 1., 1.5, 1., 1., 1.5, 1., 1., 1., 1.], shape(prt_params%leaf_long))
+
+    ! Things from parameter file for EDPftvarcon_inst
+    allocate(EDPftvarcon_inst%damage_frac(n_pfts))
+    EDPftvarcon_inst%damage_frac = [0.01, 0.01, 0.01, 0.01, 0.01, 0.01, 0.01, 0.01, 0.01, 0.01, &
+         0.01, 0.01, 0.01, 0.01]
+
+    ! Derived parameters
+    ! call EDPftvarcon_inst%EDpftconInit()
+    call param_derived%Init(n_pfts)
 
     ! initialize some values
     hlm_parteh_mode = prt_carbon_allom_hyp

testing/unit_testing/ecotypes_test/test_Ecotypes.pf

@@ -12,14 +12,12 @@ module test_Ecotypes
   use SyntheticPatchTypes, only : synthetic_patch_array_type
   use SyntheticPatchTypes, only : forest_tree_fraction_threshold
   use SyntheticPatchTypes, only : grass_biomass_threshold
-  use FatesUnitTestParamReaderMod, only : fates_unit_test_param_reader
   use FatesArgumentUtils,  only : command_line_arg
   use funit
 
   implicit none
 
   ! LOCALS:
-  type(fates_unit_test_param_reader)             :: param_reader ! param reader instance
   integer :: i
   logical :: already_initialized = .false.
 
@@ -52,10 +50,6 @@ module test_Ecotypes
       ! Only need to do this for the first test
       if (.not. already_initialized) then
 
-        ! read in parameter file
-        call param_reader%Init('params.nc')
-        call param_reader%RetrieveParameters()
-
         ! initialize some global data we need
         call InitializeGlobals(step_size)
 

testing/unit_tests.cfg

@@ -1,35 +1,26 @@
 [fire_weather]
 test_dir = fates_fire_weather_utest
-use_param_file = False
 
 [ecotypes]
 test_dir = fates_ecotypes_utest
-use_param_file = True
 
 [edge_forest]
 test_dir = fates_edge_forest_utest
-use_param_file = False
 
 [fire_fuel]
 test_dir = fates_fire_fuel_utest
-use_param_file = False
 
 [sort_cohorts]
 test_dir = fates_sort_cohorts_utest
-use_param_file = False
 
 [insert_cohort]
 test_dir = fates_insert_cohort_utest
-use_param_file = False
 
 [validate_cohorts]
 test_dir = fates_validate_cohorts_utest
-use_param_file = False
 
 [count_cohorts]
 test_dir = fates_count_cohorts_utest
-use_param_file = False
 
 [fire_equations]
 test_dir = fates_fire_equations_utest
-use_param_file = False