Skip to content

Merge ufs-release/public-v1 into dev/emc#59

Merged
bensonr merged 8 commits into
NOAA-GFDL:dev/emcfrom
laurenchilutti:dev/emc
Oct 15, 2020
Merged

Merge ufs-release/public-v1 into dev/emc#59
bensonr merged 8 commits into
NOAA-GFDL:dev/emcfrom
laurenchilutti:dev/emc

Conversation

@laurenchilutti
Copy link
Copy Markdown
Member

Merging ufs-release/public-v1 into dev/emc. Modified some of the doxygen documentation to resolve merge conflicts:

  • Created a section A1.10 for Limited Area Model parameters that used to be in dev/emc branch section A.11
  • Replaced section A.6 (nest_nml) from ufs-release/public-v1 branch with the contents of section A.7 (fv_nest_nml) from dev/emc branch
  • Renumbered sections as appropriate

@bensonr bensonr self-requested a review October 15, 2020 15:18
Comment thread docs/Doxyfile Outdated
@bensonr bensonr merged commit 3685c38 into NOAA-GFDL:dev/emc Oct 15, 2020
binli2337 added a commit to binli2337/GFDL_atmos_cubed_sphere that referenced this pull request Nov 12, 2021
* update tools/fv_nudge.F90
* modify the following files to use 'constantsR4_mod' module:
driver/fvGFS/atmosphere.F90
driver/fvGFS/fv_nggps_diag.F90
model/fv_dynamics.F90
model/fv_nesting.F90
model/fv_update_phys.F90
model/nh_core.F90
model/nh_utils.F90
tools/coarse_grained_diagnostics.F90
tools/external_ic.F90
tools/fv_diagnostics.F90
tools/fv_nudge.F90
tools/fv_restart.F90
tools/test_cases.F90

* update external_ic.F90 and fv_nudge.F90
laurenchilutti pushed a commit to laurenchilutti/GFDL_atmos_cubed_sphere that referenced this pull request Jan 14, 2022
* update tools/fv_nudge.F90
* modify the following files to use 'constantsR4_mod' module:
driver/fvGFS/atmosphere.F90
driver/fvGFS/fv_nggps_diag.F90
model/fv_dynamics.F90
model/fv_nesting.F90
model/fv_update_phys.F90
model/nh_core.F90
model/nh_utils.F90
tools/coarse_grained_diagnostics.F90
tools/external_ic.F90
tools/fv_diagnostics.F90
tools/fv_nudge.F90
tools/fv_restart.F90
tools/test_cases.F90

* update external_ic.F90 and fv_nudge.F90
laurenchilutti pushed a commit to laurenchilutti/GFDL_atmos_cubed_sphere that referenced this pull request Jan 20, 2022
* update tools/fv_nudge.F90
* modify the following files to use 'constantsR4_mod' module:
driver/fvGFS/atmosphere.F90
driver/fvGFS/fv_nggps_diag.F90
model/fv_dynamics.F90
model/fv_nesting.F90
model/fv_update_phys.F90
model/nh_core.F90
model/nh_utils.F90
tools/coarse_grained_diagnostics.F90
tools/external_ic.F90
tools/fv_diagnostics.F90
tools/fv_nudge.F90
tools/fv_restart.F90
tools/test_cases.F90

* update external_ic.F90 and fv_nudge.F90
laurenchilutti added a commit to laurenchilutti/GFDL_atmos_cubed_sphere that referenced this pull request Feb 18, 2022
laurenchilutti added a commit that referenced this pull request Feb 18, 2022
* Revert "revise external_ic.F90 and fv_nudge.F90 (#68)"

This reverts commit 32b44d9.

* Revert "fixing call to pmaxmin to no longer get a compilation error when compiling with GNU."

This reverts commit 2aa049c.

* Revert "Update external_ic.F90 and fv_nudge.F90 to use allocatable arrays (#65)"

This reverts commit 44211c0.

* Revert "update external_ic.F90 and fv_nudge.F90 (#63)"

This reverts commit 81b9be0.

* Revert "Fix OVERLOAD_R4 ifdef block as suggested by @junwang-noaa (#60)"

This reverts commit 63a4603.

* Revert "Update code to use 'constantsR4_mod' module (#59)"

This reverts commit 7b8ee4c.
bensonr pushed a commit that referenced this pull request Dec 12, 2022
* Update code to use 'constantsR4_mod' module (#59)

* update tools/fv_nudge.F90
* modify the following files to use 'constantsR4_mod' module:
driver/fvGFS/atmosphere.F90
driver/fvGFS/fv_nggps_diag.F90
model/fv_dynamics.F90
model/fv_nesting.F90
model/fv_update_phys.F90
model/nh_core.F90
model/nh_utils.F90
tools/coarse_grained_diagnostics.F90
tools/external_ic.F90
tools/fv_diagnostics.F90
tools/fv_nudge.F90
tools/fv_restart.F90
tools/test_cases.F90

* revise external_ic.F90 and fv_nudge.F90 to use allocatable arrays
climbfuji pushed a commit to climbfuji/GFDL_atmos_cubed_sphere that referenced this pull request Apr 24, 2024
GitFlow: Merge geos/develop into geos/main
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.

2 participants