Merge/netcdf restart #166
Merge/netcdf restart #166
Conversation
grey-nearing
commented
Jun 21, 2016
grey-nearing
commented
- Enabled netCDF restart capabilities.
- Fixed issues with output long names and units.
- Consolidated the number of calls to read the hru/gru mapping from the Local Attributes file - reduced from 4 to 1.
2. Minor changes to netCDF restart capabilities.
|
What happened on the first merge commit (b92f1b5)? I wouldn't have expected all these changes to come in at this point, or am I missing something? The first two commits make sense for the restart, then it appears the merge introduced a bunch of syntax changes? |
|
Sorry, I canceled the other PR because it contained an error. All of the syntax changes (e.g., endif -> end if) I did so as to make all of the syntax consistent throughout the code. |
|
Ok, sounds good. Just wanted to make sure it wasn't a merge issue or pull request with old syntax. |
| @@ -515,16 +483,16 @@ program multi_driver | |||
|
|
|||
| ! set default model parameters | |||
| do iGRU=1,nGRU | |||
| do localHRU=1,gru_struc(iGRU)%hruCount | |||
| do iHRU=1,gru_struc(iGRU)%hruCount | |||
There was a problem hiding this comment.
Are we changing back from localHRU to iHRU?
There was a problem hiding this comment.
After the merge, half the lines in multi_driver.f90 used iHUR and half used localHRU. I had to choose one, and I went with iHRU because it is intuitive, it matches the other loop syntax in the rest of the code, and iHRU specifically is used elsewhere in the code.
| print "(A,A)",'Created output file:',trim(fname) | ||
| enddo | ||
| if(err/=0)then; message=trim(message)//trim(cmessage); return; end if | ||
| print*,'Created output file:',trim(fname) |
There was a problem hiding this comment.
explicit format '(A,A)' can prevent unexpected newline in fname when fname is long.
…bal HRU index to the model output function rather than the local HRU index.
… the whole netcdf file.
1. Time outputs in multistream. 2. A format statement in ffile_info.f90. 3. Some spacing issues in various syntax.
|
@greyNearing: Please resolve conflict and let me know when this is ready to merge |
|
@greyNearing : This will resolve issue #125. Please update the branch and let me know when this is ready to merge. |
Conflicts: build/source/driver/multi_driver.f90 build/source/engine/snowLiqFlx.f90
