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

Linter fix #6

Open
wants to merge 12 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:
credentials:
username: ${{ github.actor }}
password: ${{ secrets.github_token }}
env:
env:
CC: mpicc
FC: mpif90
CPPFLAGS: '-I/usr/include -Duse_LARGEFILE -DMAXFIELDMETHODS_=500'
Expand All @@ -19,5 +19,5 @@ jobs:
steps:
- name: Checkout code
uses: actions/checkout@v2
- name: Run build test
- name: Run build test
run: t/null_model_build.sh
2 changes: 1 addition & 1 deletion .github/workflows/docs.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: FMScoupler update doxygen site
name: FMScoupler update doxygen site

on: [release, workflow_dispatch]

Expand Down
4 changes: 3 additions & 1 deletion .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,6 @@ jobs:
- name: Checkout code
uses: actions/checkout@v2
- name: Run linter
uses: NOAA-GFDL/simple_lint@v2
uses: NOAA-GFDL/simple_lint@f5aa1fe976bd4c231db0536ba00cbfdc26708253
with:
ftn_line_len: 121
21 changes: 14 additions & 7 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,13 @@ sequential patch number (starting from `01`).
- 2024.01-beta4 4dc9b0f2a85d34b0fdc8477625b91794a77ac747
- 2024.01-beta5 4dc9b0f2a85d34b0fdc8477625b91794a77ac747

## [2023.04.01] - 2024-06-20
### Fixed
- SIMPLE COUPLER: Fixed issue where the `sst_anom` value used was not the correct value read in from the namelist. (#122)

### Tag Commit Hashes
- 2023.04 6b4f8b5207483eb7a7839a29909a415253a05db8

## [2023.04] - 2023-12-04
### Added
- Adds additional output arguments `thv_atm` amd `thv_surf` to the `surface_flux` interface, as well as calls to xgrid and send data in order to use a new atmosphere boundary layer scheme.
Expand Down Expand Up @@ -87,13 +94,13 @@ sequential patch number (starting from `01`).
### Changed
- Changes routine names used for constants in order to compile with recent constants changes to FMS
### Fixed
- FULL: Replaced a deprecated OpenMP routine causing warnings
- FULL: Replaced a deprecated OpenMP routine causing warnings
- SIMPLE: Fixed a missing variable allocation that was causing failures with certain compilers

### Tag Commit Hashes
2022.02-alpha1 de3e3cbca349021a545a500f5ba1af6af22acfae
2022.02-alpha2 c23b6f3ff1f902adf1fa43f8a5c9d2307bd01106
2022.02-beta1 2bb8f35e2f579e738b58c610c35ca9afd7e36358
2022.02-beta1 2bb8f35e2f579e738b58c610c35ca9afd7e36358

## [2022.01] - 2022-03-25
### Added
Expand All @@ -114,16 +121,16 @@ sequential patch number (starting from `01`).
### Added
- FMS2_IO was implemented to the full coupler:
- The coupler restart files are now read with fms2_io's ascii_read
- Ascii writes are now done with fortran's open, close, and write. They are wrapped in an if, so that only the root pe does the io, newunit ensures that the unit number is unique for each file.
- The variables named `unit` have been renamed to avoid fortran conflicts.
- Ascii writes are now done with fortran's open, close, and write. They are wrapped in an if, so that only the root pe does the io, newunit ensures that the unit number is unique for each file.
- The variables named `unit` have been renamed to avoid fortran conflicts.
- The coupler type restarts are now written with fms2_io.
- The grid file is now read with fms2_io in: full/flux_exchange.F90:check_atm_grid
- FMS2_IO was implemented to the simple coupler:
- Changed ice_model.F90 so that it reads the land_mask files and it reads/writes the ice restart with fms2io.
- Removed the native formatted restart file code
- Fms2_io ascii_read is used to read to the coupler_restart
- Fotran's `open`, `close`, and `write` are used to write the coupler_restart
- Removed the read_grid_data and get_grid_size subroutines from simple/ice_model.F90. These are never used.
- Removed the read_grid_data and get_grid_size subroutines from simple/ice_model.F90. These are never used.
- Test cases added for varying the latitude of SST maximum in the simple coupler ice model.
### Changed
- Changes all imports from FMS to use the global `FMS` module and the `FMSconstants` module
Expand All @@ -148,7 +155,7 @@ sequential patch number (starting from `01`).
were written by default.
- FMS2_io does not do this. Users can specify real long_names and units by calling register_variable_attribute.
### Removed
- FMS_io was almost completely removed from FMScoupler and replaced with fms2_io.
- FMS_io was almost completely removed from FMScoupler and replaced with fms2_io.
### Tag Commit Hashes
- 2021.02-alpha1 (c1c8044a6c3efb8ddbbd01a3769bbf2610b34937)
- 2021.02-alpha2 (c1c8044a6c3efb8ddbbd01a3769bbf2610b34937)
Expand All @@ -161,7 +168,7 @@ sequential patch number (starting from `01`).
- SURFACE_FLUX: Adds a new functionality to enable using NCAR surface fluxes in experiments

### Fixed
- SIMPLE_COUPLER: Fixed issue with simpler coupler not calling data_override_init during initialization, will now call if the data_table file exists
- SIMPLE_COUPLER: Fixed issue with simpler coupler not calling data_override_init during initialization, will now call if the data_table file exists

## Tag Commit Hashes
- 2021.01-beta1 (7e7212c6db62aa7916af0f6ada59c5a83355c1b8)
Expand Down
20 changes: 11 additions & 9 deletions SHiELD/coupler_main.F90
Original file line number Diff line number Diff line change
Expand Up @@ -70,15 +70,16 @@ program coupler_main

! ----- namelist -----
integer, dimension(6) :: current_date = (/ 0, 0, 0, 0, 0, 0 /) !< The date that the current integration starts with
character(len=17) :: calendar = ' ' !< The calendar type used by the current integration. Valid values are
!! consistent with the time_manager module: 'gregorian', 'julian',
!! 'noleap', or 'thirty_day'. The value 'no_calendar' cannot be used
!! because the time_manager's date !! functions are used.
character(len=17) :: calendar = ' ' !< The calendar type used by the current integration.
!! Valid values are consistent with the time_manager module:
!! 'gregorian', 'julian', 'noleap', or 'thirty_day'. The value
!! 'no_calendar' cannot be used
!! because the time_manager's date functions are used.
!! All values must be lower case.
logical :: force_date_from_namelist = .false. !< Flag that determines whether the namelist variable current_date should override
!! the date in the restart file `INPUT/coupler.res`. If the restart file does not
!! exist then force_date_from_namelist has no effect, the value of current_date
!! will be used.
logical :: force_date_from_namelist = .false. !< Flag that determines whether the namelist variable current_date
!! should override the date in the restart file `INPUT/coupler.res`.
!! If the restart file does not exist then force_date_from_namelist
!! has no effect, the value of current_date will be used.
integer :: years=0 !< Number of years the current integration will be run
integer :: months=0 !< Number of months the current integration will be run
integer :: days=0 !< Number of days the current integration will be run
Expand Down Expand Up @@ -322,7 +323,8 @@ subroutine coupler_init

!-----------------------------------------------------------------------
!----- write time stamps (for start time and end time) ------
if ( fms_mpp_pe().EQ.fms_mpp_root_pe() ) open(newunit = time_stamp_unit, file='time_stamp.out', status='replace', form='formatted')
if ( fms_mpp_pe().EQ.fms_mpp_root_pe() )
open(newunit = time_stamp_unit, file='time_stamp.out', status='replace', form='formatted')

month = fms_time_manager_month_name(date(2))
if ( fms_mpp_pe() == fms_mpp_root_pe() ) write (time_stamp_unit,20) date, month(1:3)
Expand Down
Loading
Loading