Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions C/projects/CARDAMOM_GENERAL/CARDAMOM_DATA_STRUCTURE.c
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ double *M_ROFF;
double *M_SCF;
double *M_SIF;
double *M_SWE;
double *M_NISAR_WOOD; // modeled total woody C fire structural loss (gC m-2 per timestep)

//Mean values
double M_Mean_ABGB;
Expand Down
4 changes: 4 additions & 0 deletions C/projects/CARDAMOM_GENERAL/CARDAMOM_MODEL_LIBRARY.c
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,8 @@ return 0;}
//#include "../CARDAMOM_MODELS/DALEC/DALEC_1060/MODEL_INFO_1060.c"
//#include "../CARDAMOM_MODELS/DALEC/DALEC_1080/MODEL_INFO_1080.c"
#include "../CARDAMOM_MODELS/DALEC/DALEC_1100/MODEL_INFO_1100.c"
#include "../CARDAMOM_MODELS/DALEC/DALEC_1110/MODEL_INFO_1110.c"
#include "../CARDAMOM_MODELS/DALEC/DALEC_1111/MODEL_INFO_1111.c" // DALEC-PyC
//#include "../CARDAMOM_MODELS/DALEC/DALEC_1101/MODEL_INFO_1101.c"
//#include "../CARDAMOM_MODELS/DALEC/DALEC_1102/MODEL_INFO_1102.c"
//#include "../CARDAMOM_MODELS/DALEC/DALEC_1103/MODEL_INFO_1103.c"
Expand Down Expand Up @@ -129,6 +131,8 @@ else if (ID==1047 ){MODEL_INFO_1047(DATA);}
//else if (ID==1011 ){MODEL_INFO_1011(DATA);}
//else if (ID==1200 ){MODEL_INFO_1200(DATA);}
else if (ID==1100 ){MODEL_INFO_1100(DATA);}
else if (ID==1110 ){MODEL_INFO_1110(DATA);}
else if (ID==1111 ){MODEL_INFO_1111(DATA);} // DALEC-PyC: NISAR fire carbon + pyrogenic C pools
//else if (ID==1101 ){MODEL_INFO_1101(DATA);}
//else if (ID==1102 ){MODEL_INFO_1102(DATA);}
//else if (ID==1103 ){MODEL_INFO_1103(DATA);}
Expand Down
2 changes: 2 additions & 0 deletions C/projects/CARDAMOM_GENERAL/CARDAMOM_NETCDF_DATA_STRUCTURE.c
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,7 @@ TIMESERIES_OBS_STRUCT ROFF;
TIMESERIES_OBS_STRUCT SCF;
TIMESERIES_OBS_STRUCT SIF; // shuang added
TIMESERIES_OBS_STRUCT SWE;
TIMESERIES_OBS_STRUCT NISAR_WOOD; // NISAR L-band woody fire structural loss


//
Expand Down Expand Up @@ -116,6 +117,7 @@ TIMESERIES_DRIVER_STRUCT TIME_INDEX;
TIMESERIES_DRIVER_STRUCT TOTAL_PREC;
TIMESERIES_DRIVER_STRUCT VPD;
TIMESERIES_DRIVER_STRUCT YIELD;
TIMESERIES_DRIVER_STRUCT FRP; // VIIRS fire radiative power (MW km-2), for combustion efficiency

//Summary variables

Expand Down
2 changes: 2 additions & 0 deletions C/projects/CARDAMOM_GENERAL/CARDAMOM_READ_BINARY_DATA.c
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,7 @@ DATA->M_NBE=calloc(Ntimesteps,sizeof(double));
DATA->M_ROFF=calloc(Ntimesteps,sizeof(double));
DATA->M_SCF=calloc(Ntimesteps,sizeof(double));
DATA->M_SWE=calloc(Ntimesteps,sizeof(double));
DATA->M_NISAR_WOOD=calloc(Ntimesteps,sizeof(double));



Expand Down Expand Up @@ -208,6 +209,7 @@ free(DATA.M_SIF);
free(DATA.M_LAI);
free(DATA.M_FIR);
free(DATA.M_NBE);
free(DATA.M_NISAR_WOOD);



Expand Down
Loading
Loading