[Ncep.list.emc.fv3gfs_tickets] FV3GFS Ticket #19: Modify CHGRES to output boundary conditions for stand-alone nests

[FV3GFS Trac Ticket]

#19: Modify CHGRES to output boundary conditions for stand-alone nests
-----------------------------+----------------------------
  Reporter:  george.gayno@…  |      Owner:  george.gayno@…
      Type:  task            |     Status:  accepted
  Priority:  major           |  Milestone:
 Component:  component1      |    Version:
Resolution:                  |   Keywords:
-----------------------------+----------------------------

Comment (by george.gayno@…):

 Merge recent updates from the trunk to the
 [https://svnemc.ncep.noaa.gov/trac/fv3gfs/browser/branches/chgres_nests?rev=98282&order=name
 chgres_nests] branch.  There were two conflicts:

 {{{
 Summary of conflicts:
   Text conflicts: 1
   Property conflicts: 1
 Conflict for property 'svn:ignore' discovered on
 'global_shared.v15.0.0/exec'.
 local edit, incoming edit upon merge
 Select: (p) postpone, (mf) my version, (tf) their version,
         (dc) display conflict, (e) edit property, (q) quit resolution,
         (h) help: p
 Conflict discovered in file
 'global_shared.v15.0.0/sorc/global_chgres.fd/chgres.f90'.
 Select: (p) postpone, (df) show diff, (e) edit file, (m) merge,
         (mc) my side of conflict, (tc) their side of conflict,
         (s) show all options: p
 Summary of conflicts:
   Text conflicts: 1
   Property conflicts: 1
 }}}

 The first conflict was related to the "ignore" properties on the `exec`
 directory.  I updated the property to include all executables "ignored"
 from the branch and trunk:

 {{{
 /scratch4/NCEPDEV/da/save/George.Gayno/fv3gfs/branches/chgres_nests/global_shared.v15.0.0
 $ svn diff exec
 Index: exec
 ===================================================================
 --- exec        (revision 98524)
 +++ exec        (working copy)

 Property changes on: exec
 ___________________________________________________________________
 Modified: svn:ignore
 ## -1,6 +1,4 ##
  emcsfc_snow2mdl
 -shave.x
 -nst_mask_namchg
  emcsfc_ice_blend
  ncep_post
  global_chgres
 ## -12,3 +10,8 ##
  make_hgrid
  make_hgrid_parallel
  make_solo_mosaic
 +global_sfchdr
 +global_sighdr
 +nst_mask_namchg
 +regrid_nemsio
 +shave.x
 }}}

 Then marked it as resolved.

--
Ticket URL: <https://svnemc.ncep.noaa.gov/trac/fv3gfs/ticket/19#comment:11>
fv3gfs <https://svnemc.ncep.noaa.gov/trac/fv3gfs>
NGGPS FV3GFS Development