Fixed the main cause of missing baseflow. Variable name primary & secondary fluxes were not consistent

[RY4GIT]

[Short description explaining the high-level reason for the pull request]

Variable names were inconsistent. Fluxes from both soil & groundwater storages were named as primary_flux and secondary_flux in the main execusion vs. primary_flux**_m** and secoundary_flux**_m** in conceptual_reservoir_flux_calc.

As a result, the baseflow was entirely missing in CFE. Fluxes calculated in conceptual_reservoir_flux_calc were not passed the main flux calculation.

I fixed the bug in the Python version on bmi-python, but here I am trying to make a similar pull request in the C version.

Changes

• Changed variable name 'primary_flux' to 'primary_flux_m'
• Changed variable name 'secondary_flux' to 'secondary_flux'
  On both soil and groundwater storage

Testing

1. Not tested as I am not proficient in C. I appreciate somebody could check it.

[RY4GIT]

I realized that I accidentally closed the pull request and branch.
Reopened because the issue is still there (the pull request may not automatically merge, so please see the suggested changes).