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.

Sign up for GitHub

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

2025.01 update part.1 #139

Merged
merged 6 commits into from
Jan 31, 2025
Merged

2025.01 update part.1 #139

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
8a76b1a
update FMS and coupler to 2025.01
yichengt900 Jan 31, 2025
2d8e2aa
Update ci workflow
yichengt900 Jan 31, 2025
a4bb472
Updated atmos_nul to 2025.01 that is compatible with coupler
yichengt900 Jan 31, 2025
51478f9
Updated build script
yichengt900 Jan 31, 2025
ed860bf
updated ci workflow
yichengt900 Jan 31, 2025
94f17cd
Update tags in xmls
yichengt900 Jan 31, 2025
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/CEFI_MOM6-ci.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ jobs:
run: tar -czvf CEFI_MOM6_CHECK.tar.gz -C ${{ env.TEST_DIR }} CEFI_MOM6_CHECK

- name: Upload the whole MOM6_CHECK as an artifact
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: CEFI_MOM6_CHECK
path: CEFI_MOM6_CHECK.tar.gz
Expand All @@ -75,7 +75,7 @@ jobs:
case: ["NWA12.COBALT", "NEP10.COBALT"]
steps:
- name: Download CEFI_MOM6_CHECK compressed artifact
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: CEFI_MOM6_CHECK
path: ${{ env.TEST_DIR }}
Expand Down
24 changes: 12 additions & 12 deletions .gitmodules
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,6 @@
path = src/land_null
url = https://github.com/NOAA-GFDL/land_null.git
branch = 2023.04
[submodule "src/atmos_null"]
path = src/atmos_null
url = https://github.com/NOAA-GFDL/atmos_null.git
branch = 2023.04
[submodule "src/mkmf"]
path = src/mkmf
url = https://github.com/NOAA-GFDL/mkmf.git
Expand All @@ -30,14 +26,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.03
[submodule "src/coupler"]
path = src/coupler
url = https://github.com/NOAA-GFDL/FMScoupler.git
branch = 2024.03
[submodule "src/MOM6"]
path = src/MOM6
url = https://github.com/NOAA-CEFI-Regional-Ocean-Modeling/MOM6.git
Expand All @@ -46,3 +34,15 @@
path = src/ocean_BGC
url = https://github.com/NOAA-CEFI-Regional-Ocean-Modeling/ocean_BGC.git
branch = dev/cefi
[submodule "src/FMS"]
path = src/FMS
url = https://github.com/NOAA-GFDL/FMS.git
branch = 2025.01
[submodule "src/coupler"]
path = src/coupler
url = https://github.com/NOAA-GFDL/FMScoupler.git
branch = 2025.01
[submodule "src/atmos_null"]
path = src/atmos_null
url = https://github.com/NOAA-GFDL/atmos_null.git
branch = 2025.01
65 changes: 0 additions & 65 deletions builds/ci_build_driver_c6.sh
View file
Open in desktop

This file was deleted.

8 changes: 4 additions & 4 deletions builds/linux-build.bash
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ if [[ $flavor == "mom6sis2" ]] ; then
mkdir -p build/$machine_name-$platform/shared/$target
pushd build/$machine_name-$platform/shared/$target
rm -f path_names
$srcdir/mkmf/bin/list_paths $srcdir/FMS/{affinity,amip_interp,column_diagnostics,diag_integral,drifters,horiz_interp,memutils,sat_vapor_pres,topography,astronomy,constants,diag_manager,field_manager,include,monin_obukhov,platform,tracer_manager,axis_utils,coupler,fms,fms2_io,interpolator,mosaic,mosaic2,random_numbers,time_interp,tridiagonal,block_control,data_override,exchange,mpp,time_manager,string_utils,parser}/ $srcdir/FMS/libFMS.F90
$srcdir/mkmf/bin/list_paths $srcdir/FMS/{affinity,amip_interp,column_diagnostics,diag_integral,drifters,grid_utils,horiz_interp,memutils,sat_vapor_pres,topography,astronomy,constants,diag_manager,field_manager,include,monin_obukhov,platform,tracer_manager,axis_utils,coupler,fms,fms2_io,interpolator,mosaic,mosaic2,random_numbers,time_interp,tridiagonal,block_control,data_override,exchange,mpp,time_manager,string_utils,parser}/ $srcdir/FMS/libFMS.F90
$srcdir/mkmf/bin/mkmf -t $abs_rootdir/$machine_name/$platform.mk -p libfms.a -c "-Duse_libMPI -Duse_netCDF -DMAXFIELDMETHODS_=800" path_names

make $makeflags libfms.a
Expand Down Expand Up @@ -123,7 +123,7 @@ popd
mkdir -p build/$machine_name-$platform/shared/$target
pushd build/$machine_name-$platform/shared/$target
rm -f path_names
$srcdir/mkmf/bin/list_paths $srcdir/FMS/{affinity,amip_interp,column_diagnostics,diag_integral,drifters,horiz_interp,memutils,sat_vapor_pres,topography,astronomy,constants,diag_manager,field_manager,include,monin_obukhov,platform,tracer_manager,axis_utils,coupler,fms,fms2_io,interpolator,mosaic,mosaic2,random_numbers,time_interp,tridiagonal,block_control,data_override,exchange,mpp,time_manager,string_utils,parser}/ $srcdir/FMS/libFMS.F90
$srcdir/mkmf/bin/list_paths $srcdir/FMS/{affinity,amip_interp,column_diagnostics,diag_integral,drifters,grid_utils,horiz_interp,memutils,sat_vapor_pres,topography,astronomy,constants,diag_manager,field_manager,include,monin_obukhov,platform,tracer_manager,axis_utils,coupler,fms,fms2_io,interpolator,mosaic,mosaic2,random_numbers,time_interp,tridiagonal,block_control,data_override,exchange,mpp,time_manager,string_utils,parser}/ $srcdir/FMS/libFMS.F90
$srcdir/mkmf/bin/mkmf -t $abs_rootdir/$machine_name/$platform.mk -o "-I../../libyaml/$target/include" -p libfms.a -l "-L../../libyaml/$target/lib -lyaml $linker_options" -c "-Duse_libMPI -Duse_yaml -Duse_netCDF -DMAXFIELDMETHODS_=800" path_names

make $makeflags libfms.a
Expand Down Expand Up @@ -159,7 +159,7 @@ elif [[ $flavor == "fms1_mom6sis2" ]]; then
mkdir -p build/$machine_name-$platform/shared/$target
pushd build/$machine_name-$platform/shared/$target
rm -f path_names
$srcdir/mkmf/bin/list_paths $srcdir/FMS/{affinity,amip_interp,column_diagnostics,diag_integral,drifters,horiz_interp,memutils,sat_vapor_pres,topography,astronomy,constants,diag_manager,field_manager,include,monin_obukhov,platform,tracer_manager,axis_utils,coupler,fms,fms2_io,interpolator,mosaic,mosaic2,random_numbers,time_interp,tridiagonal,block_control,data_override,exchange,mpp,time_manager,string_utils,parser}/ $srcdir/FMS/libFMS.F90
$srcdir/mkmf/bin/list_paths $srcdir/FMS/{affinity,amip_interp,column_diagnostics,diag_integral,drifters,grid_utils,horiz_interp,memutils,sat_vapor_pres,topography,astronomy,constants,diag_manager,field_manager,include,monin_obukhov,platform,tracer_manager,axis_utils,coupler,fms,fms2_io,interpolator,mosaic,mosaic2,random_numbers,time_interp,tridiagonal,block_control,data_override,exchange,mpp,time_manager,string_utils,parser}/ $srcdir/FMS/libFMS.F90
$srcdir/mkmf/bin/mkmf -t $abs_rootdir/$machine_name/$platform.mk -p libfms.a -c "-Duse_deprecated_io -Duse_libMPI -Duse_netCDF -DMAXFIELDMETHODS_=800" path_names

make $makeflags libfms.a
Expand Down Expand Up @@ -195,7 +195,7 @@ else
mkdir -p build/$machine_name-$platform/shared/$target
pushd build/$machine_name-$platform/shared/$target
rm -f path_names
$srcdir/mkmf/bin/list_paths $srcdir/FMS/{affinity,amip_interp,column_diagnostics,diag_integral,drifters,horiz_interp,memutils,sat_vapor_pres,topography,astronomy,constants,diag_manager,field_manager,include,monin_obukhov,platform,tracer_manager,axis_utils,coupler,fms,fms2_io,interpolator,mosaic,mosaic2,random_numbers,time_interp,tridiagonal,block_control,data_override,exchange,mpp,time_manager,string_utils,parser}/ $srcdir/FMS/libFMS.F90
$srcdir/mkmf/bin/list_paths $srcdir/FMS/{affinity,amip_interp,column_diagnostics,diag_integral,drifters,grid_utils,horiz_interp,memutils,sat_vapor_pres,topography,astronomy,constants,diag_manager,field_manager,include,monin_obukhov,platform,tracer_manager,axis_utils,coupler,fms,fms2_io,interpolator,mosaic,mosaic2,random_numbers,time_interp,tridiagonal,block_control,data_override,exchange,mpp,time_manager,string_utils,parser}/ $srcdir/FMS/libFMS.F90
$srcdir/mkmf/bin/mkmf -t $abs_rootdir/$machine_name/$platform.mk -p libfms.a -c "-Duse_libMPI -Duse_netCDF -DMAXFIELDMETHODS_=800" path_names

make $makeflags libfms.a
Expand Down
2 changes: 1 addition & 1 deletion src/FMS
Open in desktop
Submodule FMS updated 108 files
2 changes: 1 addition & 1 deletion src/atmos_null
Open in desktop
Submodule atmos_null updated 1 files
+3 −0 atmos_model.F90
2 changes: 1 addition & 1 deletion src/coupler
Open in desktop
Submodule coupler updated 8 files
+17 −0 CHANGELOG.md
+69 −0 CODE_OF_CONDUCT.md
+287 −0 CODE_STYLE.md
+154 −0 CONTRIBUTING.md
+5 −0 README.md
+20 −3 full/atm_land_ice_flux_exchange.F90
+5 −4 full/coupler_main.F90
+1 −1 full/full_coupler_mod.F90
8 changes: 4 additions & 4 deletions xmls/NEP10/CEFI_NEP_cobalt.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,10 +39,10 @@ frecheck -v -r restart -p ncrc6.intel23 -t repro -x CEFI_NEP_cobalt.xml CEFI_NE
<property name="RELEASE" value="2024.02"/>

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

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

<!-- git tag for null (atmos_null, land_null, etc) source code -->
<property name="NULL_TAG" value="2023.04"/>
Expand All @@ -57,7 +57,7 @@ frecheck -v -r restart -p ncrc6.intel23 -t repro -x CEFI_NEP_cobalt.xml CEFI_NE
<property name="ICEPACK_GIT_TAG" value="Icepack1.3.3"/>

<!-- customize as needed -->
<property name="FRE_STEM" value="fre/cefi/NEP/2024_11"/>
<property name="FRE_STEM" value="fre/cefi/NEP/2025_02"/>

<!-- Please make sure to change your group, such as b, f, g, m, o... -->
<!-- NCRC_GROUP will only have impact for your root dir and work dir on gaea c5/c6-->
Expand Down Expand Up @@ -173,7 +173,7 @@ frecheck -v -r restart -p ncrc6.intel23 -t repro -x CEFI_NEP_cobalt.xml CEFI_NE

<component name="atmos_null" paths="mom6/src/atmos_null" requires="fms">
<source versionControl="git" root="https://github.com/NOAA-GFDL">
<codeBase version="$(NULL_TAG)"> atmos_null.git </codeBase>
<codeBase version="$(CPL_GIT_TAG)"> atmos_null.git </codeBase>
</source>
<compile>
<cppDefs>$(F2003_FLAGS) </cppDefs>
Expand Down
8 changes: 4 additions & 4 deletions xmls/NWA12/CEFI_NWA12_cobalt.xml
View file
Open in desktop
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.03"/>
<property name="FMS_GIT_TAG" value="2025.01"/>

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

<!-- git tag for shared source code -->
<property name="NULL_TAG" value="2023.04"/>
Expand All @@ -52,7 +52,7 @@ frecheck -r layout -p ncrc6.intel23 -x CEFI_NWA12_cobalt.xml CEFI_NWA12_COBALT_V
<property name="MOM6_GIT_FIX" value="main"/> <!-- Trying new branch with bug fix for bgc obc index -->

<!-- customize as needed -->
<property name="FRE_STEM" value="fre/cefi/NWA/2024_11"/>
<property name="FRE_STEM" value="fre/cefi/NWA/2025_02"/>

<!-- Please make sure to change your group, such as b, f, g, m, o... -->
<property name="NCRC_GROUP" value="ira-cefi"/>
Expand Down Expand Up @@ -164,7 +164,7 @@ frecheck -r layout -p ncrc6.intel23 -x CEFI_NWA12_cobalt.xml CEFI_NWA12_COBALT_V

<component name="atmos_null" paths="mom6/src/atmos_null" requires="fms">
<source versionControl="git" root="https://github.com/NOAA-GFDL">
<codeBase version="$(NULL_TAG)"> atmos_null.git </codeBase>
<codeBase version="$(CPL_GIT_TAG)"> atmos_null.git </codeBase>
</source>
<compile>
<cppDefs>$(F2003_FLAGS) </cppDefs>
Expand Down
8 changes: 4 additions & 4 deletions xmls/NWA12/CEFI_NWA12_cobalt_fms2_yaml.xml
View file
Open in desktop
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.03"/>
<property name="FMS_GIT_TAG" value="2025.01"/>

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

<!-- git tag for shared source code -->
<property name="NULL_TAG" value="2023.04"/>
Expand All @@ -52,7 +52,7 @@ frecheck -r layout -p ncrc6.intel23 -x CEFI_NWA12_cobalt_fms2_yaml.xml CEFI_NWA1
<property name="MOM6_GIT_FIX" value="main"/> <!-- Trying new branch with bug fix for bgc obc index -->

<!-- customize as needed -->
<property name="FRE_STEM" value="fre/cefi/NWA/2024_11_FMS2"/>
<property name="FRE_STEM" value="fre/cefi/NWA/2025_02_YAML"/>

<!-- Please make sure to change your group, such as b, f, g, m, o... -->
<property name="NCRC_GROUP" value="ira-cefi"/>
Expand Down Expand Up @@ -163,7 +163,7 @@ frecheck -r layout -p ncrc6.intel23 -x CEFI_NWA12_cobalt_fms2_yaml.xml CEFI_NWA1

<component name="atmos_null" paths="mom6/src/atmos_null" requires="fms">
<source versionControl="git" root="https://github.com/NOAA-GFDL">
<codeBase version="$(NULL_TAG)"> atmos_null.git </codeBase>
<codeBase version="$(CPL_GIT_TAG)"> atmos_null.git </codeBase>
</source>
<compile>
<cppDefs>$(F2003_FLAGS) </cppDefs>
Expand Down
Loading