Commit ebf537da authored by Beisman, James Joseph's avatar Beisman, James Joseph
Browse files

fixed includes in physics kernels

parent 07192249
......@@ -9,7 +9,6 @@
#include "bareground_fluxes.h"
#include "friction_velocity.h"
#include "qsat.h"
namespace ELM {
namespace bareground_fluxes {
......
......@@ -44,8 +44,8 @@ namespace canopy_fluxes {
\param[in] sucsat[nlevgrnd] [double] minimum soil suction (mm)
\param[in] watsat[nlevgrnd] [double] volumetric soil water at saturation (porosity)
\param[in] bsw[nlevgrnd] [double] Clapp and Hornberger "b
\param[in] smpso[numpft] [double] soil water potential at full stomatal opening (mm)
\param[in] smpsc[numpft] [double] soil water potential at full stomatal closure (mm)
\param[in] smpso [double] soil water potential at full stomatal opening (mm)
\param[in] smpsc [double] soil water potential at full stomatal closure (mm)
\param[in] elai [double] one-sided leaf area index with burying by snow
\param[in] esai [double] one-sided stem area index with burying by snow
\param[in] emv [double] vegetation emissivity
......
// functions derived from CanopyHydrologyMod.F90
#include "elm_constants.h"
#include "landtype.h"
#include <algorithm>
#include <cmath>
#include "canopy_hydrology.h"
namespace ELM {
namespace canopy_hydrology {
......
// functions derived from CanopyTemperatureMod.F90
#include "elm_constants.h"
#include "landtype.h"
#include <algorithm>
#include <cmath>
#include "canopy_temperature.h"
namespace ELM {
namespace canopy_temperature {
......
// derived from PhotosynthesisMod.F90
#include "elm_constants.h"
#include <algorithm>
#include <cmath>
#include <stdexcept>
#include "photosynthesis.h"
namespace ELM {
namespace photosynthesis {
......
......@@ -9,11 +9,10 @@ Must be called twice, for both direct (flg_slr_in == 1) and diffuse (flg_slr_in
*/
#pragma once
#include "elm_constants.h"
#include <cmath>
#include <stdexcept>
#include "elm_constants.h"
namespace ELM {
namespace snow_snicar {
......
#include "elm_constants.h"
#include <cmath>
#include "soil_moist_stress.h"
namespace ELM {
namespace soil_moist_stress {
......
#include <cmath>
#include <stdexcept>
#include "elm_constants.h"
#include "landtype.h"
#include "surface_albedo.h"
// for build testing
//#include "array.hh"
//using ArrayB1 = ELM::Array<bool, 1>;
//using ArrayI1 = ELM::Array<int, 1>;
//using ArrayS1 = ELM::Array<std::string, 1>;
//using ArrayD1 = ELM::Array<double, 1>;
//using ArrayD2 = ELM::Array<double, 2>;
namespace ELM {
namespace surface_albedo {
......
......@@ -39,12 +39,11 @@ mss_cnc_aer_in_fdb - from InitTimestep() to SNICAR_AD_RT()
#pragma once
#include <cmath>
#include <stdexcept>
#include "elm_constants.h"
#include "landtype.h"
#include "vegdata.h"
#include <cmath>
#include <stdexcept>
namespace ELM {
namespace surface_albedo {
......
// functions from SurfaceResistanceMod.F90
#include "elm_constants.h"
#include "LandType.h"
#include <algorithm>
#include <cmath>
#include "surface_resistance.h"
namespace ELM {
namespace surface_resistance {
......
......@@ -4,7 +4,6 @@
#include "elm_constants.h"
#include "LandType.h"
#include <algorithm>
#include <cmath>
......
......@@ -80,10 +80,10 @@ struct VegData {
void read_veg_data(const std::string &data_dir, const std::string &basename_pfts);
// get struct of photosynthesis variables for vegetation == vegtype
PSNVegData get_pft_psnveg (int vegtype);
const PSNVegData get_pft_psnveg (int vegtype) const;
// get struct of albedo variables for vegetation == vegtype
AlbedoVegData get_pft_albveg(int vegtype);
const AlbedoVegData get_pft_albveg(int vegtype) const;
};
......
#pragma once
#include "vegdata.h"
namespace ELM {
......@@ -108,7 +107,7 @@ void VegData<ArrayD1, ArrayD2>::read_veg_data(const std::string &data_dir, const
template <typename ArrayD1, typename ArrayD2>
PSNVegData VegData<ArrayD1, ArrayD2>::get_pft_psnveg (int vegtype) {
const PSNVegData VegData<ArrayD1, ArrayD2>::get_pft_psnveg (int vegtype) const {
PSNVegData psnvegdata;
psnvegdata.fnr = fnr(vegtype);
psnvegdata.act25 = act25(vegtype);
......@@ -141,7 +140,7 @@ PSNVegData VegData<ArrayD1, ArrayD2>::get_pft_psnveg (int vegtype) {
}
template <typename ArrayD1, typename ArrayD2>
AlbedoVegData VegData<ArrayD1, ArrayD2>::get_pft_albveg(int vegtype) {
const AlbedoVegData VegData<ArrayD1, ArrayD2>::get_pft_albveg(int vegtype) const {
AlbedoVegData albedovegdata;
albedovegdata.rhol[0] = rholvis(vegtype);
albedovegdata.rhol[1] = rholnir(vegtype);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment