Feature/initialize albedo cesm driver #712

dgergel · 2017-04-19T01:23:17Z

This PR adds functionality for computing gridcell-averaged albedo for all drivers at each timestep. The purpose of this is to initialize and correctly compute albedo in the CESM driver to pass to WRF, but it has been implemented in all drivers for the sake of consistency. It includes the following components and additions to the core structure of VIC:

new struct, gridcell_avg, to all_vars, where avg_albedo (gridcell-averaged albedo) is stored
new state file variable, STATE_AVG_ALBEDO, for reading and writing gridcell-averaged albedo
generation of gridcell-averaged albedo from a cold start so that we have a reasonable estimate of albedo prior to reading in forcing data during CESM driver initialization
new routine, calc_gridcell_avg_albedo.c, to vic_run to compute gridcell-averaged albedo at each time step
add new function, vic_initialize_albedo(), contained in vic_cesm_init_library.c, to CESM driver in cesm_interface_c.c for setting l2x albedo values to reasonable estimates during the initialization phase

…lize_albedo_cesm_driver_2

…e/initialize_albedo_cesm_driver_2" This reverts commit 191c157, reversing changes made to a7e2bf2.

…dgergel/VIC into feature/initialize_albedo_cesm_driver_2

…o feature/initialize_albedo_cesm_driver_2"" This reverts commit e1d5d17.

…lize_albedo_cesm_driver_2

…ve travis test debugging value from calc_gridcell_avg_albedo

dgergel · 2017-05-02T05:07:18Z

@bartnijssen and @jhamman, this is (finally) ready for review.

This reverts commit f601957.

bartnijssen · 2017-06-05T15:20:42Z

docs/Development/ReleaseNotes.md

@@ -51,14 +51,16 @@ To check which release of VIC you are running:

    1. Fixes Julian day for the first timestep in the dmy struct for the CESM driver.

-3. Speed up NetCDF operations in the image/CESM drivers ([GH#684](https://github.com/UW-Hydro/VIC/pull/684))


I'm confused by the numbering and the edits on previous pull requests. Please fix

This deletion was a mistake, it shouldn't have been here. Fixed.

bartnijssen · 2017-06-05T15:37:26Z

vic/drivers/shared_all/src/generate_default_state.c

    double                ***tmpT;
    double                 **tmpZ;
    int                      ErrorFlag;

    cell_data_struct       **cell;
    energy_bal_struct      **energy;
+    veg_var_struct         **veg_var;
+    gridcell_avg_struct      gridcell_avg;


This should be a pointer. You don't want to copy the whole structure, you just want to point to the structure

bartnijssen · 2017-06-05T15:38:06Z

vic/drivers/shared_all/src/generate_default_state.c


    cell = all_vars->cell;
    energy = all_vars->energy;
+    veg_var = all_vars->veg_var;
+    gridcell_avg = all_vars->gridcell_avg;


if gridcell_avg is a pointer, then this would read

gridcell_avg = &(all_vars->gridcell_avg);

Or just get rid of it. Seems to me that later in the same code you just use all_vars->gridcell_avg directly anyway, so you don't really need this.

Yep - I just deleted it since I'm using all_vars->gridcell_avg instead.

bartnijssen · 2017-06-05T15:41:37Z

vic/drivers/shared_all/src/generate_default_state.c

+            }
+        }
+    }
+    all_vars->gridcell_avg.avg_albedo = albedo_sum;


See previous comment: Either use the local variable gridcell_avg (but change to a pointer) and use

gridcell_avg->avg_albedo = albedo_sum;

or get rid of local variable and just leave this as is.

I've left it as is and deleted the local variable gridcell_avg.

bartnijssen · 2017-06-05T15:42:58Z

vic/drivers/shared_all/src/vic_history.c

@@ -30,7 +30,7 @@
 * @brief    This routine creates the list of output data.
 *****************************************************************************/
 void
-alloc_out_data(size_t     ngridcells,
+alloc_out_data(size_t    ngridcells,


make sure you run all the code through uncrustify (see: https://github.com/UW-Hydro/VIC/tree/master/tools/code_format)

bartnijssen · 2017-06-05T15:44:53Z

vic/vic_run/src/calc_gridcell_avg_albedo.c

+        }
+    }
+
+    // compute gridcell-averaged albedo using average longwave


longwave should not be part of any albedo calculation

Indeed - this was a typo, since I'm not actually using longwave

…lize_albedo_cesm_driver_2

bartnijssen · 2017-06-06T15:11:50Z

vic/vic_run/src/calc_gridcell_avg_albedo.c

-    // compute gridcell-averaged albedo using average longwave
-    // and shortwave over gridcell
-
+    // compute gridcell-averaged albedo using average longwave shortwave


It still says longwave

Argh yes. This was careless.

dgergel and others added 23 commits April 18, 2017 17:13

implement initializing albedo

b1781bb

fix indentation

d0d0643

fix indentation

8f78023

ran uncrustify

b13eb62

add state file variable dimensions

57556b6

fix setting dimensions

58f6348

fix bug with looping over bands

a7e2bf2

Merge branch 'develop' of github.com:UW-Hydro/VIC into feature/initia…

191c157

…lize_albedo_cesm_driver_2

Merge branch 'develop' into feature/initialize_albedo_cesm_driver_2

900eae6

Revert "Merge branch 'develop' of github.com:UW-Hydro/VIC into featur…

e1d5d17

…e/initialize_albedo_cesm_driver_2" This reverts commit 191c157, reversing changes made to a7e2bf2.

Merge branch 'feature/initialize_albedo_cesm_driver_2' of github.com:…

cab0ca4

…dgergel/VIC into feature/initialize_albedo_cesm_driver_2

Revert "Revert "Merge branch 'develop' of github.com:UW-Hydro/VIC int…

598fd84

…o feature/initialize_albedo_cesm_driver_2"" This reverts commit e1d5d17.

use calloc instead of malloc to address nan bug

366972b

Merge branch 'develop' of github.com:UW-Hydro/VIC into feature/initia…

5bb1ba2

…lize_albedo_cesm_driver_2

gc_avg --> gridcell_avg

ef14be5

fix travis tests and update albedo at each time step

fcce4d0

gc_avg -> gridcell_avg in cesm driver

c64d284

test out travis test failure precision issue

33421a6

update actual all_vars struct rather than just local pointer and remo…

08903ff

…ve travis test debugging value from calc_gridcell_avg_albedo

add AreaFactor to weight swnet

ffeb046

ran uncrustify

5225ff0

add release notes entry

335c10b

add PR # to release notes entry

9f04af5

dgergel requested review from bartnijssen and jhamman May 2, 2017 05:05

dgergel added CESM driver all drivers vic_run labels May 2, 2017

dgergel mentioned this pull request May 2, 2017

Feature/refactor cesm put data #710

Merged

6 tasks

dgergel added 3 commits May 19, 2017 18:57

small bug fix to adding albedo to all_vars

f601957

Revert "small bug fix to adding albedo to all_vars"

76159bc

This reverts commit f601957.

small bug fix to adding gridcell averaged albedo to all_vars struct

319f7bf

bartnijssen requested changes Jun 5, 2017

View reviewed changes

dgergel added 2 commits June 5, 2017 19:04

address PR review comments

5cc2c13

Merge branch 'develop' of github.com:UW-Hydro/VIC into feature/initia…

2b159ec

…lize_albedo_cesm_driver_2

bartnijssen reviewed Jun 6, 2017

View reviewed changes

fix typo in comment

5d4bfcc

bartnijssen approved these changes Jun 6, 2017

View reviewed changes

bartnijssen merged commit 7fb512c into UW-Hydro:develop Jun 6, 2017

dgergel mentioned this pull request Jun 16, 2017

pass gridcell averaged albedo from all_vars struct to wrf #718

Merged

6 tasks

dgergel mentioned this pull request Aug 24, 2017

Fix albedo averaging #690

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Feature/initialize albedo cesm driver #712

Feature/initialize albedo cesm driver #712

dgergel commented Apr 19, 2017 •

edited

Loading

dgergel commented May 2, 2017

bartnijssen Jun 5, 2017

dgergel Jun 5, 2017

bartnijssen Jun 5, 2017

bartnijssen Jun 5, 2017

dgergel Jun 5, 2017

bartnijssen Jun 5, 2017

dgergel Jun 5, 2017

bartnijssen Jun 5, 2017

bartnijssen Jun 5, 2017

dgergel Jun 5, 2017

bartnijssen Jun 6, 2017

dgergel Jun 6, 2017

		@@ -51,14 +51,16 @@ To check which release of VIC you are running:

		1. Fixes Julian day for the first timestep in the dmy struct for the CESM driver.

		3. Speed up NetCDF operations in the image/CESM drivers ([GH#684](https://github.com/UW-Hydro/VIC/pull/684))

Feature/initialize albedo cesm driver #712

Feature/initialize albedo cesm driver #712

Conversation

dgergel commented Apr 19, 2017 • edited Loading

dgergel commented May 2, 2017

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

dgergel commented Apr 19, 2017 •

edited

Loading