Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

update my fork #1

Merged
merged 94 commits into from
Nov 25, 2020
Merged

update my fork #1

merged 94 commits into from
Nov 25, 2020

Conversation

pjpegion
Copy link
Owner

With ufs-community develop

climbfuji and others added 30 commits November 2, 2019 07:43
…hanges from IPD, bugfixes for both IPD and CCPP GFSv16, #refs 66372, CCPP changes for HAFS physics, 65796, re-enable NEMSfv3gfs on Gaea and Jet, and in addition: add a stub inline post module for systems that do not have EMC post installed, move ccpp directory from top level directory to underneath FV3 (this includes out-of-source build capabilities for ccpp), update submodule pointer to point to head of GFS-FMS branch of FMS, update ESMF to 8.0.0
…anges_from_gmtb_develop_as_of_20191016

Update ufs-weather-model/develop with changes from gmtb/develop as of 2019/10/16
* Squashed commit from JessicaMeixner-NOAA/ww3update branch
* remove fv3_regional_c768 test on cray
* remove jobs with exclusive nodes on hera and jet
* add ww3 files in rt.sh
* add README.md and reset tasks for rt.sh test fv3_gfdlmprad
* comment out rt.sh fv3_wrtGauss_nemsio_c768 as it takes too long to run
* remove weightfiles for comparison in fv3-ww3 tests
* update regression test log files from dell and cray
* update regression log files on hera
* update fv3atm repo to NOAA-EMC
* Enable outputting a grid (regional_latlon, rotated_latlon, or lambert_conformal) larger than the native computation grid for the regional or nested domain/tile.

* Enable writing out the output on the native computation grid directly without any interpolation for the regional or nested domain/tile.

* Also the missing value in physics bundle is changed from real(kind_phys) to real in io/FV3GFS_io.F90 as the file could be compiled in 32bit real or 64bit real.
fv3atm github issue #13:  change ifmin to zero at fh00 for inline post
* add fh00 post control file, add restart output at specified forecast hours, ugwd bug fixes
* update module files to use g2tmpl v1.6.0 and post v8.0.1
* add fh00 post control file in fv3.input for inline post
* update in runduration in atmos
* update RT baseline directory on hera and wcoss
* comment out fv3_wrtGauss_nemsio_c768 on dell
* update grib2 table for g2tmpl 1.6.0
* update post
* comment out print line in FV3
* update FMS to point to tag 2019.01 of NOAA-GFDL
* update stochastic_physics to point to hash 1745422af76d830757cd6035b6ea101e92b4cac1 @pjpegion
* update of path to CCPP physics library for CCPP regression tests
* add -Wall to compiler flags for GNU compilers
* remove warnings for non-existent include directories for GNU compiler
* update of regression testing scripts to detect errors in tests/run_test.sh
* new regression tests fv3_ccpp_gfs_v15p2, fv3_ccpp_gfs_v15p2_debug, fv3_ccpp_gfs_v16beta, fv3_ccpp_gfs_v16beta_debug
* update of rt.conf: remove Cheyenne.intel entries (so that rt.conf is an EMC-maintained regression test configuration; move Cheyenne Intel tests into a separate file that resides in the NCAR dtc/develop branch)
* make compile_cmake.sh work with Cheyenne Intel/GNU, and bugfixes for compile_cmake.sh
* allow environment variable NEMS_MACHINE to overwrite (or set) MACHINE_ID (see #20 for the corresponding PR for the ufs_public_release branch)
* new regression test fv3_ccpp_gsd_sar_25km_debug (but not exercised in default rt.conf)
* updates for jet and gaea (note: only supporting rt.sh, not NEMSCompsetRun)
* Updated fv3atm (see fv3atm PR #48 NOAA-EMC/fv3atm#48)
* Updated WW3
* update parallel netcdf module files on dell

* update fv3 to netcdf_parallel branch

* update module files for hera, dell and conf file for cray

* update post lib in cray module file

* fix netlib on hera

* Update FV3 submodule

* Update baselines to develop-20200202

* Regtest logs on wcoss_dell_p3

* Regtest logs on wcoss_cray

* Regtest logs on hera

* update FV3 to point to NOAA-EMC develop branch

Co-authored-by: Dusan Jovic <48258889+DusanJovic-NOAA@users.noreply.github.com>
* update with new iau_drymassfixer option
* fix syntax error in fv3
* update fv3_iau test case
* revert iau-drymassfixer change in fv3_gfdlmprad_32bit_post
* update ww3 with bug fix for OpenMp b4b
* update fv3 with coupled model dump field changes
* update nemscompset run c768 fv3-ww3 to use threads
* update NEMS to the latest version
* update post lib to 8.0.5
* add 2 way atm-wav test

* update FV3 with gcycle change reverted

* update RTPWD and change the coupling frequency

* update RT baseline directory

* Regression test log files on WCOSS Dell

* Regression test log files on WCOSS Cray

* Regression test log files on Hera

* Update FV3 submodule

Co-authored-by: Jun Wang <junwang-noaa@users.noreply.github.com>
Co-authored-by: Dusan Jovic <dusan.jovic@noaa.gov>
* Update FV3 submodule

* Regression test log files on Hera

* Regression test log files on WCOSS Cray

* Regression test log files on WCOSS Dell

* Update FV3 submodule
* hera.gnu build target with regression test config rt_gnu.conf (same as used on Cheyenne); this initial version uses the UFS public release v1.0.0 NCEPLIBS
* re-enable IPD REPRO, CCPP REPRO, CCPP PROD regression tests; IPD REPRO and CCPP REPRO are bit-for-bit identical
* bugfixes for some CCPP regression tests (IAU dry mass fixer)
* addition of two-way coupled CCPP regression tests, removal of old IPD Thompson test, addition of several debug tests (Thompson non-aero and GSD suite) to cover more physics options in DEBUG mode
* change logic in rt.sh that COMPILE or APPBUILD lines without a machine name are executed on all machines (similar to what is done for the RUN lines)
…physics (#91)

* Update .gitmodules and submodule pointer for fv3atm for code review and testing

* Regression test logs for hera.intel using rt.sh

* Regression test logs for wcoss_dell_p3 using NEMSCompsetRun

* Update submodule pointer for FV3 after renaming S2S suite suite_FV3_GFS_2017_coupled_satmedmf.xml to suite_FV3_GFS_2017_satmedmf_coupled.xml

* Regression test logs for wcoss_dell_p3 using rt.sh; regression test logs for wcoss_cray using rt.sh and NEMSCompsetRun

* Regression test logs for hera.intel using NEMSCompsetRun

* Revert change to .gitmodules and update submodule pointer for fv3atm
Add two options for IN/CCN activation and have total three options now:
* iccn=0 for temperature dependence, iccn=1 for climatological IN/CCN, and iccn=2 for MERRA2aersol
* add the option to enable RRTMg aerosol attenuation to be determined from prescribed MERRA2 climatology
* add aerosol optical depth outputs for total, dust, black carbon, organic carbon, sulfate, and sea salt

Add 4 regression tests:
 1) SAS+GFDL with enabled RRTMg aerosol attenuation from prescribed MERRA2 climatology (fv3_gocart_clm in rt.conf_csaw),
 2) CSAW+MG3 with with enabledRRTMg aerosol attenuation from prescribed MERRA2 climatology (fv3_gfsv16_csawmg  in rt.conf_csaw),
 3) CSAW+MG3 with enabled RRTMg aerosol attenuation from OPAC (fv3_gfsv16_csawmgt in rt.conf_csaw), and
 4) CSAW+MG3 with climatological IN/CCN with enabled RRTMg aerosol attenuation from prescribed MERRA2climatology (fv3_csawmg)
* add s4 rules

* update submodule pointers

* update the branch in gitmodules to point to NEMS::feature/s4

* Update .gitmodules and submodule pointer for ccpp-physics for code review and testing

* Merge NCAR:dtc/develop into ufs-community:develop

- for macOS with LLVM clang, turn off OpenMP (from UFS public release)
- switch to Intel 18 on wcoss_cray
- new regression tests with RRTMGP using current control as basis

Co-authored-by: Rahul Mahajan <rmahajan@s4-submit.ssec.wisc.edu>
Co-authored-by: Rahul Mahajan <aerorahul@users.noreply.github.com>
* Remove CCPP dynamic build from ufs-weather-model
* Remove LD_LIBRARY_PATH entries in regression test setup scripts
* update post lib to 8.0.6
* Add chsp to gfsphysics and ccpp-physics
add global_latlon grid on write grid comp for netcdf output
add landsfcmdl attribute to fv3 sfc history file
update post to post/8.0.6
* Bugfix for Intel 18 on wcoss_cray, remove Intel 16 options for gaea
* add global latlon grid test
* Add regression tests for lheatstrg to IPD REPRO, CCPP REPRO, CCPP PROD; add regression tests for satmedmfvidfq for IPD PROD, IPD REPRO, CCPP REPRO, CCPP PROD; add ecflow config for cheyenne
* add cmeps integration changes

Co-authored-by: Jun Wang <junwang-noaa@users.noreply.github.com>
Co-authored-by: Jongil Han <Jongil.Han@noaa.gov>
Co-authored-by: Jeffrey Whitaker <Jeffrey.S.Whitaker@noaa.gov>
Co-authored-by: Dom Heinzeller <dom.heinzeller@noaa.gov>
Co-authored-by: Dom Heinzeller <climbfuji@ymail.com>
Co-authored-by: Denise Worthen <Denise.Worthen@noaa.gov>
Co-authored-by: Jun Wang <junwang@Orion-login-3.HPC.MsState.Edu>
Updates to cellular automata stochastic physics. Added new regression test. Added possibility to run global and sub-grid CA, updates to coupling to convection.
* Remove unused and unsupported code (See #21)
* Remove APPBUILD step from rt.conf
…c-v4 back to master (#120)

* Bugfixes for CCPP: check for and correct syntax of \htmlinclude lines
* Fix formatting (tabs, whitespaces) in tests/rt.conf
…te regional tests, ... (#126)

* Move ccpp_prebuild from build scripts to CMakeLists.txt
* Add find_package(Python) to CMakeLists.txt
* Update to compile scripts and top-level CMakeLists.txt for not specifying suites for CCPP
* Update of regional tests to reflect changes in suite definition files
* Use cmake 3.16.1 on hera
* Require cmake 3.15 or later in top-level CMakeLists.txt
* Bugfix in tests/fv3_conf/ccpp_regional_run.IN
* Python 3 compatibility for tests/abort_dep_tasks.py

Co-authored-by: Dusan Jovic <dusan.jovic@noaa.gov>
* update orion slurm job card

* udpate orion log files

* update hera log files

Co-authored-by: Jun Wang <junwang-noaa@users.noreply.github.com>
…gi, check for GNU compiler version (#139)

* update stampede config, remove cheyenne.pgi config, bugfixes for Python3 on stampede (from @climbfuji)
* check version of GNU compiler #134 (from @edwardhartnett)
* submit compile jobs with ecflow to batch system instead of running them on frontend nodes (from @DusanJovic-NOAA)

Co-authored-by: Dusan Jovic <dusan.jovic@noaa.gov>
Co-authored-by: Edward Hartnett <Edward.Hartnett@noaa.gov>
aerorahul and others added 28 commits October 20, 2020 12:35
* Option to build coupled model
* fix in build.sh
* update modulefiles for orion, hera and wcoss to load pio.  Make PIO optional in CMakeLists.txt if not building S2S
* FMS needs to be linked in MOM6 objects. Add 32BIT and S2S check
* add S2S option to MAKE_OPT
* Add standard s2s tests
* add CICE_IO option (default: NetCDF). Add MOM6 solo executable option (default: OFF) MOM6 library and NUOPC cap are 2 separate entities.
* add debug flags for MOM6 and CICE from @MinsukJi-NOAA
* add debug modulefiles for hera, orion and wcoss_dell_p3
* enable VERBOSE on build only when requested.  Remove -warn flags from CMEPS and MOM6 as they drown out any error messages.  The warnings should be resolved at the upstream repos.  When building with -DDEBUG=ON, set CMAKE_BUILD_TYPE=Debug.

Co-authored-by: Dusan Jovic <dusan.jovic@noaa.gov>
add RT_suffix for warm start dependencies
add nsout as a variable in model_configure
white space
Fixes CA test for coupled model
Uses RESTART_N for the coupled model
Removes CNTLMED from tests since weather RT does not use it
links parm/fd_nems.yaml from CMEPS/mediator
* add DATM submodule
* point to aerorahul fork of DATM
* update CMakeList.txt to build data atmosphere.  Add compile test only since there are currently no regression tests for data atmosphere
* update README.md
* missed rsync from develop
* Update README.md
* update DATM submodule pointer and point to NOAA-EMC/NEMSdatm
* create MOM6 solo executable for use in SOCA science
* add compilation tests for s2s and datm for hera.gnu
* commit wcoss_cray RT log, hera.intel RT log
* rsync S2S baselines for intel only on hera and orion
* add orion.intel RT log
* add hera.gnu RT log
* add wcoss_dell_p3 RT log
Replaces current coupled tests, default vars and other files to implement low resolution tests from ufs-s2s-model in the unified repository.

See ufs-s2s-model PR # 204 (ufs-community/ufs-s2s-model#204) and PR # 194 (ufs-community/ufs-s2s-model#194) for more detail.
* Added the following files for datm-mom6-cice6 tests:
fv3_conf/cpld_datm_cfsr.IN
fv3_conf/cpld_datm_gefs.IN
parm/datm_configure.IN
parm/datm_data_table.IN
parm/input.mom6.nml.IN
parm/nems.configure.datm.IN
tests/datm_ocn_ice_mx025_cfsr
tests/datm_ocn_ice_mx025_gefs
tests/datm_ocn_ice_mx100_cfsr
tests/datm_ocn_ice_mx100_gefs
Revised default_vars.sh and run_test.sh.
* Removed blank space in some coupled test files.
* Revised scripts.
* Revised test description.
* Revised scripts and added log file from Hera.
* Added log file from Orion.
* update FV3 and NEMS with regional parellel netcdf and output restart/forecast time at non-integer forecast time
* add fv3_ccpp_regional_quilt_netcdf_parallel test
* comment out fv3_ccpp_regional_quilt_netcdf_parallel as it needs nccmp (in PR#261)
* update to nems develop branch
* update orion log files
* update cray and hera RT log files; skip-ci
* update dell log files
* point fv3 and nems back to develop branch
Co-authored-by: Jun Wang <junwang-noaa@users.noreply.github.com>
This PR adds missing HWRF physics parameterizations and updates the Ferrier-Aligo microphysics:
- WRFv4 Noah LSM
- GFDL surface layer
- Unified HEDMF PBL
- icloud=4 option in RRTMG

In addition, this PR:
- cleans up old/unused/unnecessary HWRF regression tests
- adds the missing `effr_in=.true.` for all Thompson MP based runs (there is now a guard in fv3atm's `GFS_typedefs.F90` to prevent running Thompson MP with `effr_in=.false.`
- shortens the runtime for the `fv3_ccpp_rrfs_v1beta` run from 48h to 24h
- in ccpp-physics: update `tsfc` correctly when there is ice on open water grid points (fixes NCAR/ccpp-physics#515)
- set `OMP_STACKSIZE` in orion and wcoss_dell_p3 job submission scripts to avoid errors with threaded tests

Co-authored-by: Bin Liu <bin.liu@noaa.gov>
Co-authored-by: Jili Dong <Jili.Dong@noaa.gov>
Co-authored-by: Zhan Zhang <zhan.zhang@noaa.gov>
Co-authored-by: Grant Firl <grantf@ucar.edu>
Co-authored-by: Man.Zhang <Man.Zhang@noaa.gov>
Co-authored-by: Dom Heinzeller <dom.heinzeller@noaa.gov>
…led model (#254)

* Implements a bugfix for the mapping of ifrac for both nems_orig and nems_frac in CMEPS: issue (#17)[NOAA-EMC/CMEPS#17]
* Adds field-packing for performance improvements in CMEPS: issue (#23)[NOAA-EMC/CMEPS#23]
* Uses module file fv3_debug when DEBUG=Y is specified and fv3_debug is available
* Shortens the nems.configure file name used with the coupled model
…GP. (#262)

* Changes to regression test files for recent changes to RRTMG and RRTMGP.
* Removed redundant importing of kind_phys in physics
* add units to index_for_diagnostic_printout metadata
* Replace iovr_{lw,sw} with iovr for HWRF regression tests
* Bugfix in GP sampling routines.
* Increase number of nodes for test fv3_ccpp_gocart_clm on Cheyenne

Co-authored-by: Dom Heinzeller <climbfuji@ymail.com>
* bring GFS.v16 code changes back to develop branch
* update upp lib in hera module
* use test hpc stack lib
* update upp lib in fv3 for cmake
* update post control files
* update upp lib in hpcstack on hera, orion and dell and in nceplibs on cray
* add change in fv3 dycore #35
* remove duplicate read_data in fms_mod in external_ic.F90
Co-authored-by: Jun Wang <junwang-noaa@users.noreply.github.com>
Co-authored-by: Dom Heinzeller <climbfuji@ymail.com>
* If ufs.cpld.cpl.r.* files do not reproduce, try nccmp
* Modify/add to run cpld 35d bmark tests
* Fix nccmp implementation. Fix a bug for 35d tests
* Use env var NCCMP
* Add hera.intel to rt_35 and rt_wave_35d
* Use which to find nccmp path. Apply nccmp to all files that fail cmp. Fix a bug in fv3_ccpp_wrtGauss_netcdf_parallel
* Change compare method from nccmp to compare_ncfile.py
* Netcdf compare changes on Hera; skip-ci
* Netcdf compare changes on WCOSS Dell P3; skip-ci
* Modify comopare_ncfile.py
* Netcdf compare changes on wcoss cray
* Implement Dusan's ecflow fix #273
* Move miniconda3 to emc.nemspara on Hera and Orion. Minor change in default_vars.sh
* sync fv3 feature branch
* Regression test passed on Hera and Orion, WCOSS_dell, WCOSS_cray, Hera_gnu
* Update for FV3 to point to the develop branch
…, updates to other GSL physics (#297)

- add unified gravity wave drag (called unified ugwp) that combines the UGWP v1 with the GSL drag suite
- replace high-resolution SAR (standalone regional) regression test with 25km SAR regression test
- update submodule pointer for fv3atm for the changes described in the associated PRs listed below
- add `rt_ccpp_dev.conf` that contains the developmental CCPP tests used by GSL and DTC (so that folks are aware of what is tested and how by DTC and GSL, in addition to what is in `rt.conf` and `rt_gnu.conf`)
- turn on calls to `gcycle`/`sfcsub` for RUC LSM
- regression test configuration scripts for MYNN surface layer
- add `fv3_debug` modules for cheyenne.intel and cheyenne.gnu (per request from @DeniseWorthen)
- bugfix in `rt.sh` to copy two missing input directories `fv3_regional_quilt_netcdf_parallel` and `fv3_stretched_nest_debug` when creating new baselines using `rt.sh -c`
- enable regression testing on Gaea with Intel using the current hpc-stack-nco installation, can now use ecflow
- update of CI tests and small bugfix when comparing results using `tests/compare_ncfile.py` from @MinsukJi-NOAA (see #299 for details) - note, the update to `tests/compare_ncfile.py` had to be reverted

Co-authored-by: DomHeinzeller <58610420+DomHeinzeller@users.noreply.github.com>
Co-authored-by: samuel.trahan <Samuel.Trahan@noaa.gov>
Co-authored-by: hannah barnes <hannah.barnes@noaa.gov>
Co-authored-by: Michael Toy <michael.toy@noaa.gov>
Co-authored-by: Samuel Trahan (NOAA contractor) <39415369+SamuelTrahanNOAA@users.noreply.github.com>
Co-authored-by: MinsukJi-NOAA <minsuk.ji@noaa.gov>
@pjpegion pjpegion merged commit a1a8ac1 into pjpegion:develop Nov 25, 2020
pjpegion pushed a commit that referenced this pull request Jun 22, 2021
…y#524)

* point to Jun fv3atm personal fork
* add CDEPS submodule
* add building instructions
* fix issues that came from building
* builds CDEPS targets
* missed w3nco dep
* cleanup use of FoX and remove redundant library links in components
* Add 3 files generated by genf90.pl to the CDEPS-interface/ufs directory. (#1)
* remove dependency on genf90.pl for CDEPS/share
* remove FoX (#2)
remove FoX dependency building and use ESMF Config instead.
Co-authored-by: Jun Wang <junwang-noaa@users.noreply.github.com>
Co-authored-by: BinLi-NOAA <bin.li@noaa.gov>
Co-authored-by: Brian Curtis <brian.curtis@noaa.gov>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.