Skip to content

Commit

Permalink
Remove redundant namelist error code variables
Browse files Browse the repository at this point in the history
Updated README
  • Loading branch information
aidanheerdegen committed Dec 14, 2021
1 parent 8dac8c6 commit 3bd2480
Show file tree
Hide file tree
Showing 6 changed files with 25 additions and 209 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/CI.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,4 +43,4 @@ jobs:
- name: Compile
run: |
cmake -S . -B build/Debug -D CMAKE_BUILD_TYPE=Debug
cd build/Debug && make -j
cd build/Debug && make -j
2 changes: 0 additions & 2 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -63,8 +63,6 @@ else ()
message ("Unknown C compiler default flags only...")
endif()

find_package(NetCDF)

string(TOUPPER ${CMAKE_BUILD_TYPE} BUILD_TYPE)
message("Using Fortran flags: ${CMAKE_Fortran_FLAGS} ${CMAKE_Fortran_FLAGS_${BUILD_TYPE}}")
message("Using C flags: ${CMAKE_C_FLAGS} ${CMAKE_C_FLAGS_${BUILD_TYPE}}")
Expand Down
200 changes: 0 additions & 200 deletions FindNetCDF.cmake

This file was deleted.

18 changes: 18 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
[![CI](https://github.com/mom-ocean/FMS/actions/workflows/CI.yml/badge.svg)](https://github.com/mom-ocean/FMS/actions/workflows/CI.yml)

# Flexible Modeling System (FMS)

The Flexible Modeling System (FMS) is a software framework for supporting the
Expand All @@ -6,6 +8,22 @@ of atmospheric, oceanic, and climate system models.

More information is available on the [GFDL FMS page](http://www.gfdl.noaa.gov/fms).

# MOM5 Version

This is a [GitHub fork](https://docs.github.com/en/get-started/quickstart/fork-a-repo) of
the [Official FMS repository](https://github.com/NOAA-GFDL/FMS) for the purpose of maintaining
a version of FMS that is compatible with the MOM5 ocean model.

The GFDL `master` branch is tracked in the `https://github.com/mom-ocean/FMS/tree/gfdl/master` branch
on this repository.

The `master` branch in this repository is included as a [subtree](https://www.atlassian.com/git/tutorials/git-subtree)
within the MOM5 repository. The forked occurred from the commit for the
[Warsaw 201803 Release](https://github.com/mom-ocean/FMS/commit/e8940fe90d68c3dc7c0d6bf1b8f552a577251754). After
this point the codebases started to diverge and it was decided it would be too difficult to udpate
driver code for all the supported model configurations.

Note that this is not the version of FMS that is used for [MOM6](https://github.com/mom-ocean/MOM6).
# Disclaimer

The United States Department of Commerce (DOC) GitHub project code is provided
Expand Down
2 changes: 0 additions & 2 deletions fms/fms.F90
Original file line number Diff line number Diff line change
Expand Up @@ -300,7 +300,6 @@ module fms_mod

! ---- private data for check_nml_error ----

integer, private :: num_nml_error_codes, nml_error_codes(20)
logical, private :: do_nml_error_init = .true.
private nml_error_init

Expand Down Expand Up @@ -441,7 +440,6 @@ subroutine fms_init (localcomm )
if (mpp_pe() == mpp_root_pe()) then
unit = stdlog()
write (unit, nml=fms_nml)
write (unit,*) 'nml_error_codes=', nml_error_codes(1:num_nml_error_codes)
endif

call memutils_init( print_memory_usage )
Expand Down
10 changes: 6 additions & 4 deletions random_numbers/MersenneTwister.F90
Original file line number Diff line number Diff line change
Expand Up @@ -146,11 +146,13 @@ elemental function temper(y)
integer, intent(in) :: y
integer :: temper

integer :: x

! Tempering
temper = ieor(y, ishft(y, -11))
temper = ieor(temper, iand(ishft(temper, 7), TMASKB))
temper = ieor(temper, iand(ishft(temper, 15), TMASKC))
temper = ieor(temper, ishft(temper, -18))
x = ieor(y, ishft(y, -11))
x = ieor(x, iand(ishft(x, 7), TMASKB))
x = ieor(x, iand(ishft(x, 15), TMASKC))
temper = ieor(x, ishft(x, -18))
end function temper
! -------------------------------------------------------------
! Public (but hidden) functions
Expand Down

0 comments on commit 3bd2480

Please sign in to comment.