Skip to content

Commit

Permalink
Merge pull request #202 from UW-Hydro/hotfix/4.2.2
Browse files Browse the repository at this point in the history 
Hotfix/4.2.b
  • Loading branch information
@bartnijssen
bartnijssen committed Jan 22, 2015
2 parents 850701a + 7aa73f5 commit d2b2b07
Show file tree
Hide file tree
Showing 4 changed files with 157 additions and 141 deletions.
25 changes: 24 additions & 1 deletion src/ChangeLog
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,30 @@ Usage:


-------------------------------------------------------------------------------
***** Description of changes between VIC 4.2.0 and VIC 4.2.1 *****
***** Description of changes between VIC 4.2.a and VIC 4.2.b *****
-------------------------------------------------------------------------------

Bug Fixes:
----------

Fixed memory error in initialize atmos when OUTPUT_FORCE = TRUE.

Files Affected:

initialize_atmos.
Makefile

Description:

Previously, access to unitialized elements of the veg_con and veg_hist
structure was attempted when OUTPUT_FORCE = TRUE, causing a memory error
and the model to crash. This fix sets these elements inside a
`if (!options.OUTPUT_FORCE)` block allowing the OUTPUT_FORCE option to
work as expected.


-------------------------------------------------------------------------------
***** Description of changes between VIC 4.2 and VIC 4.2.a *****
-------------------------------------------------------------------------------

Bug Fixes:
Expand Down
10 changes: 0 additions & 10 deletions src/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -136,15 +136,6 @@ all:
make depend
make model

disagg:
sed -i.bak 's/OUTPUT_FORCE FALSE/OUTPUT_FORCE TRUE/' user_def.h
make clean
make depend
make vicDisagg
sed -i.bak 's/OUTPUT_FORCE TRUE/OUTPUT_FORCE FALSE/' user_def.h
make clean
make depend

default:
make depend
make model
Expand All @@ -154,7 +145,6 @@ full:
make depend
make tags
make model
make disagg

clean::
/bin/rm -f *.o core log *~
Expand Down
2 changes: 1 addition & 1 deletion src/global.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
2013-Dec-27 Removed QUICK_FS option. TJB
2014-May-20 Added ref_veg_vegcover. TJB
**********************************************************************/
char *version = "4.2.1 2014-December-21";
char *version = "4.2.b 2015-January-22";
char *optstring = "g:vo";
int flag;

Expand Down
261 changes: 132 additions & 129 deletions src/initialize_atmos.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -255,10 +255,11 @@ void initialize_atmos(atmos_data_struct *atmos,
// nrerror("Input meteorological forcing files must contain either WIND (wind speed) or both WIND_N (north component of wind speed) and WIND_E (east component of wind speed); check input files\n");

/* Assign N_ELEM for veg-dependent forcings */
param_set.TYPE[LAI_IN].N_ELEM = veg_con[0].vegetat_type_num;
param_set.TYPE[VEGCOVER].N_ELEM = veg_con[0].vegetat_type_num;
param_set.TYPE[ALBEDO].N_ELEM = veg_con[0].vegetat_type_num;

if (!options.OUTPUT_FORCE) {
param_set.TYPE[LAI_IN].N_ELEM = veg_con[0].vegetat_type_num;
param_set.TYPE[VEGCOVER].N_ELEM = veg_con[0].vegetat_type_num;
param_set.TYPE[ALBEDO].N_ELEM = veg_con[0].vegetat_type_num;
}
/* compute number of simulation days */
tmp_starthour = 0;
tmp_endhour = 24 - global_param.dt;
Expand Down Expand Up @@ -1421,172 +1422,174 @@ void initialize_atmos(atmos_data_struct *atmos,
}
}

/****************************************************
Albedo
****************************************************/
if (!options.OUTPUT_FORCE) {

/* First, assign default climatology */
for (rec = 0; rec < global_param.nrecs; rec++) {
for(v = 0; v < veg_con[0].vegetat_type_num; v++) {
for (j = 0; j < NF; j++) {
veg_hist[rec][v].albedo[j] = veg_lib[veg_con[v].veg_class].albedo[dmy[rec].month-1];
/****************************************************
Albedo
****************************************************/

/* First, assign default climatology */
for (rec = 0; rec < global_param.nrecs; rec++) {
for(v = 0; v < veg_con[0].vegetat_type_num; v++) {
for (j = 0; j < NF; j++) {
veg_hist[rec][v].albedo[j] = veg_lib[veg_con[v].veg_class].albedo[dmy[rec].month-1];
}
}
}
}

if(param_set.TYPE[ALBEDO].SUPPLIED) {
if(param_set.FORCE_DT[param_set.TYPE[ALBEDO].SUPPLIED-1] == 24) {
/* daily albedo provided */
for (rec = 0; rec < global_param.nrecs; rec++) {
for(v = 0; v < veg_con[0].vegetat_type_num; v++) {
sum = 0;
for (j = 0; j < NF; j++) {
hour = rec*global_param.dt + j*options.SNOW_STEP + global_param.starthour - hour_offset_int;
if (global_param.starthour - hour_offset_int < 0) hour += 24;
idx = (int)((float)hour/24.0);
if (local_veg_hist_data[ALBEDO][v][idx] != NODATA_VH)
veg_hist[rec][v].albedo[j] = local_veg_hist_data[ALBEDO][v][idx]; // assume constant over the day
sum += veg_hist[rec][v].albedo[j];
if(param_set.TYPE[ALBEDO].SUPPLIED) {
if(param_set.FORCE_DT[param_set.TYPE[ALBEDO].SUPPLIED-1] == 24) {
/* daily albedo provided */
for (rec = 0; rec < global_param.nrecs; rec++) {
for(v = 0; v < veg_con[0].vegetat_type_num; v++) {
sum = 0;
for (j = 0; j < NF; j++) {
hour = rec*global_param.dt + j*options.SNOW_STEP + global_param.starthour - hour_offset_int;
if (global_param.starthour - hour_offset_int < 0) hour += 24;
idx = (int)((float)hour/24.0);
if (local_veg_hist_data[ALBEDO][v][idx] != NODATA_VH)
veg_hist[rec][v].albedo[j] = local_veg_hist_data[ALBEDO][v][idx]; // assume constant over the day
sum += veg_hist[rec][v].albedo[j];
}
if(NF>1) veg_hist[rec][v].albedo[NR] = sum / (float)NF;
}
if(NF>1) veg_hist[rec][v].albedo[NR] = sum / (float)NF;
}
}
}
else {
/* sub-daily albedo provided */
for(rec = 0; rec < global_param.nrecs; rec++) {
for(v = 0; v < veg_con[0].vegetat_type_num; v++) {
sum = 0;
for(i = 0; i < NF; i++) {
hour = rec*global_param.dt + i*options.SNOW_STEP + global_param.starthour - hour_offset_int;
veg_hist[rec][v].albedo[i] = 0;
while (hour < rec*global_param.dt + (i+1)*options.SNOW_STEP + global_param.starthour - hour_offset_int) {
idx = hour;
if (idx < 0) idx += 24;
if (local_veg_hist_data[ALBEDO][v][idx] != NODATA_VH)
veg_hist[rec][v].albedo[i] = local_veg_hist_data[ALBEDO][v][idx];
hour++;
else {
/* sub-daily albedo provided */
for(rec = 0; rec < global_param.nrecs; rec++) {
for(v = 0; v < veg_con[0].vegetat_type_num; v++) {
sum = 0;
for(i = 0; i < NF; i++) {
hour = rec*global_param.dt + i*options.SNOW_STEP + global_param.starthour - hour_offset_int;
veg_hist[rec][v].albedo[i] = 0;
while (hour < rec*global_param.dt + (i+1)*options.SNOW_STEP + global_param.starthour - hour_offset_int) {
idx = hour;
if (idx < 0) idx += 24;
if (local_veg_hist_data[ALBEDO][v][idx] != NODATA_VH)
veg_hist[rec][v].albedo[i] = local_veg_hist_data[ALBEDO][v][idx];
hour++;
}
sum += veg_hist[rec][v].albedo[i];
}
sum += veg_hist[rec][v].albedo[i];
if(NF>1) veg_hist[rec][v].albedo[NR] = sum / (float)NF;
}
if(NF>1) veg_hist[rec][v].albedo[NR] = sum / (float)NF;
}
}
}
}

/****************************************************
Leaf Area Index (LAI)
****************************************************/
/****************************************************
Leaf Area Index (LAI)
****************************************************/

/* First, assign default climatology */
for (rec = 0; rec < global_param.nrecs; rec++) {
for(v = 0; v < veg_con[0].vegetat_type_num; v++) {
for (j = 0; j < NF; j++) {
veg_hist[rec][v].LAI[j] = veg_lib[veg_con[v].veg_class].LAI[dmy[rec].month-1];
/* First, assign default climatology */
for (rec = 0; rec < global_param.nrecs; rec++) {
for(v = 0; v < veg_con[0].vegetat_type_num; v++) {
for (j = 0; j < NF; j++) {
veg_hist[rec][v].LAI[j] = veg_lib[veg_con[v].veg_class].LAI[dmy[rec].month-1];
}
}
}
}

if(param_set.TYPE[LAI_IN].SUPPLIED) {
if(param_set.FORCE_DT[param_set.TYPE[LAI_IN].SUPPLIED-1] == 24) {
/* daily LAI provided */
for (rec = 0; rec < global_param.nrecs; rec++) {
for(v = 0; v < veg_con[0].vegetat_type_num; v++) {
sum = 0;
for (j = 0; j < NF; j++) {
hour = rec*global_param.dt + j*options.SNOW_STEP + global_param.starthour - hour_offset_int;
if (global_param.starthour - hour_offset_int < 0) hour += 24;
idx = (int)((float)hour/24.0);
if (local_veg_hist_data[LAI_IN][v][idx] != NODATA_VH)
veg_hist[rec][v].LAI[j] = local_veg_hist_data[LAI_IN][v][idx]; // assume constant over the day
sum += veg_hist[rec][v].LAI[j];
if(param_set.TYPE[LAI_IN].SUPPLIED) {
if(param_set.FORCE_DT[param_set.TYPE[LAI_IN].SUPPLIED-1] == 24) {
/* daily LAI provided */
for (rec = 0; rec < global_param.nrecs; rec++) {
for(v = 0; v < veg_con[0].vegetat_type_num; v++) {
sum = 0;
for (j = 0; j < NF; j++) {
hour = rec*global_param.dt + j*options.SNOW_STEP + global_param.starthour - hour_offset_int;
if (global_param.starthour - hour_offset_int < 0) hour += 24;
idx = (int)((float)hour/24.0);
if (local_veg_hist_data[LAI_IN][v][idx] != NODATA_VH)
veg_hist[rec][v].LAI[j] = local_veg_hist_data[LAI_IN][v][idx]; // assume constant over the day
sum += veg_hist[rec][v].LAI[j];
}
if(NF>1) veg_hist[rec][v].LAI[NR] = sum / (float)NF;
}
if(NF>1) veg_hist[rec][v].LAI[NR] = sum / (float)NF;
}
}
}
else {
/* sub-daily LAI provided */
for(rec = 0; rec < global_param.nrecs; rec++) {
for(v = 0; v < veg_con[0].vegetat_type_num; v++) {
sum = 0;
for(i = 0; i < NF; i++) {
hour = rec*global_param.dt + i*options.SNOW_STEP + global_param.starthour - hour_offset_int;
veg_hist[rec][v].LAI[i] = 0;
while (hour < rec*global_param.dt + (i+1)*options.SNOW_STEP + global_param.starthour - hour_offset_int) {
idx = hour;
if (idx < 0) idx += 24;
if (local_veg_hist_data[LAI_IN][v][idx] != NODATA_VH)
veg_hist[rec][v].LAI[i] = local_veg_hist_data[LAI_IN][v][idx];
hour++;
else {
/* sub-daily LAI provided */
for(rec = 0; rec < global_param.nrecs; rec++) {
for(v = 0; v < veg_con[0].vegetat_type_num; v++) {
sum = 0;
for(i = 0; i < NF; i++) {
hour = rec*global_param.dt + i*options.SNOW_STEP + global_param.starthour - hour_offset_int;
veg_hist[rec][v].LAI[i] = 0;
while (hour < rec*global_param.dt + (i+1)*options.SNOW_STEP + global_param.starthour - hour_offset_int) {
idx = hour;
if (idx < 0) idx += 24;
if (local_veg_hist_data[LAI_IN][v][idx] != NODATA_VH)
veg_hist[rec][v].LAI[i] = local_veg_hist_data[LAI_IN][v][idx];
hour++;
}
sum += veg_hist[rec][v].LAI[i];
}
sum += veg_hist[rec][v].LAI[i];
if(NF>1) veg_hist[rec][v].LAI[NR] = sum / (float)NF;
}
if(NF>1) veg_hist[rec][v].LAI[NR] = sum / (float)NF;
}
}
}
}

/****************************************************
Fractional Vegetation Cover
****************************************************/
/****************************************************
Fractional Vegetation Cover
****************************************************/

/* First, assign default climatology */
for (rec = 0; rec < global_param.nrecs; rec++) {
for(v = 0; v < veg_con[0].vegetat_type_num; v++) {
for (j = 0; j < NF; j++) {
veg_hist[rec][v].vegcover[j] = veg_lib[veg_con[v].veg_class].vegcover[dmy[rec].month-1];
/* First, assign default climatology */
for (rec = 0; rec < global_param.nrecs; rec++) {
for(v = 0; v < veg_con[0].vegetat_type_num; v++) {
for (j = 0; j < NF; j++) {
veg_hist[rec][v].vegcover[j] = veg_lib[veg_con[v].veg_class].vegcover[dmy[rec].month-1];
}
}
}
}

if(param_set.TYPE[VEGCOVER].SUPPLIED) {
if(param_set.FORCE_DT[param_set.TYPE[VEGCOVER].SUPPLIED-1] == 24) {
/* daily vegcover provided */
for (rec = 0; rec < global_param.nrecs; rec++) {
for(v = 0; v < veg_con[0].vegetat_type_num; v++) {
sum = 0;
for (j = 0; j < NF; j++) {
hour = rec*global_param.dt + j*options.SNOW_STEP + global_param.starthour - hour_offset_int;
if (global_param.starthour - hour_offset_int < 0) hour += 24;
idx = (int)((float)hour/24.0);
if (local_veg_hist_data[VEGCOVER][v][idx] != NODATA_VH) {
veg_hist[rec][v].vegcover[j] = local_veg_hist_data[VEGCOVER][v][idx]; // assume constant over the day
if (veg_hist[rec][v].vegcover[j] < MIN_VEGCOVER) veg_hist[rec][v].vegcover[j] = MIN_VEGCOVER;
if(param_set.TYPE[VEGCOVER].SUPPLIED) {
if(param_set.FORCE_DT[param_set.TYPE[VEGCOVER].SUPPLIED-1] == 24) {
/* daily vegcover provided */
for (rec = 0; rec < global_param.nrecs; rec++) {
for(v = 0; v < veg_con[0].vegetat_type_num; v++) {
sum = 0;
for (j = 0; j < NF; j++) {
hour = rec*global_param.dt + j*options.SNOW_STEP + global_param.starthour - hour_offset_int;
if (global_param.starthour - hour_offset_int < 0) hour += 24;
idx = (int)((float)hour/24.0);
if (local_veg_hist_data[VEGCOVER][v][idx] != NODATA_VH) {
veg_hist[rec][v].vegcover[j] = local_veg_hist_data[VEGCOVER][v][idx]; // assume constant over the day
if (veg_hist[rec][v].vegcover[j] < MIN_VEGCOVER) veg_hist[rec][v].vegcover[j] = MIN_VEGCOVER;
}
sum += veg_hist[rec][v].vegcover[j];
}
sum += veg_hist[rec][v].vegcover[j];
if(NF>1) veg_hist[rec][v].vegcover[NR] = sum / (float)NF;
}
if(NF>1) veg_hist[rec][v].vegcover[NR] = sum / (float)NF;
}
}
}
else {
/* sub-daily vegcover provided */
for(rec = 0; rec < global_param.nrecs; rec++) {
for(v = 0; v < veg_con[0].vegetat_type_num; v++) {
sum = 0;
for(i = 0; i < NF; i++) {
hour = rec*global_param.dt + i*options.SNOW_STEP + global_param.starthour - hour_offset_int;
veg_hist[rec][v].vegcover[i] = 0;
while (hour < rec*global_param.dt + (i+1)*options.SNOW_STEP + global_param.starthour - hour_offset_int) {
idx = hour;
if (idx < 0) idx += 24;
if (local_veg_hist_data[VEGCOVER][v][idx] != NODATA_VH) {
veg_hist[rec][v].vegcover[i] = local_veg_hist_data[VEGCOVER][v][idx];
if (veg_hist[rec][v].vegcover[i] < MIN_VEGCOVER) veg_hist[rec][v].vegcover[i] = MIN_VEGCOVER;
else {
/* sub-daily vegcover provided */
for(rec = 0; rec < global_param.nrecs; rec++) {
for(v = 0; v < veg_con[0].vegetat_type_num; v++) {
sum = 0;
for(i = 0; i < NF; i++) {
hour = rec*global_param.dt + i*options.SNOW_STEP + global_param.starthour - hour_offset_int;
veg_hist[rec][v].vegcover[i] = 0;
while (hour < rec*global_param.dt + (i+1)*options.SNOW_STEP + global_param.starthour - hour_offset_int) {
idx = hour;
if (idx < 0) idx += 24;
if (local_veg_hist_data[VEGCOVER][v][idx] != NODATA_VH) {
veg_hist[rec][v].vegcover[i] = local_veg_hist_data[VEGCOVER][v][idx];
if (veg_hist[rec][v].vegcover[i] < MIN_VEGCOVER) veg_hist[rec][v].vegcover[i] = MIN_VEGCOVER;
}
hour++;
}
hour++;
sum += veg_hist[rec][v].vegcover[i];
}
sum += veg_hist[rec][v].vegcover[i];
if(NF>1) veg_hist[rec][v].vegcover[NR] = sum / (float)NF;
}
if(NF>1) veg_hist[rec][v].vegcover[NR] = sum / (float)NF;
}
}
}
}

/*************************************************
Cosine of Solar Zenith Angle
*************************************************/
Expand Down

0 comments on commit d2b2b07

Please sign in to comment.