Skip to content

Commit

Permalink
Merge branch 'feature/coupled-crow' of github.com:NOAA-EMC/global-wor…
Browse files Browse the repository at this point in the history
…kflow into feature/port_coupled_wcoss_dell

* 'feature/coupled-crow' of github.com:NOAA-EMC/global-workflow:
  Feature/gfsv16intocoupled (NOAA-EMC#194)
  feature/coupled-crow fractional grid  (NOAA-EMC#218)
  updating module file so that atm pos will work (NOAA-EMC#214)
  feature/coupled-crow updating to use latest ups-weather (NOAA-EMC#210)
  feature/coupled-crow: Updates for consistency  (NOAA-EMC#199)
  modify modulefile.reg2grb2.orion, modulefile.reg2grb2.hera and build_reg2grb2.sh to use hpc-stack library
  update readme to current wave post status
  rest of post jobs that should have been committed
  at this point, the post jobs for the waves post run, but the gridded grib2 files are not correct
  modifications for wave jobs after updating to be closer to v16 wave scripts but work for feature/coupled-crow
  update ENV files for wave jobs
  update wave jobs
  updates from gfsv16b-waves
  add correct path to wave exe
  remove exit
  update ww3 build script
  add building of WW3 pre and prep jobs currently requires extra module files (can be removed when base uses hpc-stack)
  update for module files on orion and adding building of wave prep
  updating scrip files for waves to match gfsv16b
  updating ush files for waves to match gfsv16b (includes restructure)
  cleanup
  (1) set IC dir path as /work/noaa/marine/Partha.Bhattacharjee/IC_Dir in workflow/platforms/orion.yaml (2) add extra white space in ush/nems_configure.sh in line 56 to eliminate warning in run log (3) correction on restart_n template variable setting in ush/nems.configure.med_atm_ocn_ice.IN
  corrections on E-P calculation in regdiag.f
  final updates to make cmeps forecasts run
  add pointer to which mediator restart for cmeps
  updates for CMEPS mediator
  adding MED pets so that they only use the forecast not write grid pets
  updates for nems.configure for running with CMEPS
  updating ice_in see NOAA-EMC/CICE5#25
  adding nems.configure to the log file
  add note to use rocoto/1.3.2 on orion as this version has fix for the UNAVAILABLE issue
  reg2grb2 now builds on orion
  updates of an lmod->lmod/lmod update to build of fv3_coupled
  updates for wave post jobs - changing exe dir location
  updating build to work with CMEPS
  cleanup from duplications
  adding cycle definition to wave post job
  fixing syntax error in JWAVE_PREP job for variables that are not actively being used
  change for lmod -> lmod/lmod on orion updated README
  updates - everything but wave post seems to run now, part of wave post does updating model to latest tag
  add waves to jglobal forecast config
  updated wave-realted scripts to match gfsv16 branch updated environment files env/ORION.env updated configuration system
  fix nems.configure for cold start
  at this point the ocean post is now running
  updates for forecast with waves
  updating forecast job for wave jobs
  updates to run wave prep for s2s case
  wave init now works on orion
  put ic type variable into config.fv3ic
  add ocean, ice and wave configurable variables
  add ocean, ice and wave configurable variables
  adding missing file from last commit
  wave init job now works on hera
  ocean post hours at boundary are processed twice, now fixed.
  point WW3-related executables through HOMEgfs/fv3_coupled.fd/exec
  updates for running wave jobs
  updates for wave defaults for s2s p4
  fix bugs in config.wave and coupled_ic.sh
  first try for adding wave ICs
  move OCNPETS, ICEPETS and WAVEPETS into dedicated model-specific sessions instead of fv3_gfs_settings
  bug fix in layout file
  bugfix in layout file
  changes to wave case
  cleaning up double cplwav
  adding updates to wave scripts from gfsv16b branch by @ajhenrique
  add ocn-ice build to readme
  Merged and ready for test
  reg2grb2 Build on Hera and Orion
  orion hera build test
  reg2grb2 for test on feature coupled-crow
  wave post-process job update
  Revise CCPP_SUITE variable name, default option, to "IPD"
  Fix suite name of CCPP Move cplwav and cplwav2atm variable
  1, Moved some of the variables into configuration system from JWAVE scripts 2, Wave configuration system built out 3, Modularized scripts updated to accomodate wave variables
  fix module-setup.sh.inc script, which causes module purge unsuccessful
  wave configuration update
  wave configuration files
  both forecast and atm post seem to be running okay on orion
  updating module_base.orion that allows cold start to run. Not sure if other jobs will now fail though or if what is in your .bashrc file will effect the success/failure of the run.
  fix typo
  updates for tar files and do not keep data
  adding ncks, updating ocean post, some fixes for tar files
  mediator cold start succeeds on hera and forecast job starts post jobs for atmosphere are no longer triggered on cold starts
  updates to readme for orion
  updating module files on hera
  we don't want to cycle/have 4 runs per day so setting the cases to be just 1 IC
  updating module files to match s2s model and ncep post modules
  last of archive updates for p4
  updating for reorganized tar files, pulling in changes from wcoss-p2 workflow
  making a fix dir of all available ccpp suite files copying suite xml file to rundirectory
  updates for CCPP suite used in p4
  updates for ice_in to match prototype 4
  update diag_table for ocean
  renaming exe to reflect updated build
  updates for new fix (which includes prep for multiple resolutions) and some clean-up
  more updates for ICs
  updates for copying ICs
  replace MOM6IC with BASE_CPLIC for base directory location of IC for s2s model and made it platform dependent. (Orion location is temporary and needs to be replaced, can also be changed in cases/coupled_free_forecast.yaml to users prefered location)
  fixed error when linking on hera
  removing fix from .gitignore
  making Externals_coupled.cfg consistent with checkout.sh
  update UPP version to v1.0.8
  updates to checkout, build and link to run prototype 4
  automate fix file linking, to this location: /work/noaa/marine/jmeixner/tempFixICdir/fix/fix_prep_benchmark3
  expand gitignore
  case file adjustment for Orion IC
  update checkout and External.cfg
  checkout and External.cfg update
  remove HERA-like paths in platform.yaml of Orion
  port to Orion
  reiflag default value changed to 1
  generalize fix file directory for imp_physics 8
  configuration update for CCPP scripts
  turn off stochastic features in case file
  update on sandbox platform, for FIX_SCRUB settings
  delete falseful copy after namelist and model_configure parsing add FNMSKH conditional clause, coupled vs non-coupled
  stochastic variables update
  OCNTIM and ICETIM are included in config.fv3 ice variable istep0 bug fix
  stochy variable namelist update, add hard-coded variables into config.fcst (fcst.yaml)
  capital case CDUMP values in config.fv3
  add stoch variables to config.fcst scripts update: CCPP and IPD works
  merge in the latest revision from IPD work
  model_configure_DATM
  move all default values into /defaults from /schema
  clean up unused schema move default value into defaults/
  Clean up exwave_post_sbs
  Moving standalone fv3 model_config exglobal_fcst block into if/else/fi cplwav model_config block. Reinstating config.wave block in JGLOBAL_FORECAST. Pointing EXECwave to HOMEgfs/exec directory for WW3 util executables (changed link_fv3gfs.sh accordingly). Removing debug options from compile.sh line in build_fv3.sh.
  Fix to JWAVE_PREP to look back a day for rtofs
  Squashing commits to wave2global
  bug fix, POSTGRB2TBL undefined
  Pointing to v3.1 tag for ufs-s2s-model making readme consistant with user.yaml.default
  • Loading branch information
WalterKolczynski-NOAA committed Jan 8, 2021
2 parents 2a6d56c + e13dafc commit ca3052d
Show file tree
Hide file tree
Showing 2,859 changed files with 231,726 additions and 260,065 deletions.
166 changes: 134 additions & 32 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,41 +1,56 @@
# Ignore all compiled files
#--------------------------
__pycache__
*.pyc
*.o
*.mod

# Ignore exec folder
#-------------------
exec/
fix

# Ignore fix directory symlinks
#------------------------------
fix/0readme
fix/fix_am
fix/fix_chem
fix/fix_fv3
fix/fix_fv3_gmted2010
fix/fix_gldas
fix/fix_gsi
fix/fix_gsi_MISSING
fix/fix_orog
fix/fix_sfc_climo
fix/fix_verif
fix/fix_wave_gfs
fix/fix_*
fix/gdas/
fix/wafs

# Ignore scripts from external symlink jobs
#------------------------------
jobs/JGDAS_ATMOS_ANALYSIS_DIAG
jobs/JGDAS_ATMOS_CHGRES_FORENKF
jobs/JGDAS_ATMOS_GLDAS
jobs/JGDAS_ATMOS_VERFOZN
jobs/JGDAS_ATMOS_VERFRAD
jobs/JGDAS_ATMOS_VMINMON
jobs/JGDAS_ENKF_DIAG
jobs/JGDAS_ENKF_ECEN
jobs/JGDAS_ENKF_FCST
jobs/JGDAS_ENKF_POST
jobs/JGDAS_ENKF_RECENTER
jobs/JGDAS_VERFOZN
jobs/JGDAS_VERFRAD
jobs/JGDAS_VMINMON
jobs/JGFS_VMINMON
jobs/JGFS_WAFS
jobs/JGFS_WAFS_BLENDING
jobs/JGFS_WAFS_GCIP
jobs/JGFS_WAFS_GRIB2
jobs/JGLOBAL_ANALYSIS
jobs/JGLOBAL_ENKF_INNOVATE_OBS
jobs/JGLOBAL_ENKF_SELECT_OBS
jobs/JGLOBAL_ENKF_UPDATE
jobs/JGLOBAL_NCEPPOST
jobs/JGLOBAL_POST_MANAGER
jobs/JGDAS_ENKF_SELECT_OBS
jobs/JGDAS_ENKF_SFC
jobs/JGDAS_ENKF_UPDATE
jobs/JGFS_ATMOS_VMINMON
jobs/JGFS_ATMOS_WAFS
jobs/JGFS_ATMOS_WAFS_BLENDING
jobs/JGFS_ATMOS_WAFS_BLENDING_0P25
jobs/JGFS_ATMOS_WAFS_GCIP
jobs/JGFS_ATMOS_WAFS_GRIB2
jobs/JGFS_ATMOS_WAFS_GRIB2_0P25
jobs/JGLOBAL_ATMOS_ANALYSIS
jobs/JGLOBAL_ATMOS_ANALYSIS_CALC
jobs/JGLOBAL_ATMOS_NCEPPOST
jobs/JGLOBAL_ATMOS_POST_MANAGER

# Ignore parm file symlinks
#--------------------------
parm/config/config.base
parm/mon/
parm/gldas
parm/mon
parm/post
parm/wafs

scripts/exemcsfc_global_sfc_prep.sh.ecf
scripts/exgdas_nceppost.sh.ecf
scripts/exgdas_vrfminmon.sh.ecf
Expand All @@ -55,8 +70,48 @@ scripts/exglobal_enkf_recenter_fv3gfs.sh.ecf
scripts/exglobal_enkf_update_fv3gfs.sh.ecf
scripts/exglobal_innovate_obs_fv3gfs.sh.ecf
scripts/exglobal_pmgr.sh.ecf
scripts/exemcsfc_global_sfc_prep.sh
scripts/exgdas_atmos_chgres_forenkf.sh
scripts/exgdas_atmos_gldas.sh
scripts/exgdas_atmos_nceppost.sh
scripts/exgdas_atmos_verfozn.sh
scripts/exgdas_atmos_verfrad.sh
scripts/exgdas_atmos_vminmon.sh
scripts/exgdas_enkf_ecen.sh
scripts/exgdas_enkf_fcst.sh
scripts/exgdas_enkf_post.sh
scripts/exgdas_enkf_select_obs.sh
scripts/exgdas_enkf_sfc.sh
scripts/exgdas_enkf_update.sh
scripts/exgfs_atmos_nceppost.sh
scripts/exgfs_atmos_vminmon.sh
scripts/exgfs_atmos_wafs_blending.sh
scripts/exgfs_atmos_wafs_blending_0p25.sh
scripts/exgfs_atmos_wafs_gcip.sh
scripts/exgfs_atmos_wafs_grib.sh
scripts/exgfs_atmos_wafs_grib2.sh
scripts/exgfs_atmos_wafs_grib2_0p25.sh
scripts/exglobal_atmos_analysis.sh
scripts/exglobal_atmos_analysis_calc.sh
scripts/exglobal_atmos_pmgr.sh
scripts/exglobal_diag.sh

sorc/*log

sorc/calc_analysis.fd
sorc/calc_increment_ens_ncio.fd
sorc/gdas2gldas.fd
sorc/gldas2gdas.fd
sorc/gldas_forcing.fd
sorc/gldas_model.fd
sorc/gldas_post.fd
sorc/gldas_rst.fd
sorc/interp_inc.fd
sorc/ncdiag_cat.fd
sorc/nemsio_chgdate.fd
sorc/calc_increment_ens.fd
sorc/checkout-fv3gfs.log
sorc/checkout-ufs_coupled.log
sorc/checkout-gfs_post.log
sorc/checkout-gfs_wafs.log
sorc/checkout-gsi.log
Expand Down Expand Up @@ -95,6 +150,7 @@ sorc/gfs_bufr.fd/vintg.o
sorc/gfs_ncep_post.fd
sorc/gfs_post.fd/
sorc/gfs_wafs.fd/
sorc/gldas.fd/
sorc/global_chgres.fd
sorc/global_cycle.fd
sorc/global_enkf.fd
Expand All @@ -118,6 +174,7 @@ sorc/recentersigp.fd
sorc/shave.fd
sorc/tocsbufr.fd/tocsbufr.o
sorc/ufs_utils.fd/
sorc/ufs_coupled.fd/
sorc/verif-global.fd/
sorc/wafs_awc_wafavn.fd
sorc/wafs_blending.fd
Expand All @@ -128,6 +185,10 @@ sorc/wafs_setmissing.fd
sorc/checkout-fv3_coupled.log
sorc/checkout-gsi.fd.log
sorc/fv3_coupled.fd/


ush/calcanl_gfs.py
ush/calcinc_gfs.py
ush/emcsfc_ice_blend.sh
ush/emcsfc_snow.sh
ush/fix_precip.sh
Expand All @@ -138,17 +199,26 @@ ush/fv3gfs_dwn_nems.sh
ush/fv3gfs_filter_topo.sh
ush/fv3gfs_make_grid.sh
ush/fv3gfs_make_orog.sh
ush/getncdimlen
ush/gfs_nceppost.sh
ush/gfs_transfer.sh
ush/gldas_archive.sh
ush/gldas_forcing.sh
ush/gldas_get_data.sh
ush/gldas_liscrd.sh
ush/gldas_post.sh
ush/gldas_process_data.sh
ush/global_chgres.sh
ush/global_chgres_driver.sh
ush/global_cycle.sh
ush/global_cycle_driver.sh
ush/gsi_utils.py
ush/link_crtm_fix.sh
ush/minmon_xtrct_costs.pl
ush/minmon_xtrct_gnorms.pl
ush/minmon_xtrct_reduct.pl
ush/mkwfsgbl.sh
ush/mod_icec.sh
ush/ozn_xtrct.sh
ush/radmon_ck_stdout.sh
ush/radmon_err_rpt.sh
Expand All @@ -158,12 +228,44 @@ ush/radmon_verf_bcor.sh
ush/radmon_verf_time.sh
ush/trim_rh.sh
ush/wafs_blending.sh
ush/wafs_grib2.regrid.sh
ush/wafs_intdsk.sh
ush/emcsfc_ice_blend.sh
ush/emcsfc_snow.sh
ush/fix_precip.sh
ush/fv3gfs_chgres.sh
ush/fv3gfs_downstream_nems.sh
ush/fv3gfs_driver_grid.sh
ush/fv3gfs_dwn_nems.sh
ush/fv3gfs_filter_topo.sh
ush/fv3gfs_make_grid.sh
ush/fv3gfs_make_orog.sh
ush/gfs_nceppost.sh
ush/gfs_transfer.sh
ush/global_chgres.sh
ush/global_chgres_driver.sh
ush/global_cycle.sh
ush/global_cycle_driver.sh
ush/link_crtm_fix.sh
ush/minmon_xtrct_costs.pl
ush/minmon_xtrct_gnorms.pl
ush/minmon_xtrct_reduct.pl
ush/mkwfsgbl.sh
ush/ozn_xtrct.sh
ush/radmon_ck_stdout.sh
ush/radmon_err_rpt.sh
ush/radmon_verf_angle.sh
ush/radmon_verf_bcoef.sh
ush/radmon_verf_bcor.sh
ush/radmon_verf_time.sh
ush/trim_rh.sh
ush/wafs_blending.sh
ush/wafs_intdsk.sh

# util symlinks
util/sub_slurm
util/sub_wcoss_c
util/sub_wcoss_d

workflow/user.yaml
sorc/checkout-gldas.fd.log
sorc/gldas.fd/
sorc/reg2grb2.fd/*.o
sorc/reg2grb2.fd/*.mod

25 changes: 16 additions & 9 deletions Externals.cfg
Original file line number Diff line number Diff line change
@@ -1,42 +1,49 @@
# External sub-modules of global-workflow

[NEMSfv3gfs]
tag = gfs.v16_PhysicsUpdate
[FV3GFS]
tag = GFS.v16.0.14
local_path = sorc/fv3gfs.fd
repo_url = ssh://vlab.ncep.noaa.gov:29418/NEMSfv3gfs
repo_url = https://github.com/ufs-community/ufs-weather-model.git
protocol = git
required = True

[GSI]
hash = cb8f69d8
tag = gfsda.v16.0.0
local_path = sorc/gsi.fd
repo_url = ssh://vlab.ncep.noaa.gov:29418/ProdGSI
repo_url = https://github.com/NOAA-EMC/GSI.git
protocol = git
required = True

[GLDAS]
tag = gldas_gfsv16_release.v1.11.0
local_path = sorc/gldas.fd
repo_url = https://github.com/NOAA-EMC/GLDAS.git
protocol = git
required = True

[EMC_post]
hash = ba7e59b2
tag = upp_gfsv16_release.v1.1.0
local_path = sorc/gfs_post.fd
repo_url = https://github.com/NOAA-EMC/EMC_post.git
protocol = git
required = True

[UFS_UTILS]
tag = v1.1.0
tag = ops-gfsv16.0.0
local_path = sorc/ufs_utils.fd
repo_url = https://github.com/NOAA-EMC/UFS_UTILS.git
protocol = git
required = True

[EMC_verif-global]
tag = verif_global_v1.5.0
tag = verif_global_v1.11.0
local_path = sorc/verif-global.fd
repo_url = https://github.com/NOAA-EMC/EMC_verif-global.git
protocol = git
required = True

[EMC_gfs_wafs]
tag = gfs_wafs.v5.0.11
tag = gfs_wafs.v6.0.14
local_path = sorc/gfs_wafs.fd
repo_url = https://github.com/NOAA-EMC/EMC_gfs_wafs.git
protocol = git
Expand Down
2 changes: 1 addition & 1 deletion Externals_coupled.cfg
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[ufs-s2s-model]
tag = ufss2s_cmeps_v0.7
local_path = sorc/fv3_coupled.fd
local_path = sorc/ufs_coupled.fd
repo_url = https://github.com/ufs-community/ufs-s2s-model
protocol = git
required = True
Expand Down
14 changes: 6 additions & 8 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# How to use the unified workflow for the ufs-s2s-model application (work in progress)

Note, currently the wave post does not work. There is work actively ongoing to fix it.
Note, currently the wave gridded post does not work properly. There is work actively ongoing to fix it.
This message will be deleted when the fix for wave post is committed.

## Checkout the source code and scripts
Expand All @@ -10,14 +10,11 @@ cd coupled-workflow
git checkout feature/coupled-crow
git submodule update --init --recursive #Update submodules
cd sorc
sh checkout.sh coupled # Check out the coupled code, EMC_post, gsi, ...
sh checkout.sh -c # Check out forecast model with CCPP=YES/COUPLED=YES
```
## Compile code used in ufs-s2s-model and EMC_post and link fixed files and executable programs:
```
sh build_ncep_post.sh #This command will build ncep_post
sh build_ww3prepost.sh #This command will build ww3 prep and post exes
sh build_fv3_coupled.sh #This command will build ufs-s2s-model
sh build_reg2grb2.sh #This command will build exes for ocean-ice post
sh build_all.sh -c #This command will build only execs for coupled
To link fixed files and executable programs for the coupled application:
On Hera:
Expand Down Expand Up @@ -66,9 +63,10 @@ or
./setup_case.sh -p HERA ../cases/$CASE.yaml test2d
```
where $CASE is one of the following:
- prototype_5: Used for UFS S2S Prototype 5 (Runs 35 day cases with atm-ocn-ice-wav coupling)
- prototype_5: Used for UFS S2S Prototype 5 (Runs 35 day cases with atm-ocn-ice-wav coupling, use with p5 workflow only)
- coupled_free_forecast: 2 day tests for atm-ocn-ice coupling
- coupled_free_forecast_wave: 2 day test for atm-ocn-ice-wav coupling (same as p5 except shorter)
- coupled_free_forecast_wave: 2 day test for atm-ocn-ice-wav coupling (frac grid)
- coupled_free_forecast_nofrac_wave: 2 day test for atm-ocn-ice-wav coupling (non frac grid)
- atm_free_forecast: Run the atm only case with same ICs as coupled tests
Please see the bottom of the README for information about particular versions and ICs

Expand Down
Loading

0 comments on commit ca3052d

Please sign in to comment.