[Ncep.list.nems.announce] Intent to commit to NEMS trunk: NEMS Ticket #161: Unifying merge of branches/NUOPC/development and NEMS trunk

Gerhard Theurich theurich at sourcespring.net
Mon May 2 16:31:17 UTC 2016


Hi all,

Probably everyone on this list is aware of the ongoing BIGMERGE effort. 
Basically we are creating re-unified NEMS trunk that can be used for 
coupled systems (like UGCS-Seasonal), as well as regular GSM-only or 
NMMB-only work. On a superstructure level, the resulting NEMS system is 
based on the NUOPC Layer implementation of ESMF.

We are ready for the first merge commit back to the NEMS trunk. NEMS 
ticket #161 (forwarded below) contains the details.

Thanks,
-Gerhard


-------- Original Message --------
Subject: Re: [Nems.tickets] NEMS Ticket #161: Unifying merge of 
branches/NUOPC/development and NEMS trunk
Date: Mon, 02 May 2016 15:41:41 -0000
From: NEMS Trac Ticket <ncep.list.emc.nems.tickets at noaa.gov>
Reply-To: ncep.list.emc.nems.tickets at noaa.gov

#161: Unifying merge of branches/NUOPC/development and NEMS trunk
-------------------------+-----------------
   Reporter:  theurich@…  |      Owner:
       Type:  task        |     Status:  new
   Priority:  major       |  Milestone:
  Component:  NEMS        |    Version:  3.1
Resolution:              |   Keywords:
-------------------------+-----------------

Comment (by theurich@…):

  Several folks have been working on the unification effort of the NEMS
  trunk and NUOPC/development branch over the past two weeks. We started the
  effort with a new branch that was created at a pre-freeze NEMS trunk
  revision @74057. This branch was called BIGMERGE. Consequently the
  NUOPC/development branch was merged onto the BIGMERGE branch. The final
  trunk revision @74228 was merged into BIGMERGE once it was available. Full
  system regression testing was carried out over a period of two weeks,
  ironing out any flagged issues. BIGMERGE at 74963 is the current candidate
  for the back-merge into the NEMS trunk.

  This back-merge is a straight forward "svn merge --reintegrate" of
  branches/BIGMERGE into the trunk. It results in the following "svn
  status":

   M      .
  A  +    tests/nems.configure.med_atm_ocn_ice.prof.IN
  A  +    tests/nems.configure.medcold_atm_ocn_ice.prof.IN
  A  +    tests/nems.configure.atm_ocn_ice.IN
  A  +    tests/nems.configure.med_atm_ocn_ice_wav.IN
  A  +    tests/nems.configure.blocked_lnd_hyd.IN
  A  +    tests/RT.small.compsetRun
  A  +    tests/nems.configure.med_lnd_hyd.IN
  A  +    tests/nmm_conf/nmm_bsub.IN_wcoss
  M       tests/nmm_conf/nmm_nests_run.IN
  M       tests/nmm_conf/nmm_mnests_run.IN
  A  +    tests/nmm_conf/nmm_bsub.IN_yellowstone
  M       tests/nmm_conf/nmm_fltr_zombie_run.IN
  M       tests/nmm_conf/nmm_msub.IN
  M       tests/nmm_conf/nmm_glob_run.IN
  M       tests/nmm_conf/nmm_qsub.IN
  M       tests/nmm_conf/nmm_fltr_run.IN
  M       tests/nmm_conf/nmm_mnests_2way_run.IN
  M       tests/nmm_conf/nmm_reg_run.IN
  A  +    tests/nems.configure.blocked_atm_hyd.IN
  M       tests/nems.configure.atm_nostep.IN
  M       tests/nems.configure.med_atm_ipm.IN
  A  +    tests/nems.configure.atm_step.IN
  M       tests/nems.configure.atm_lnd.IN
  M       tests/detect_machine.sh
  A  +    tests/nems.configure.lnd_hyd.IN
  M       tests/gen_qsub.IN
  M       tests/nems.configure.atm_hyd.IN
  M       tests/nems.configure.atm_ipm.IN
  A  +    tests/nems.configure.med_atm_lnd_ice_ocn_sbys_hyd.IN
  A  +    tests/gfs_bsub.IN_wcoss
  A  +    tests/nems.configure.med_nmm_ocn_ice.IN
  M       tests/Compile_theia.log
  M       tests/Compile_wcoss.log
  M       tests/nems.configure.blocked_atm_ocn.IN
  M       tests/nems.configure.med_atm_ocn.IN
  A  +    tests/nems.configure.med_atm.IN
  M       tests/rt_gfs.sh
  A  +    tests/RegressionTests_gaea.log
  A  +    tests/nems.configure.lnd.IN
  A  +    tests/gfs_bsub.IN_yellowstone
  M       tests/nems.configure.atm_ocn.IN
  A  +    tests/nems.configure.blocked_atm_wav.IN
  M       tests/nems.configure.atm.IN
  A  +    tests/nems.configure.hyd.IN
  A  +    tests/nems.configure.ipm.IN
  A  +    tests/nems.configure.med_atm_lnd_ice_ocn_hyd.IN
  A  +    tests/nems.configure.medcold_atm_ocn_ice.IN
  A  +    tests/run.sh
  M       tests/gfs_qsub.IN
  A  +    tests/nems.configure.atm_wav.IN
  A  +    tests/nems.configure.med.IN
  M       tests/rt_gocart.sh
  M       tests/exngac_fcst.sh.sms
  M       tests/rt.sh
  A  +    tests/tests/gfs_slg_nemsio_read
  A  +    tests/nems.configure.leapfrog_atm_wav.IN
  M       tests/nems.configure.ocn.IN
  M       tests/rt_nmm.sh
  M       tests/exglobal_fcst_nems.sh
  M       tests/rt.conf
  M       tests/gsm_config
  A  +    tests/nems.configure.wav.IN
  M       tests/ngac_bsub.IN
  M       tests/RegressionTests_theia.log
  D       tests/gfs_bsub.IN
  M       tests/RegressionTests_wcoss.log
  M       tests/gfs_fcst_run.IN_Linux
  A  +    tests/nems.configure.blocked_atm_ice_ocn.IN
  M       tests/nems.configure.med_atm_ocn_ice.IN
  A  +    tests/nems.configure.med_atm_ice_ocn_sbys_lnd_hyd.IN
  A  +    tests/nems.configure.med_atm_ice_ocn_hyd_sbys_lnd.IN
  M       tests/gfs_fcst_run.IN_IBM
  M       NEMSCompsetRun
  M       AppBuilder/CFS.template.appBuilder
   M      src
  M       src/ESMFVersionDefine_ESMF_NUOPC.h
  D       src/ESMFVersionDefine_ESMF_630rAPI.h
  M       src/configure
   M      src/atmos
  M       src/atmos/module_ATM_INTERNAL_STATE.F90
  M       src/atmos/share/module_ERR_MSG.F90
  M       src/atmos/share/module_CPLFIELDS.F90
   M      src/atmos/phys
  M       src/atmos/phys/radiation_aerosols.f
  M       src/atmos/phys/radiation_aerosols_gfs.f
  M       src/atmos/phys/gbphys.f
  M       src/atmos/phys/nuopc_physics.F90
  M       src/atmos/post/post_nmm.F90
  M       src/atmos/module_ATM_GRID_COMP.F90
  M       src/atmos/io/module_GET_CONFIG_WRITE_GFS.F90
  M       src/atmos/io/module_WRITE_ROUTINES_GFS.F90
  M       src/atmos/io/module_WRITE_INTERNAL_STATE_GFS.F90
  M       src/atmos/io/module_GFS_WRITE.F90
  M       src/atmos/io/module_WRITE_GRID_COMP_GFS.F90
  D       src/atmos/nmm
  D       src/atmos/nmm/module_CONTROL.F90
  D       src/atmos/nmm/module_EXCHANGE.F90
  D       src/atmos/nmm/module_NMM_INTERNAL_STATE.F90
  D       src/atmos/nmm/n_mpi_quit.f
  D       src/atmos/nmm/module_QUASIPOST.F90
  D       src/atmos/nmm/module_DIAGNOSE.F90
  D       src/atmos/nmm/n_namelist_physics_def.f
  D       src/atmos/nmm/module_CLOCKTIMES.F90
  D       src/atmos/nmm/module_SOLVER_GRID_COMP.F90
  D       src/atmos/nmm/n_layout1.f
  D       src/atmos/nmm/n_mpi_def.f
  D       src/atmos/nmm/module_DOMAIN_INTERNAL_STATE.F90
  D       src/atmos/nmm/module_GET_CONFIG.F90
  D       src/atmos/nmm/module_RELAX4E.F90
  D       src/atmos/nmm/module_SOLVER_INTERNAL_STATE.F90
  D       src/atmos/nmm/module_DERIVED_TYPES.F90
  D       src/atmos/nmm/n_module_gfs_mpi_def.f
  D       src/atmos/nmm/module_NESTING.F90
  D       src/atmos/nmm/module_CONVECTION.F90
  D       src/atmos/nmm/module_PARENT_CHILD_CPL_COMP.F90
  D       src/atmos/nmm/module_INIT_READ_NEMSIO.F90
  D       src/atmos/nmm/module_TURBULENCE.F90
  D       src/atmos/nmm/module_MY_DOMAIN_SPECS.F90
  D       src/atmos/nmm/module_TIMESERIES.F90
  D       src/atmos/nmm/module_NMM_GRID_COMP.F90
  D       src/atmos/nmm/module_RADIATION.F90
  D       src/atmos/nmm/module_DM_PARALLEL.F90
  D       src/atmos/nmm/module_WRITE_GRID_COMP.F90
  D       src/atmos/nmm/module_H_TO_V.F90
  D       src/atmos/nmm/module_GET_CONFIG_WRITE.F90
  D       src/atmos/nmm/module_GWD.F90
  D       src/atmos/nmm/module_WRITE_ROUTINES.F90
  D       src/atmos/nmm/module_INIT_READ_BIN.F90
  D       src/atmos/nmm/module_WRITE_INTERNAL_STATE.F90
  D       src/atmos/nmm/module_NMM_INTEGRATE.F90
  D       src/atmos/nmm/module_DIGITAL_FILTER_NMM.F90
  D       src/atmos/nmm/module_DOMAIN_GRID_COMP.F90
  D       src/atmos/nmm/module_TRACKER.F90
  D       src/atmos/nmm/module_PRECIP_ADJUST.F90
  D       src/atmos/nmm/module_FLTBNDS.F90
  D       src/atmos/nmm/module_REDUCTION.F90
  D       src/atmos/nmm/module_DYNAMICS_ROUTINES.F90
  D       src/atmos/nmm/module_OUTPUT.F90
  D       src/atmos/nmm/n_compns_physics.f
  D       src/atmos/nmm/n_resol_def.f
  D       src/atmos/nmm/module_NMM_GRID_COMP_stub.F90
  D       src/atmos/nmm/module_BGRID_INTERP.F90
  D       src/atmos/nmm/makefile
  D       src/atmos/nmm/module_VARS.F90
  D       src/atmos/nmm/module_VARS_STATE.F90
  D       src/atmos/nmm/module_MICROPHYSICS.F90
  D       src/atmos/nmm/module_CONSTANTS.F90
  M       src/atmos/gen/module_GEN_INTERNAL_STATE.F90
  M       src/atmos/gen/module_GEN_GRID_COMP_stub.F90
  M       src/atmos/gen/module_GEN_GRID_COMP.F90
  M       src/atmos/fim/module_FIM_INTEGRATE.F90
  M       src/atmos/fim/fim_internal_state.F90
  M       src/atmos/fim/module_PHYSICS_GRID_COMP.F90
  M       src/atmos/fim/fim_grid_comp_stub.F90
  M       src/atmos/fim/module_DYN_PHY_CPL_COMP.F90
  M       src/atmos/fim/fim_grid_comp.F90
  M       src/atmos/fim/module_DYNAMICS_GRID_COMP.F90
  M       src/ENS_Cpl/ENS_CplState_ESMFMod.f
  M       src/ENS_Cpl/pran.f
  M       src/ENS_Cpl/prana.f
  M       src/ENS_Cpl/DistributeForStep1.f
  M       src/ENS_Cpl/ENS_GetParameterFromStateMod.f
  M       src/ENS_Cpl/ENS_CplComp_ESMFMod.f
  M       src/ENS_Cpl/ENS_Sto_Per_Scheme_Step1.f
  M       src/ENS_Cpl/ENS_bcst_global.f
  M       src/ENS_Cpl/ENS_Cpl_Run_ESMFMod.f
  M       src/ENS_Cpl/ENS_Sto_Per_Scheme_Step2.f
  M       src/ENS_Cpl/ENS_CplComp_ESMFMod_STUB.F90
  M       src/ENS_Cpl/Lib_ESMFStateAddGetMod.f
  M       src/ENS_Cpl/ENS_Cpl_InternalState_ESMFMod.f
  M       src/conf/configure.nems.Yellowstone.intel
  A  +    src/conf/modules.nems.Wcoss_ESMF_700_nmmb
  M       src/conf/modules.nems.Theia_ESMF_NUOPC
  M       src/conf/modules.nems.Gaea_ESMF_NUOPC
  D       src/conf/configure.nems.Wcoss.intel_ESMF_630r_gsm
  M       src/conf/modules.nems.Wcoss_ESMF_NUOPC
  D       src/conf/configure.nems.Wcoss.intel_ESMF_630r_nmm
  D       src/conf/configure.nems.Wcoss_C.intel_ESMF_630r_gsm
  D       src/conf/modules.nems.Theia_ESMF_630rp1API_gsm
  A  +    src/conf/externals.nems.Yellowstone
  D       src/conf/configure.nems.Theia.intel_nmm
  D       src/conf/configure.nems.Theia.intel_ESMF_7_nmm
  A  +    src/conf/configure.nems.Theia.intel_nmmb
  A  +    src/conf/configure.nems.Wcoss.intel_gsm
  A  +    src/conf/configure.nems.Wcoss.intel_nmmb
  M       src/conf/configure.nems.NUOPC
  D       src/conf/modules.nems.Theia_gsm
  D       src/conf/modules.nems.Theia_nmm
  A  +    src/conf/modules.nems.Yellowstone_ESMF_NUOPC
  A  +    src/conf/modules.nems.Theia_ESMF_7_nmmb
  A  +    src/conf/modules.nems.Wcoss_ESMF_700_gsm
  A  +    src/conf/configure.nems.Theia.intel
  M       src/conf/configure.nems.Gaea.intel
  R  +    src/conf/configure.nems.Wcoss.intel
  D       src/conf/modules.nems.wcoss_ESMF_630rAPI_gsm
  D       src/conf/modules.nems.wcoss_ESMF_630rAPI_nmm
  A  +    src/conf/externals.nems.Linux.gnu
  M       src/conf/externals.nems.Theia
  M       src/conf/externals.nems.Gaea
  D       src/conf/modules.nems.wcoss_ESMF_3
  D       src/conf/configure.nems.Wcoss.intel_ESMF
  M       src/conf/configure.nems.Linux.gnu
  A  +    src/conf/modules.nems.Theia_ESMF_7_gsm
  D       src/conf/modules.nems.Theia_ESMF_7_nmm
  M       src/module_NEMS_GRID_COMP.F90
  M       src/module_EARTH_GRID_COMP.F90
  A  +    src/module_MEDIATOR_methods.F90
  D       src/ESMFVersionDefine_ESMF_3.h
  M       src/module_NEMS_INTERNAL_STATE.F90
  M       src/module_MEDIATOR_SpaceWeather.F90
  M       src/module_EARTH_INTERNAL_STATE.F90
  A  +    src/ESMFConvenienceMacros.h
  M       src/MAIN_NEMS.F90
  D       src/ESMFVersionLogic.h
  M       src/module_MEDIATOR.F90
  M       src/chem/gocart/src/Config/ESMA_base.mk
  M       src/chem/gocart/src/Config/ESMA_arch.mk
  M       src/chem/gocart/src/Config/fdp
  M       src/chem/gocart/src/GMAO_Shared/MAPL_Base/MAPL_Base.F90
  M       src/chem/gocart/src/GMAO_Shared/MAPL_Base/tests/utCFIO_Bundle.F90
  M       src/chem/gocart/src/GMAO_Shared/MAPL_Base/tests/ut_ExtData.F90
  M       src/chem/gocart/src/GMAO_Shared/MAPL_Base/tests/utDistIO.F90
  M       src/chem/gocart/src/GMAO_Shared/MAPL_Base/tests/utCFIO_Nbits.F90
  M       src/makefile
  M       NEMSAppBuilder
  M       compsets/2009_nems_gsm_mom5
  M       compsets/2009_nems_gsm_sice_mom5
  A  +    compsets/cfsr%20150401_1day_nems_gsm%slg%T126_cice%0.5_mom5%0.5
  A  +    compsets/2013_blocked_xatm_wrfhydro
  A  +    compsets/cfsr%20150401_5day_nems_gsm%slg%T126_cice%0.5_mom5%0.5
  A  +
  compsets/cfsr%20150401_1hr_timing_nems%cold_gsm%eul%T126_cice%0.5_mom5%0.5
  M       compsets/2009_blocked_xatm_xocn
  M       compsets/2011_sbys_gsm%wam
  A  +    compsets/cfsr%20150401_1day_blocked_gsm%eul%T126_ww3%T188
  A  +    compsets/adhoc_2day_spacewx_datm%wam%T62_dipm%ipe%80x170
  M       compsets/2009_nems_gsm_hycom
  A  +    compsets/cfsr%20150401_1day_nems_gsm%eul%T126_cice%0.5_mom5%0.5
  M       compsets/default.compsetRun
  A  +    compsets/20150401short_nems_nmm_cice_mom5
  A  +    compsets/cfsr%20150401_5day_nems_gsm%eul%T126_cice%0.5_mom5%0.5
  A  +    compsets/adhoc_sbys_hycom%core2%0.72
  A  +    compsets/2009_nems_gsm_cice_mom5_sbys_lis_wrfhydro
  A  +    compsets/2009_nems_gsm_lis_cice_mom5_wrfhydro
  M       compsets/2009_sbys_gsm
  A  +    compsets/2009_sbys_lis
  A  +    compsets/adhoc_2day_spacewx_datm%wam%T62_ipe%80x170
  M       compsets/2009_nems_gsm_socn
  A  +    compsets/cfsr%20150401_30day_nems_gsm%slg%T126_cice%0.5_mom5%0.5
  A  +    compsets/adhoc_sbys_hycom%core2%1.6
  A  +    compsets/2009_blocked_lis_wrfhydro
  A  +    compsets/cfsr%20150401_1day_leapfrog_gsm%eul%T126_ww3%T188
  A  +
  compsets/cfsr%20150401_1day_nems_gsm%eul%T126_cice%0.5_mom5%0.5_ww3%glo30m
  A  +    compsets/2009onedeg_nems_gsm_cice_mom5
  A  +
  compsets/cfsr%20150401_1hr_nems%cold_gsm%slg%T126_cice%0.5_mom5%0.5
  A  +    compsets/2009_sbys_lis_wrfhydro
  A  +    compsets/2009_nems_xatm_xlnd_xice_xocn_xhyd
  A  +    compsets/2009_sbys_mom5
  A  +    compsets/adhoc_sbys_hycom%0.72
  A  +    compsets/2009_nems_gsm_cice_mom5_wrfhydro_sbys_lis
  A  +    compsets/2009_nems_gsm_lis_cice_mom5_sbys_wrfhydro
  M       compsets/2009_sbys_gsm_hycom
  A  +    compsets/cfsr%20150401_1day_sbys_gsm%slg%T126
  A  +    compsets/2013_1PET_sbys_wrfhydro
  A  +    compsets/2009_sbys_satm_sice_socn
  A  +    compsets/cfsr%20150401_30day_nems_gsm%eul%T126_cice%0.5_mom5%0.5
  A  +    compsets/2009_nems_lis_wrfhydro
  M       compsets/2013_sbys_nmmb%glob
  A  +
  compsets/cfsr%20150401_1day_nems_gsm%eul%T126_cice%0.5_hycom%core2%0.72
  A  +    compsets/2013_sbys_wrfhydro
  A  +    compsets/2009_nems_gsm_lis_cice_mom5_wrfhydro_crash
  A  +
  compsets/cfsr%20150401_1hr_nems%cold_gsm%eul%T126_cice%0.5_mom5%0.5
  A  +    compsets/cfsr%20150401_2day_sbys_ww3%T188
  A  +
  compsets/cfsr%20150401_1day_timing_nems_gsm%eul%T126_cice%0.5_mom5%0.5
  A  +    compsets/XATM_WRFHYDRO.compsetRun
  A  +    compsets/cfsr%20150401_2day_sbys_gsm%eul%T126_ww3%T188
  M       compsets/2009_sbys_gsm_mom5
  A  +    compsets/cfsr%20150401_1day_sbys_gsm%eul%T126
  D       compsets/2009_nems_gsm_cice_mom5
  A  +    compsets/WRFHYDRO.compsetRun
  D       compsets/2009_nems_gsm_cice_hycom
  A  +    compsets/2009_nems_xatm_xlnd_xice_xocn_xhyd_crash
  M       compsets/all.compsetRun
  A  +    compsets/2009_nems_gsm_slnd_cice_mom5_wrfhydro
  A  +    compsets/LIS_WRFHYDRO.compsetRun
  A  +    compsets/2009_nems_gsm_slnd_cice_mom5_shyd
  A  +    compsets/2009_sbys_wrfhydro

  A working copy of the modified NEMS sources are available on
  Theia:/scratch4/NCEPDEV/nems/noscrub/Gerhard.Theurich/APPs/UGCS-
  Seasonal/NEMS for review.

  *gjt*

--
Ticket URL: <https://localhost:9443/trac/nems/ticket/161#comment:2>
NEMS <https://localhost:9443/trac/nems>
My example project

_______________________________________________
Ncep.list.emc.nems.tickets mailing list
Ncep.list.emc.nems.tickets at lstsrv.ncep.noaa.gov
https://www.lstsrv.ncep.noaa.gov/mailman/listinfo/ncep.list.emc.nems.tickets




More information about the Ncep.list.nems.announce mailing list