Skip to content

Commit ef684ba

Browse files
committed
Merge branch 'release-v5.0'
This merge introduces v5.0 of all MPAS models. * release-v5.0: (964 commits) Fix issue with 'dzs' when running r8 model with r4 initial conditions This merge fixes a restartability error in the new Tiedtke scheme. Avoid bit-reproducibility errors in GWDO scheme due to 'kpblmin' and 'kpblmax' computation Fix incorrect assignment of 'xlamdd', 'frh', and 'mentrd_rate' in Grell-Freitas scheme * In ./src/core_atmosphere/Registry.xml, corrected typo (description instead of decription) in the definition of the variable nr. * In ./src/core_atmosphere/physics/mpas_atmphys_control.F, modified inquiring about the Thompson microphysics tables in the subroutine physics_table_init. The modified logic now allows the different tables to be read for each MPI task. * In ./src/core_atmosphere/physics/physics_wrf/module_mp_thompson.F, in subroutine mp_gt_driver, moved the initialization of variables Nt_c and mu_c before initialization of local mixing ratios and number concentrations. This change allows a proper initialization of the local variable nc when is_aerosol_aware is false. Add exit messages at the end of core_finalize routines Update "possible_values" for physics schemes * In ./src/core_atmosphere/physics/mpas_atmphys_control.F, modified checking the config_gwdo_scheme option to allow bl_ysu_gwdo to be run when the MYNN pbl and surface layer options are chosen. Fix bug in storage and application of IAU tendency contributions Update to physics suites: New Tiedtke and YSU GWDO Change suite name 'convection_scale_aware' to 'convection_permitting' Simplify IAU calls from atm_srk3( ) Rename 'zz_rtheta_pp_old' to 'rtheta_pp_old' Fix bug in location of call to get IAU tendency contributions Remove unused variable 'rtheta_pp_old' from atmosphere Registry.xml file Final corrections to namelist and variable attributes for MPAS-Atmosphere v5.0 Initialize t_oml_200m_initial field when climatological OML depth is used Add lower bound of 1.0e-8 to vapor pressure in dewpoint calculation ...
2 parents 8586b9d + 5320e9c commit ef684ba

284 files changed

Lines changed: 79743 additions & 25354 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.github/ISSUE_TEMPLATE.md

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
The title above should be a 1 line short summary of the issue.
2+
3+
Enter a description of the issue.
4+
This should include what the symptoms are, and steps to reproduce.
5+
6+
Additionally please enter this information if applicable:
7+
- Compiler and version
8+
- MPI implementation and version
9+
- NetCDF version
10+
- Parallel NetCDF version
11+
- Parallel IO version
12+
- Output of `uname -a`
13+
- The make line used to build the executable
14+
- The line used to run the executable
15+
- Test case used

.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
The title above should be a 1 line short summary of the pull request (i.e. what the project the PR represents is intended to do).
2+
3+
Enter a description of this PR. This should include why this PR was created, and what it does.
4+
5+
Testing and relations to other Pull Requests should be added as subsequent comments.
6+
7+
See the below examples for more information.
8+
https://github.com/MPAS-Dev/MPAS/pull/930
9+
https://github.com/MPAS-Dev/MPAS/pull/931
10+

.gitignore

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,17 +18,22 @@ src/operators/*.f90
1818

1919
# Executables
2020
*_model
21+
build_tables
2122

2223
# NetCDF Files
2324
*.nc
2425

26+
# Restart timestamp file
27+
restart_timestamp
28+
2529
# Graph files and partition files
2630
*.info
2731
*.info.part.*
2832

29-
# Error and Output log files
33+
# Error, Output, and Abort log files
3034
*.out
3135
*.err
36+
*.abort
3237

3338
# Text files (For statistical output from ocean model)
3439
*.txt

INSTALL

Lines changed: 59 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,59 @@
1+
Installing MPAS
2+
====
3+
4+
For general information on how to install MPAS, see https://mpas-dev.github.io.
5+
Additional notes on building MPAS on specific architectures are summarized here.
6+
7+
8+
gfortran-clang: Compiling MPAS on MacOSX (10.11 El Capitan - 10.12 Sierra)
9+
----------
10+
MPAS should compile out of the box on MacOSX with the standard (OS) clang compiler
11+
and the gfortran compiler. The gfortran compiler can be installed using homebrew
12+
(http://brew.sh), or using pre-compiled binaries from the MacOSX HPC website
13+
(http://hpc.soureforge.net), or it can be compiled by the user from the GNU sources.
14+
15+
The standard clang compiler does not support OpenMP. Users wanting to compile MPAS
16+
with OpenMP support on MacOSX will have to install the LLVM clang compiler, which is
17+
accomplished easiest with homebrew. Since this alternative clang compiler is not in
18+
the standard search/library path, the user will have to modify the call to the clang
19+
and clang++ executable and add the library path to the compiler flags. Example:
20+
21+
...
22+
"FC_PARALLEL = mpif90" \
23+
"CC_PARALLEL = mpicc -cc=clang" \
24+
"CXX_PARALLEL = mpicxx -cxx=clang++" \
25+
"FC_SERIAL = gfortran" \
26+
"CC_SERIAL = clang" \
27+
"CXX_SERIAL = clang++" \
28+
"FFLAGS_PROMOTION = -fdefault-real-8 -fdefault-double-8" \
29+
"FFLAGS_OPT = -O3 -m64 -ffree-line-length-none -fconvert=big-endian -ffree-form" \
30+
"CFLAGS_OPT = -O3 -m64" \
31+
"CXXFLAGS_OPT = -O3 -m64" \
32+
"LDFLAGS_OPT = -O3 -m64" \
33+
"FFLAGS_DEBUG = -g -m64 -ffree-line-length-none -fconvert=big-endian -ffree-form -fbounds-check -fbacktrace -ffpe-trap=invalid,zero,overflow" \
34+
"CFLAGS_DEBUG = -g -m64" \
35+
"CXXFLAGS_DEBUG = -O3 -m64" \
36+
"LDFLAGS_DEBUG = -g -m64" \
37+
...
38+
39+
would become
40+
41+
...
42+
"FC_PARALLEL = mpif90" \
43+
"CC_PARALLEL = mpicc -cc=/usr/local/opt/llvm/bin/clang" \
44+
"CXX_PARALLEL = mpicxx -cxx=/usr/local/opt/llvm/bin/clang++" \
45+
"FC_SERIAL = gfortran" \
46+
"CC_SERIAL = /usr/local/opt/llvm/bin/clang" \
47+
"CXX_SERIAL = /usr/local/opt/llvm/bin/clang++" \
48+
"FFLAGS_PROMOTION = -fdefault-real-8 -fdefault-double-8" \
49+
"FFLAGS_OPT = -O3 -m64 -ffree-line-length-none -fconvert=big-endian -ffree-form -L/usr/local/opt/llvm/lib" \
50+
"CFLAGS_OPT = -O3 -m64 -L/usr/local/opt/llvm/lib" \
51+
"CXXFLAGS_OPT = -O3 -m64 -L/usr/local/opt/llvm/lib" \
52+
"LDFLAGS_OPT = -O3 -m64 -L/usr/local/opt/llvm/lib" \
53+
"FFLAGS_DEBUG = -g -m64 -L/usr/local/opt/llvm/lib -ffree-line-length-none -fconvert=big-endian -ffree-form -fbounds-check -fbacktrace -ffpe-trap=invalid,zero,overflow" \
54+
"CFLAGS_DEBUG = -g -m64 -L/usr/local/opt/llvm/lib" \
55+
"CXXFLAGS_DEBUG = -O3 -m64 -L/usr/local/opt/llvm/lib" \
56+
"LDFLAGS_DEBUG = -g -m64 -L/usr/local/opt/llvm/lib" \
57+
...
58+
59+
assuming that the LLVM clang compiler is installed in /usr/local/opt/llvm.

0 commit comments

Comments
 (0)