From c58154bfa2d95059fe96b9ff70aa2deb2af56628 Mon Sep 17 00:00:00 2001 From: Ryan Mulhall Date: Mon, 17 May 2021 13:25:00 -0400 Subject: [PATCH 1/5] Update changelog for 2021.02 --- CHANGELOG.md | 45 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 45 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 76938d6b..625777a8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,51 @@ and this project uses `yyyy.rr[.pp]`, where `yyyy` is the year a patch is releas `rr` is a sequential release number (starting from `01`), and an optional two-digit sequential patch number (starting from `01`). +## [2021.02] - 2021-05-17 +### 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. + - 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. +- Test cases added for varying the latitude of SST maximum in the simpler coupler ice model. +### Changed +- Changes all imports from FMS to use the global `FMS` module and the `FMSconstants` module +- Changes to the ice_model restart files: + - With fms_io, the variables `mlon` and `mlat` are written as: + double mlon(Time, zaxis_1, yaxis_1, xaxis_1) ; + double mlat(Time, zaxis_1, yaxis_1, xaxis_1) ; + where: + xaxis_1 = 1 ; + yaxis_1 = 1 ; + zaxis_1 = 1 ; + Time = UNLIMITED ; // (1 currently) + - fms_io wrote this as 4d variables as default. In FMS2_io these variables are scalars as they should be. With fms_io, the other non scalar variables where written as: + double t_surf(Time, zaxis_1, yaxis_2, xaxis_2) ; + where: + zaxis_1 = 1 ; + - In FMS2_io these variables are not a function of the zaxis_1. They are 2d + time as they should be. + double t_surf(Time, yaxis_1, xaxis_1) ;` + With fms_io, the variables attributes: + long_name = {The same name as the longname} + units = "none"` + 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. +### Tag Commit Hashes +- 2021.02-alpha1 (c1c8044a6c3efb8ddbbd01a3769bbf2610b34937) +- 2021.02-alpha2 (c1c8044a6c3efb8ddbbd01a3769bbf2610b34937) +- 2021.02-beta1 (62415ea3a62145080efcfe078eb889d6adf681a1) +- 2021.02-beta2 (62415ea3a62145080efcfe078eb889d6adf681a1) + ## [2021.01] - 2021-03-08 ### Added From 8c4fa3586edaec691c3d66cdfc1c0f80963550fb Mon Sep 17 00:00:00 2001 From: Ryan Mulhall Date: Mon, 17 May 2021 14:10:34 -0400 Subject: [PATCH 2/5] Typo --- CHANGELOG.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 625777a8..082a9141 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -18,7 +18,7 @@ sequential patch number (starting from `01`). - 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 + - 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. - Test cases added for varying the latitude of SST maximum in the simpler coupler ice model. ### Changed @@ -37,10 +37,10 @@ sequential patch number (starting from `01`). where: zaxis_1 = 1 ; - In FMS2_io these variables are not a function of the zaxis_1. They are 2d + time as they should be. - double t_surf(Time, yaxis_1, xaxis_1) ;` + double t_surf(Time, yaxis_1, xaxis_1) ; With fms_io, the variables attributes: long_name = {The same name as the longname} - units = "none"` + units = "none" were written by default. - FMS2_io does not do this. Users can specify real long_names and units by calling register_variable_attribute. ### Removed From ad26113a3a06924bd7ca285d322b33ff68249b29 Mon Sep 17 00:00:00 2001 From: Ryan Mulhall <35538242+rem1776@users.noreply.github.com> Date: Mon, 17 May 2021 14:16:47 -0400 Subject: [PATCH 3/5] Fix formatting --- CHANGELOG.md | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 082a9141..8dac254b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -24,23 +24,23 @@ sequential patch number (starting from `01`). ### Changed - Changes all imports from FMS to use the global `FMS` module and the `FMSconstants` module - Changes to the ice_model restart files: - - With fms_io, the variables `mlon` and `mlat` are written as: - double mlon(Time, zaxis_1, yaxis_1, xaxis_1) ; - double mlat(Time, zaxis_1, yaxis_1, xaxis_1) ; - where: - xaxis_1 = 1 ; - yaxis_1 = 1 ; - zaxis_1 = 1 ; - Time = UNLIMITED ; // (1 currently) - - fms_io wrote this as 4d variables as default. In FMS2_io these variables are scalars as they should be. With fms_io, the other non scalar variables where written as: - double t_surf(Time, zaxis_1, yaxis_2, xaxis_2) ; - where: - zaxis_1 = 1 ; - - In FMS2_io these variables are not a function of the zaxis_1. They are 2d + time as they should be. - double t_surf(Time, yaxis_1, xaxis_1) ; - With fms_io, the variables attributes: - long_name = {The same name as the longname} - units = "none" + - With fms_io, the variables `mlon` and `mlat` are written as:
+ `double mlon(Time, zaxis_1, yaxis_1, xaxis_1) ;`
+ `double mlat(Time, zaxis_1, yaxis_1, xaxis_1) ;`
+ where:
+ `xaxis_1 = 1 ;`
+ `yaxis_1 = 1 ;`
+ `zaxis_1 = 1 ;`
+ `Time = UNLIMITED ; // (1 currently)` + - fms_io wrote this as 4d variables as default. In FMS2_io these variables are scalars as they should be. With fms_io, the other non scalar variables where written as:
+ `double t_surf(Time, zaxis_1, yaxis_2, xaxis_2) ;`
+ where:
+ `zaxis_1 = 1 ;` + - In FMS2_io these variables are not a function of the zaxis_1. They are 2d + time as they should be.
+ `double t_surf(Time, yaxis_1, xaxis_1) ;`
+ With fms_io, the variables attributes:
+ `long_name = {The same name as the longname}`
+ `units = "none"`
were written by default. - FMS2_io does not do this. Users can specify real long_names and units by calling register_variable_attribute. ### Removed From 21402dd4ac549c6a1083ab65cbac205a0052bd04 Mon Sep 17 00:00:00 2001 From: Ryan Mulhall <35538242+rem1776@users.noreply.github.com> Date: Wed, 19 May 2021 09:14:52 -0400 Subject: [PATCH 4/5] Fix typo, update date --- CHANGELOG.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8dac254b..28088366 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,7 +6,7 @@ and this project uses `yyyy.rr[.pp]`, where `yyyy` is the year a patch is releas `rr` is a sequential release number (starting from `01`), and an optional two-digit sequential patch number (starting from `01`). -## [2021.02] - 2021-05-17 +## [2021.02] - 2021-05-19 ### Added - FMS2_IO was implemented to the full coupler: - The coupler restart files are now read with fms2_io's ascii_read @@ -20,7 +20,7 @@ sequential patch number (starting from `01`). - 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. -- Test cases added for varying the latitude of SST maximum in the simpler coupler ice model. +- 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 - Changes to the ice_model restart files: From 84230307565304dcb37f198a36a58947abe12083 Mon Sep 17 00:00:00 2001 From: Ryan Mulhall <35538242+rem1776@users.noreply.github.com> Date: Thu, 20 May 2021 08:59:58 -0400 Subject: [PATCH 5/5] update date --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 28088366..9706494a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,7 +6,7 @@ and this project uses `yyyy.rr[.pp]`, where `yyyy` is the year a patch is releas `rr` is a sequential release number (starting from `01`), and an optional two-digit sequential patch number (starting from `01`). -## [2021.02] - 2021-05-19 +## [2021.02] - 2021-05-20 ### Added - FMS2_IO was implemented to the full coupler: - The coupler restart files are now read with fms2_io's ascii_read