Feature/debug cesm driver #642

dgergel · 2016-10-08T18:18:33Z

No description provided.

update command line usage docs

* Fixed image driver history file name timetamp - now is timstep-beginning * Added release notes about PR UW-Hydro#635 (fixing image driver history filename timestamp)

Added an if statement so that when VIC is run on multiple nodes, only the master node will validate state file dimensions and coordinate variables.

Use multiple processors for image restart tests

Fixing a problem with image restarts when using multiple processors

…communicating with the coupler

…ending)

* Fixed a bug when calculating steps of forcing to skip - should round to integer first before converting to int type to prevent possible 1-timestep wrong offset * Added bug fix release notes to PR#639

…an int in gather_put_nc_field_int fctn

(Fixing a problem with image restarts when using multiple processors).

jhamman · 2016-10-08T18:28:26Z

vic/drivers/shared_image/src/vic_store.c


 /******************************************************************************
 * @brief    Save model state.
 *****************************************************************************/
 void
 vic_store(dmy_struct *dmy_current,
+          case_metadata *cmeta,


we don't want to pass case_metadata in to vic_store. Instead, you should set filenames.statefile = cmeta->caseid.

jhamman · 2016-10-08T18:30:01Z

vic/drivers/shared_image/src/vic_store.c

@@ -25,12 +25,14 @@
 *****************************************************************************/

 #include <vic_driver_shared_image.h>
+#include <vic_driver_cesm.h>


this file is also compiled with the image driver so you need to find a solution that does not require the cesm driver. I think that all you need is the caseid which can be stored as filenames.statefile.

Yep - I'm doing this now in the vic_cesm_run function.

…run function

jhamman · 2016-10-09T03:22:18Z

vic/drivers/cesm/src/cesm_interface_c.c

+        // assign case name to state file name
+        strncpy(filenames.statefile, trim(cmeta->caseid), 
+                sizeof(filenames.statefile));
+        // write state file        


You have the right idea here, but we should just put this logic in vic_cesm_start since we have all this info at initialization.

jhamman · 2016-10-09T03:22:58Z

vic/drivers/cesm/src/cesm_interface_f.F90

       USE, INTRINSIC :: ISO_C_BINDING
       USE vic_cesm_def_mod
       IMPLICIT NONE
       TYPE(vic_clock), INTENT(in) :: vclock
+       TYPE(case_metadata), INTENT(in) :: cmeta


you can roll back these changes as well.

jhamman · 2016-10-09T03:23:33Z

vic/drivers/cesm/cpl_mct/lnd_comp_mct.F90

@@ -381,7 +381,7 @@ SUBROUTINE lnd_run_mct(EClock, cdata, x2l, l2x, cdata_s, x2s, s2x)
    CALL lnd_import_mct(x2l)

    !--- run vic
-    errno = vic_cesm_run(vclock)
+    errno = vic_cesm_run(vclock, cmeta)


roll back these changes.

…ic_cesm_run function because adding this logic to vic_cesm_init instead" This reverts commit 7e28f13.

jhamman

Getting close. Can you also add an entry to the change log?

jhamman · 2016-10-10T19:09:27Z

vic/drivers/shared_image/src/vic_store.c

+                             global_param.calendar, global_param.time_units, 
+                             &end_time_date);
+
+


This block looks good but can you move it into the if (mpi_rank == VIC_MPI_ROOT) block below.

Actually, should I also put this new block into vic_cesm_start? Since this function is in /shared_image, we actually want the state file info coming from the global parameter file unless we're running the CESM driver...It'd require passing dmy_current into vic_cesm_start but seems more internally consistent.

Actually, on second thought, the timestamp will be incorrect if it's set at initialization and not at the time at which we write the state file. But I still think it seems like this shouldn't be in vic_store, since that's a shared_image function.

This needs to be addressed still.

jhamman · 2016-10-10T19:10:37Z

vic/drivers/cesm/src/cesm_interface_c.c

+    // assign case name to state file name
+    strncpy(filenames.statefile, trim(cmeta->caseid),
+            sizeof(filenames.statefile));
+


please put this in vic_cesm_start(). As you can see, we don't really do anything in this top level function except call other functions and I'd like to keep it that way.

this still needs to be addressed.

…er type (UW-Hydro#645) * Added check to ensure mask varible in domain file is integer type * Cleaned up some printing lines * Added get_nc_var_type.c * Minor update of comments and ReleaseNotes * Added domain file description in docs * Small fix of table in docs * Added ncdump -h results for domain file in docs * Minor docs update

* Added check to ensure mask varible in domain file is integer type * Cleaned up some printing lines * Added get_nc_var_type.c * Minor update of comments and ReleaseNotes * Added domain file description in docs * Small fix of table in docs * Added ncdump -h results for domain file in docs * Minor docs update * The input arguments to function `make_lastday` are sometimes in a wrong order - fixed the bug * Added ReleaseNotes regarding PR#647

…ebug_CESM_driver

…otfix/5.0.1" This reverts commit a9a202b, reversing changes made to bbf7d9a.

This reverts commit 72a56a5.

…was updated in VIC 5

…ce this was updated in VIC 5" This reverts commit e7192c5.

bartnijssen · 2017-01-04T15:41:18Z

@jhamman : Can you review and merge when ready?

jhamman

still a few changes hanging out there. We also need a changelog entry.

jhamman · 2017-01-04T15:50:29Z

vic/drivers/cesm/src/cesm_interface_c.c

+    // assign case name to state file name
+    strncpy(filenames.statefile, trim(cmeta->caseid),
+            sizeof(filenames.statefile));
+


this still needs to be addressed.

jhamman · 2017-01-04T15:52:12Z

vic/drivers/shared_image/src/vic_store.c

+                             global_param.calendar, global_param.time_units, 
+                             &end_time_date);
+
+


This needs to be addressed still.

bartnijssen · 2017-01-04T16:52:06Z

@dgergel : Please complete so @jhamman can merge

…sues

dgergel · 2017-01-04T21:29:42Z

@jhamman I'll tie this up today.

dgergel

@jhamman, I've made the requested changes.

dgergel · 2017-01-05T19:44:18Z

vic/drivers/cesm/src/cesm_interface_c.c

+    // assign case name to state file name
+    strncpy(filenames.statefile, trim(cmeta->caseid),
+            sizeof(filenames.statefile));
+


dgergel · 2017-01-05T19:44:31Z

vic/drivers/shared_image/src/vic_store.c

+                             global_param.calendar, global_param.time_units, 
+                             &end_time_date);
+
+


Joe Hamman and others added 16 commits September 5, 2016 21:49

update command line usage docs

99629f6

Merge pull request UW-Hydro#634 from jhamman/fix/doc_command_line_usage

698dd0a

update command line usage docs

update release notes

96e3177

Fixed image driver history file name (UW-Hydro#635)

8d64e34

* Fixed image driver history file name timetamp - now is timstep-beginning * Added release notes about PR UW-Hydro#635 (fixing image driver history filename timestamp)

Committing a fix to vic_restore.c

8181420

Added an if statement so that when VIC is run on multiple nodes, only the master node will validate state file dimensions and coordinate variables.

Use multiple processors for image restart tests

ed98825

Merge pull request #1 from yixinmao/multiproc_init_state_fix

bd3db2f

Use multiple processors for image restart tests

Merge pull request UW-Hydro#638 from hhelgason/multiproc_init_state_fix

9a71edd

Fixing a problem with image restarts when using multiple processors

dummy forcings are now created while initializing the model prior to …

35cfb0b

…communicating with the coupler

removed decimal point for missing value for unsigned ints

cb87c5e

initial fix for getting state file date/time info

1b4ff79

updated fix for getting statefile time info from dmy_current (period-…

d2b6643

…ending)

Fixed a bug when calculating steps of forcing to skip (UW-Hydro#639)

6d911d6

* Fixed a bug when calculating steps of forcing to skip - should round to integer first before converting to int type to prevent possible 1-timestep wrong offset * Added bug fix release notes to PR#639

fixed bug that passed fillvalue as double when it was supposed to be …

d85e37e

…an int in gather_put_nc_field_int fctn

Added release notes about PR UW-Hydro#638. (UW-Hydro#640)

644f2aa

(Fixing a problem with image restarts when using multiple processors).

use appropriate fillvalue datatypes in gather_put_nc_field fctns

95d6983

jhamman requested changes Oct 8, 2016

View reviewed changes

add caseid to statefile name by passing case metadata in to vic_cesm_…

7e28f13

…run function

jhamman reviewed Oct 9, 2016

View reviewed changes

dgergel added 2 commits October 10, 2016 14:37

Revert "add caseid to statefile name by passing case metadata in to v…

78dd563

…ic_cesm_run function because adding this logic to vic_cesm_init instead" This reverts commit 7e28f13.

assign caseid to statefile name in vic_cesm_init

013d4c5

jhamman requested changes Oct 10, 2016

View reviewed changes

dgergel and others added 6 commits October 11, 2016 16:34

fix warnings for SNOW_BAND and AGGFREQ

53a9535

fixed typo in comment

bbf7d9a

fix typo in primary reference (UW-Hydro#646)

8a6d19b

Merge branch 'hotfix/5.0.1' of github.com:UW-Hydro/VIC into feature/d…

16f74dd

…ebug_CESM_driver

dgergel added 8 commits October 26, 2016 23:35

Merge branch 'hotfix/5.0.1' of github.com:UW-Hydro/VIC into hotfix/5.0.1

a9a202b

Merge branch 'hotfix/5.0.1' into feature/debug_CESM_driver

e2ca076

Revert "Merge branch 'hotfix/5.0.1' of github.com:UW-Hydro/VIC into h…

2aa1eb0

…otfix/5.0.1" This reverts commit a9a202b, reversing changes made to bbf7d9a.

pressure was being converted to kPa, should be in Pa

72a56a5

Revert "pressure was being converted to kPa, should be in Pa"

8bbca06

This reverts commit 72a56a5.

pressure was being converted to kPa, should be in Pa

1c13e93

convert pressure to kPa when reading it in rather than Pa since this …

e7192c5

…was updated in VIC 5

Revert "convert pressure to kPa when reading it in rather than Pa sin…

034bf33

…ce this was updated in VIC 5" This reverts commit e7192c5.

jhamman requested changes Jan 4, 2017

View reviewed changes

fixed bug with using the correct local domain grid cells and units is…

da96d91

…sues

address PR review comments

60b754a

dgergel commented Jan 5, 2017

View reviewed changes

add change log entry

e598652

jhamman approved these changes Jan 5, 2017

View reviewed changes

jhamman merged commit d1872e7 into UW-Hydro:develop Jan 6, 2017

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Feature/debug cesm driver #642

Feature/debug cesm driver #642

dgergel commented Oct 8, 2016

jhamman Oct 8, 2016

jhamman Oct 8, 2016

dgergel Oct 9, 2016 •

edited

Loading

jhamman Oct 9, 2016

jhamman Oct 9, 2016

jhamman Oct 9, 2016

jhamman left a comment

jhamman Oct 10, 2016

dgergel Oct 10, 2016

dgergel Oct 10, 2016

jhamman Jan 4, 2017

dgergel Jan 5, 2017

jhamman Oct 10, 2016

jhamman Jan 4, 2017

dgergel Jan 5, 2017

bartnijssen commented Jan 4, 2017

jhamman left a comment

jhamman Jan 4, 2017

jhamman Jan 4, 2017

bartnijssen commented Jan 4, 2017

dgergel commented Jan 4, 2017

dgergel left a comment

dgergel Jan 5, 2017

dgergel Jan 5, 2017

		global_param.calendar, global_param.time_units,
		&end_time_date);

Feature/debug cesm driver #642

Feature/debug cesm driver #642

Conversation

dgergel commented Oct 8, 2016

Choose a reason for hiding this comment

Choose a reason for hiding this comment

dgergel Oct 9, 2016 • edited Loading

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

jhamman left a 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

bartnijssen commented Jan 4, 2017

jhamman left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

bartnijssen commented Jan 4, 2017

dgergel commented Jan 4, 2017

dgergel left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

dgergel Oct 9, 2016 •

edited

Loading