@@ -393,41 +393,28 @@ main(int argc, const char *argv[]){
393393 printf ("\nTEST BMI MODEL PARAMETERS\n*************************\n" );
394394
395395 //Set number of params -- UPDATE if params changed
396- #define PARAM_COUNT 19
396+ #define PARAM_COUNT 18
397397
398398 // expected_param_names copied directly from param_var_names[PARAM_VAR_NAME_COUNT] in ../src/bmi_cfe.c
399399 static const char * expected_param_names [PARAM_COUNT ] = {
400400 "maxsmc" , "satdk" , "slope" , "b" , "Klf" ,
401401 "Kn" , "Cgw" , "expon" , "max_gw_storage" ,
402402 "satpsi" ,"wltsmc" ,"alpha_fc" ,"refkdt" ,
403403 "a_Xinanjiang_inflection_point_parameter" ,"b_Xinanjiang_shape_parameter" ,"x_Xinanjiang_shape_parameter" ,
404- "Kinf_nash_surface" , "retention_depth_nash_surface" ,
405- "N_nash_subsurface" };
404+ "Kinf_nash_surface" , "retention_depth_nash_surface" };
406405
407406 double test_set_value = 4.2 ;
408407 double test_get_value = 0.0 ;
409- int test_set_value_int = 5 ;
410- int test_get_value_int = 0 ;
411408
412409 // Loop through params to test get and set
413410 for ( int i = 0 ; i < PARAM_COUNT ; i ++ ) {
414- if (strcmp (expected_param_names [i ], "N_nash_subsurface" ) == 0 ){
415- status = model -> set_value (model , expected_param_names [i ], & test_set_value_int );
416- assert (status == BMI_SUCCESS );
417- status = model -> get_value (model , expected_param_names [i ], & test_get_value_int );
418- assert (status == BMI_SUCCESS );
419- assert (test_set_value_int == test_get_value_int );
420- printf (" get & set values match for parameter: %s \n" , expected_param_names [i ]);
421- }
422- else {
423411 status = model -> set_value (model , expected_param_names [i ], & test_set_value );
424412 //if (status == BMI_FAILURE)return BMI_FAILURE;
425413 assert (status == BMI_SUCCESS );
426414 status = model -> get_value (model , expected_param_names [i ], & test_get_value );
427415 assert (status == BMI_SUCCESS );
428416 assert (test_set_value == test_get_value );
429417 printf (" get & set values match for parameter: %s \n" , expected_param_names [i ]);
430- }
431418 }
432419
433420 // Test BMI: CONTROL FUNCTION update_until()
0 commit comments