Skip to content

Commit

Permalink
Update FMS and coupler to 2024.03, also update xmls
Browse files Browse the repository at this point in the history
  • Loading branch information
@yichengt900
yichengt900 committed Aug 23, 2024
1 parent a5d4615 commit c8c77ff
Show file tree
Hide file tree
Showing 5 changed files with 14 additions and 14 deletions.
16 changes: 8 additions & 8 deletions .gitmodules
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,14 +30,6 @@
path = src/ice_param
url = https://github.com/NOAA-GFDL/ice_param.git
branch = 2024.02
[submodule "src/FMS"]
path = src/FMS
url = https://github.com/NOAA-GFDL/FMS.git
branch = 2024.02
[submodule "src/coupler"]
path = src/coupler
url = https://github.com/NOAA-GFDL/FMScoupler.git
branch = 2024.02
[submodule "src/ocean_BGC"]
path = src/ocean_BGC
url = https://github.com/NOAA-CEFI-Regional-Ocean-Modeling/ocean_BGC.git
Expand All @@ -46,3 +38,11 @@
path = src/MOM6
url = https://github.com/NOAA-CEFI-Regional-Ocean-Modeling/MOM6.git
branch = dev/cefi
[submodule "src/FMS"]
path = src/FMS
url = https://github.com/NOAA-GFDL/FMS.git
branch = 2024.03
[submodule "src/coupler"]
path = src/coupler
url = https://github.com/NOAA-GFDL/FMScoupler.git
branch = 2024.03
2 changes: 1 addition & 1 deletion src/FMS
Submodule FMS updated 78 files
+30 −0 CHANGELOG.md
+6 −5 CMAKE_INSTRUCTIONS.md
+17 −8 CMakeLists.txt
+3 −3 amip_interp/amip_interp.F90
+3 −2 amip_interp/include/amip_interp.inc
+1 −1 column_diagnostics/column_diagnostics.F90
+1 −1 column_diagnostics/include/column_diagnostics.inc
+1 −1 configure.ac
+4 −4 coupler/atmos_ocean_fluxes.F90
+19 −19 coupler/coupler_types.F90
+104 −46 data_override/README.MD
+1 −1 data_override/get_grid_version.F90
+151 −60 data_override/include/data_override.inc
+25 −15 data_override/include/get_grid_version.inc
+6 −9 diag_integral/diag_integral.F90
+5 −3 diag_manager/README.md
+3 −3 diag_manager/diag_data.F90
+1 −1 diag_manager/diag_manager.F90
+1 −1 diag_manager/diag_output.F90
+2 −1 diag_manager/diag_table.F90
+3 −2 diag_manager/diag_util.F90
+9 −0 diag_manager/diag_yaml_format.md
+4 −4 diag_manager/fms_diag_axis_object.F90
+13 −13 diag_manager/fms_diag_field_object.F90
+7 −6 diag_manager/fms_diag_file_object.F90
+2 −2 diag_manager/fms_diag_input_buffer.F90
+2 −2 diag_manager/fms_diag_object.F90
+55 −11 diag_manager/fms_diag_yaml.F90
+0 −141 diag_manager/schema.diag
+3 −2 drifters/drifters.F90
+6 −5 exchange/xgrid.F90
+56 −57 field_manager/field_manager.F90
+16 −16 field_manager/fm_util.F90
+271 −433 field_manager/fm_yaml.F90
+1 −1 field_manager/include/field_manager.inc
+3 −3 field_manager/include/fm_util.inc
+7 −7 fms2_io/blackboxio.F90
+4 −2 fms2_io/fms_io_utils.F90
+3 −3 fms2_io/fms_netcdf_domain_io.F90
+4 −3 fms2_io/fms_netcdf_unstructured_domain_io.F90
+31 −31 fms2_io/netcdf_io.F90
+8 −1 horiz_interp/horiz_interp.F90
+11 −1 horiz_interp/horiz_interp_bilinear.F90
+48 −0 horiz_interp/include/horiz_interp.inc
+89 −0 horiz_interp/include/horiz_interp_bilinear.inc
+3 −0 horiz_interp/include/horiz_interp_bilinear_r4.fh
+3 −0 horiz_interp/include/horiz_interp_bilinear_r8.fh
+3 −0 horiz_interp/include/horiz_interp_r4.fh
+3 −0 horiz_interp/include/horiz_interp_r8.fh
+7 −0 include/fms_platform.h
+1 −1 interpolator/include/interpolator.inc
+2 −2 interpolator/interpolator.F90
+1 −1 libFMS/Makefile.am
+3 −4 mosaic2/grid2.F90
+5 −5 mosaic2/include/grid2.inc
+2 −3 mosaic2/mosaic2.F90
+4 −4 mpp/include/mpp_util.inc
+108 −5 parser/yaml_parser.F90
+91 −5 parser/yaml_parser_binding.c
+2 −0 platform/platform.F90
+2 −2 test_fms/data_override/Makefile.am
+12 −10 test_fms/data_override/test_data_override2_mono.sh
+8 −7 test_fms/data_override/test_data_override2_ongrid.sh
+7 −6 test_fms/data_override/test_data_override2_scalar.sh
+101 −8 test_fms/data_override/test_data_override_ongrid.F90
+76 −0 test_fms/data_override/test_data_override_weights.sh
+78 −0 test_fms/diag_manager/test_diag_manager2.sh
+6 −6 test_fms/field_manager/test_field_manager2.sh
+4 −1 test_fms/mpp/test_stdlog.F90
+3 −1 test_fms/parser/Makefile.am
+132 −0 test_fms/parser/generic_blocks.F90
+1 −1 test_fms/parser/parser_demo.F90
+1 −1 test_fms/parser/parser_demo2.F90
+62 −1 test_fms/parser/test_yaml_parser.sh
+12 −12 test_fms/tracer_manager/test_tracer_manager2.sh
+4 −2 time_interp/include/time_interp_external2.inc
+2 −2 time_interp/time_interp_external2.F90
+3 −3 topography/topography.F90
2 changes: 1 addition & 1 deletion src/coupler
Submodule coupler updated 18 files
+2 −2 .github/workflows/build.yml
+1 −1 .github/workflows/docs.yml
+3 −1 .github/workflows/lint.yml
+19 −7 CHANGELOG.md
+14 −10 SHiELD/coupler_main.F90
+83 −56 full/atm_land_ice_flux_exchange.F90
+4 −2 full/atmos_ocean_dep_fluxes_calc.F90
+3 −2 full/atmos_ocean_fluxes_calc.F90
+8 −42 full/coupler_main.F90
+23 −16 full/flux_exchange.F90
+2 −2 full/full_coupler_mod.F90
+58 −36 full/ice_ocean_flux_exchange.F90
+4 −3 full/land_ice_flux_exchange.F90
+54 −43 shared/surface_flux.F90
+11 −8 simple/coupler_main.F90
+1 −5 simple/flux_exchange.F90
+35 −34 simple/ice_model.F90
+8 −8 t/null_model_build.sh
4 changes: 2 additions & 2 deletions xmls/NWA12/CEFI_NWA12_cobalt.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,10 +40,10 @@ frecheck -r layout -p ncrc6.intel23 -x CEFI_NWA12_cobalt.xml CEFI_NWA12_COBALT_V
<property name="RELEASE" value="2024.02"/>

<!-- git tag for FMS source code -->
<property name="FMS_GIT_TAG" value="2024.02"/>
<property name="FMS_GIT_TAG" value="2024.03"/>

<!-- git tag for shared source code -->
<property name="CPL_GIT_TAG" value="2024.02"/>
<property name="CPL_GIT_TAG" value="2024.03"/>

<!-- git tag for shared source code -->
<property name="NULL_TAG" value="2023.04"/>
Expand Down
4 changes: 2 additions & 2 deletions xmls/NWA12/CEFI_NWA12_cobalt_fms2_yaml.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,10 +40,10 @@ frecheck -r layout -p ncrc6.intel23 -x CEFI_NWA12_cobalt_fms2_yaml.xml CEFI_NWA1
<property name="RELEASE" value="2024.02"/>

<!-- git tag for FMS source code -->
<property name="FMS_GIT_TAG" value="2024.02"/>
<property name="FMS_GIT_TAG" value="2024.03"/>

<!-- git tag for shared source code -->
<property name="CPL_GIT_TAG" value="2024.02"/>
<property name="CPL_GIT_TAG" value="2024.03"/>

<!-- git tag for shared source code -->
<property name="NULL_TAG" value="2023.04"/>
Expand Down

0 comments on commit c8c77ff

Please sign in to comment.