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

merge of master into dev/emc #128

Merged
merged 71 commits into from
Aug 27, 2021
Merged
Show file tree
Hide file tree
Changes from 67 commits
Commits
Show all changes
71 commits
Select commit Hold shift + click to select a range
ca1066f
Removing use of mpp_io_mod and fms_io_mod from the dycore code. Repl…
laurenchilutti Mar 5, 2021
c4d0928
Adding a call to set_filename_appendix so that nest is added to file…
laurenchilutti Mar 10, 2021
1485f91
remove trailiing spaces
bensonr Mar 29, 2021
6775670
Merge pull request #89 from bensonr/master
laurenchilutti Mar 30, 2021
3b104ca
fixes missing argument in store_data for case where GFS_PHYS macro no…
bensonr Mar 31, 2021
0adbf6f
Merge pull request #90 from bensonr/fv_nggps_fix
bensonr Apr 1, 2021
0c3a1ba
add in test for do_cube_transform in fv_grid_tool::init_grid
bensonr Apr 2, 2021
5211985
Merge pull request #91 from bensonr/cube_xform_fix
laurenchilutti Apr 5, 2021
84fb058
fixes bug in regional bc time calculation in fv_tracer2d.F90
bensonr Apr 5, 2021
1b52517
Merge pull request #92 from bensonr/regional_time_fix
laurenchilutti Apr 5, 2021
fe683c8
Updating dimension string arrays to address GNU compilation errors.
laurenchilutti Apr 21, 2021
fb96053
Merge branch 'master' into fms2_io_implementation
laurenchilutti Apr 21, 2021
04a6d6e
prepending INPUT/ to hrr_ctrl.nc and gfs_ctrl.nc in external_ic
laurenchilutti Apr 29, 2021
9fe919e
removing use fms_io_mod, only: write_version_number and keeping only …
laurenchilutti Apr 30, 2021
bbf67cd
Merge pull request #98 from laurenchilutti/user/lec/fms202102beta1
bensonr Apr 30, 2021
22fa998
Merge branch 'master' into fms2_io_implementation
laurenchilutti May 3, 2021
9746100
Adding pelist argument to some open_file calls, correcting some typos…
laurenchilutti May 4, 2021
35ee073
correcting minor typo and using fv_io_register_axis rather than regis…
laurenchilutti May 7, 2021
5d8ef5e
Merge pull request #74 from laurenchilutti/fms2_io_implementation
laurenchilutti May 10, 2021
0f2c753
Adding Issue Templates
laurenchilutti Jun 1, 2021
80903f7
Merge pull request #105 from laurenchilutti/master
laurenchilutti Jun 3, 2021
a3f8a89
Adding Code Style guide to the repository.
laurenchilutti Jun 3, 2021
9124fb7
Updating driver/GFDL/atmosphere.F90 to match what was in dev/GFDL aft…
laurenchilutti Jun 9, 2021
1834cfb
fixes to driver/GFDL/atmosphere.F90
bensonr Jun 3, 2021
cc137d1
fix a few duplicate module uses and add back in a missing timer calip…
bensonr Jun 4, 2021
1d8a0d9
fixes typos in nudging codes
bensonr Jun 3, 2021
c32facc
Merge pull request #108 from laurenchilutti/test_master
laurenchilutti Jun 10, 2021
91c8823
FV3 Documentation
lharris4 Jun 14, 2021
7685bbc
Merge pull request #109 from lharris4/master
laurenchilutti Jun 15, 2021
e22d8cc
Revision 1.0a
lharris4 Jun 16, 2021
b656fef
Merge pull request #110 from lharris4/master
laurenchilutti Jun 16, 2021
4425e00
Merge branch 'NOAA-GFDL:master' into master
laurenchilutti Jun 17, 2021
0cb7797
typo fix in fv_io.F90
laurenchilutti Jun 17, 2021
1684458
Documentation and defaults changes
lharris4 Jun 17, 2021
d417c1a
Merge pull request #106 from laurenchilutti/master
laurenchilutti Jun 17, 2021
33f0f90
Merge pull request #111 from laurenchilutti/user/lec/fms2io_fixes
laurenchilutti Jun 17, 2021
46fa031
Delete fv3_technical.tex
lharris4 Jun 17, 2021
4b1a00e
Delete fv3_technical.pdf
lharris4 Jun 17, 2021
c77dca0
Add files via upload
lharris4 Jun 17, 2021
b8599fe
Merge pull request #112 from lharris4/master
bensonr Jun 17, 2021
2f53d89
Initialize {sw,se,nw,ne}_corner to .false in model/fv_arrays.F90
DusanJovic-NOAA Jun 11, 2021
77e92f6
merge of latest dev work from GFDL Weather and Climate Dynamics Divis…
bensonr Jul 8, 2021
cdd9d99
Update README.md
bensonr Jul 8, 2021
4ba0e63
read ak/bk from user specified files (#115)
JiliDong-NOAA Jul 13, 2021
ae14c6e
update correct release name in README.md
bensonr Jul 13, 2021
ef5028f
FV3 Example Notebooks and cleanup of docs directory (#117)
lharris4 Jul 21, 2021
3e70328
removed module use of INPUT_STR_LENGTH in fv_control.F90 (#122)
bensonr Aug 3, 2021
0b2491a
updates logic for file read of eta levels (#124)
bensonr Aug 4, 2021
bfe7847
merge of minor updates from GFDL Weather and Climate Dynamics Divisio…
bensonr Aug 4, 2021
c7fb069
Merge branch 'master' into master2emc for eventual merge with 'dev/emc'
bensonr Aug 5, 2021
3f69c53
removed extra nrows_blend from merge
bensonr Aug 6, 2021
112feb9
removed module use error
bensonr Aug 6, 2021
d09aa09
remove double definition
bensonr Aug 6, 2021
fc31bd8
add missing variable declaration
bensonr Aug 6, 2021
97ff88f
fixed error message
bensonr Aug 6, 2021
562eba3
add missing endif
bensonr Aug 6, 2021
2417bf1
remove unnecessary argument
bensonr Aug 6, 2021
d440d46
remove unneeded argument
bensonr Aug 6, 2021
3934d6a
remove unneeded argument
bensonr Aug 6, 2021
2fa1c51
remove calls to undefined reference
bensonr Aug 6, 2021
2cfb121
remove obsoleted function
bensonr Aug 6, 2021
a6b2f07
final?? fixes to tools/external_ic.F90
bensonr Aug 7, 2021
5747ae9
revert changes to external_ic used to recover baselines
bensonr Aug 11, 2021
0f9f812
revert changes in fv_regional_bc.F90 needed to reproduce baselines
bensonr Aug 11, 2021
c9d3b1e
removed outdated documentation information
bensonr Aug 11, 2021
e1bb4af
removed redundant doxygen as it is all in fv_arrays
bensonr Aug 11, 2021
7b16d74
change plus to minus in external_ic.F90
bensonr Aug 11, 2021
ed0bcfc
fix final typo in external_ic.F90
bensonr Aug 11, 2021
d59800b
remove empty if-test for renormalization
bensonr Aug 12, 2021
88681bc
Merge branch 'master' into master2emc
bensonr Aug 12, 2021
b9ef6a7
Merge remote-tracking branch 'origin/dev/emc' into master2emc
bensonr Aug 18, 2021
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 27 additions & 0 deletions .github/ISSUE_TEMPLATE/bug_report.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
---
name: Bug Report
about: Create a bug report to help us improve
title: ''
labels: Bug
---

**Describe the bug**
A clear and concise description of what the bug is

**To Reproduce**
Steps to reproduce the behavior

**Expected behavior**
A clear and concise description of what you expected to happen.

**System Environment**
Describe the system environment, include:
- OS: [e.g. RHEL 7.2]
- Compiler(s): Type and version [e.g. Intel 19.1]
- MPI type, and version (e.g. MPICH, Cray MPI, openMPI)
- netCDF Version: For both C and Fortran
- Configure options: Any additional flags, or macros passed to configure

**Additional context**
Add any other context about the problem. If applicable, include where any files
that help describe, or reproduce the problem exist.
19 changes: 19 additions & 0 deletions .github/ISSUE_TEMPLATE/feature_request.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
---
name: Feature request
about: Suggest an idea for this project
title: ''
labels: 'enhancement'
assignees: ''
---

**Is your feature request related to a problem? Please describe.**
A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]

**Describe the solution you'd like**
A clear and concise description of what you want to happen.

**Describe alternatives you've considered**
A clear and concise description of any alternative solutions or features you've considered.

**Additional context**
Add any other context or screenshots about the feature request here.
14 changes: 14 additions & 0 deletions .github/ISSUE_TEMPLATE/support_request.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
---
name: Support request
about: Request for help
title: ''
labels: 'question'
assignees: ''
---

**Is your question related to a problem? Please describe.**
A clear and concise description of what the problem is.

**Describe what you have tried**
A clear and concise description of what steps you have taken. Include command
lines, and any messages from the command.
127 changes: 127 additions & 0 deletions CODE_STYLE.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,127 @@
# Coding Style

## General

* Trim all trailing whitespace from every line (some editors can do this
automatically).
* No tab characters.
* A copy of the FV3 Gnu Lesser General Public License Header
must be included at the top of each file.
* Supply an author block for each file with a description of the file and the author(s)
name or GitHub ID.
* Documentation may be written so that it can be parsed by [Doxygen](http://www.doxygen.nl/).
* All variables should be defined, and include units. Unit-less variables should be marked `unitless`
* Provide detailed descriptions of modules, interfaces, functions, and subroutines
* Define all function/subroutine arguments, and function results (see below)
* Follow coding style of the current file, as much as possible.

## Fortran

### General

* Use Fortran 95 standard or newer
* Two space indentation
* Never use implicit variables (i.e., always specify `IMPLICIT NONE`)
* Lines must be <= 120 characters long (including comments)
* logical, compound logical, and relational if statements may be one line,
using “&” for line continuation if necessary:
```Fortran
if(file_exists(fileName)) call open_file(fileObj,fileName, is_restart=.false)
```
* Avoid the use of `GOTO` statements
* Avoid the use of Fortran reserved words as variables (e.g. `DATA`, `NAME`)
* `COMMON` blocks should never be used

### Derived types

* Type names must be in CapitalWord format.
* Description on the line before the type definition.
* Inline doxygen descriptions for all member variables.

## Functions
* Functions should include a result variable on its own line, that does not have
a specific intent.
* Inline descriptions for all arguments, except the result variable.
* Description on the line(s) before the function definition. Specify what the function is returning (with the `@return` doxygen keyword if using doxygen).

## Blocks
* terminate `do` loops with `enddo`
* terminate block `if`, `then` statements with `endif`

## OpenMP

* All openMP directives should specify default(none), and then explicitly list
all shared and private variables.
* All critical sections must have a unique name.

## Fortran Example

```Fortran

!***********************************************************************
!* GNU Lesser General Public License
!*
!* This file is part of the FV3 dynamical core.
!*
!* The FV3 dynamical core is free software: you can redistribute it
!* and/or modify it under the terms of the
!* GNU Lesser General Public License as published by the
!* Free Software Foundation, either version 3 of the License, or
!* (at your option) any later version.
!*
!* The FV3 dynamical core is distributed in the hope that it will be
!* useful, but WITHOUT ANYWARRANTY; without even the implied warranty
!* of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
!* See the GNU General Public License for more details.
!*
!* You should have received a copy of the GNU Lesser General Public
!* License along with the FV3 dynamical core.
!* If not, see <http://www.gnu.org/licenses/>.

!***********************************************************************

!> @file
!! @brief Example code
!! @author <developer>
!! @email <email>

module example_mod
use util_mod, only: util_func1
implicit none
private

public :: sub1
public :: func1

!> @brief Doxygen description of type.
type,public :: CustomType
integer(kind=<KIND>) :: a_var !< Inline doxygen description.
real(kind=<KIND>),dimension(:),allocatable :: b_arr !< long description
!! continued on
!! multiple lines.
endtype CustomType

contains

!> @brief Doxygen description.
subroutine sub1(arg1, &
& arg2, &
& arg3)
real(kind=<KIND>),intent(in) :: arg1 !< Inline doxygen description.
integer(kind=<KIND>),intent(inout) :: arg2 !< Inline doxygen description.
character(len=*),intent(inout) :: arg3 !< Long inline doxygen
!! description.
end subroutine sub1

!> @brief Doxygen description
!! @return Function return value.
function func1(arg1, &
& arg2) &
& result(res)
integer(kind=<KIND>),intent(in) :: arg1 !< Inline doxygen description
integer(kind=<KIND>),intent(in) :: arg2 !< Inline doxygen description
integer(kind=<KIND>) :: res
end function func1

end module example_mod
```
16 changes: 12 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,22 @@

This is for the FV3 dynamical core and the GFDL Microphysics for use by NCEP/EMC within GFS.
The source in this branch reflects the codebase used by NCEP/EMC for use in GFS and UFS.

# Where to find information

Visit the [FV3 website](https://www.gfdl.noaa.gov/fv3/) for more information. Reference material is available at [FV3 documentation and references](https://www.gfdl.noaa.gov/fv3/fv3-documentation-and-references/).
Visit the [FV3 website](https://www.gfdl.noaa.gov/fv3/) for more information. Reference material is available at [FV3 documentation and references](https://www.gfdl.noaa.gov/fv3/fv3-documentation-and-references/).

# Proper usage attribution

Cite Putman and Lin (2007) and Harris and Lin (2013) when describing a model using the FV3 dynamical core.
Cite Chen et al (2013) and Zhou et al (2019) when using the GFDL Microphysics.
Cite _Putman and Lin (2007)_ and _Harris and Lin (2013)_ when describing a model using the FV3 dynamical core.

Cite _Chen et al (2013)_ and _Zhou et al (2019)_ when using the GFDL Microphysics.

# Documentation

The up-to-date FV3 Scientific reference guide is included in LaTex and PDF formats in the ```docs/``` directory. There are also some notebooks in docs/examples demonstrating basic FV3 capabilities and analysis techniques.

A [DOI referenceable version](https://doi.org/10.25923/6nhs-5897) is available in the [_NOAA Institutional Repository_](https://repository.library.noaa.gov/view/noaa/30725)

# What files are what

Expand All @@ -22,7 +30,7 @@ The top level directory structure groups source code and input files as follow:
| ```model/``` | contains the source code for core of the FV3 dyanmical core |
| ```driver/``` | contains drivers used by different models/modeling systems |
| ```tools/``` | contains source code of tools used within the core |
| ```docs/``` | contains documentation for the FV3 dynamical core |
| ```docs/``` | contains documentation for the FV3 dynamical core, and Python notebooks demonstrating basic capabilities. |

# Disclaimer

Expand Down
19 changes: 0 additions & 19 deletions docs/AdvectionOperators.md

This file was deleted.

Loading