Skip to content

Commit

Permalink
update cime and submodules to be consistent with cime6.1
Browse files Browse the repository at this point in the history
  • Loading branch information
mvdebolskiy committed Nov 18, 2024
1 parent 2b35558 commit cbe6f93
Show file tree
Hide file tree
Showing 7 changed files with 14 additions and 14 deletions.
16 changes: 8 additions & 8 deletions .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ fxDONOTUSEurl = https://github.com/ESCOMP/MOSART
[submodule "mizuRoute"]
path = components/mizuRoute
url = https://github.com/ESCOMP/mizuRoute
fxtag = cesm-coupling.n02_v2.1.2
fxtag = cesm-coupling.n02_v2.1.3
fxrequired = ToplevelRequired
# Standard Fork to compare to with "git fleximod test" to ensure personal forks aren't committed
fxDONOTUSEurl = https://github.com/ESCOMP/mizuRoute
Expand All @@ -75,32 +75,32 @@ fxDONOTUSEurl = https://github.com/NorESMhub/ccs_config_noresm

[submodule "cime"]
path = cime
url = https://github.com/ESMCI/cime
url = https://github.com/NorESMhub/cime
fxtag = cime6.1.28_noresm_v0
fxrequired = ToplevelRequired
# Standard Fork to compare to with "git fleximod test" to ensure personal forks aren't committed
fxDONOTUSEurl = https://github.com/ESMCI/cime

[submodule "cmeps"]
path = components/cmeps
url = https://github.com/ESCOMP/CMEPS.git
fxtag = cmeps0.14.77
url = https://github.com/NorESMhub/CMEPS.git
fxtag = cmeps1.0.20_noresm_v0
fxrequired = ToplevelRequired
# Standard Fork to compare to with "git fleximod test" to ensure personal forks aren't committed
fxDONOTUSEurl = https://github.com/ESCOMP/CMEPS.git

[submodule "cdeps"]
path = components/cdeps
url = https://github.com/ESCOMP/CDEPS.git
fxtag = cdeps1.0.48
fxtag = cdeps1.0.53
fxrequired = ToplevelRequired
# Standard Fork to compare to with "git fleximod test" to ensure personal forks aren't committed
fxDONOTUSEurl = https://github.com/ESCOMP/CDEPS.git

[submodule "share"]
path = share
url = https://github.com/ESCOMP/CESM_share
fxtag = share1.0.19
url = https://github.com/NorESMhub/NorESM_share
fxtag = share1.1.2_noresm_v0
fxrequired = ToplevelRequired
# Standard Fork to compare to with "git fleximod test" to ensure personal forks aren't committed
fxDONOTUSEurl = https://github.com/ESCOMP/CESM_share
Expand All @@ -116,7 +116,7 @@ fxDONOTUSEurl = https://github.com/MCSclimate/MCT
[submodule "parallelio"]
path = libraries/parallelio
url = https://github.com/NCAR/ParallelIO
fxtag = pio2_6_2
fxtag = pio2_6_3
fxrequired = ToplevelRequired
# Standard Fork to compare to with "git fleximod test" to ensure personal forks aren't committed
fxDONOTUSEurl = https://github.com/NCAR/ParallelIO
Expand Down
2 changes: 1 addition & 1 deletion cime
Submodule cime updated from f4a637 to 7c52a0
2 changes: 1 addition & 1 deletion components/mizuRoute
Submodule mizuRoute updated 38 files
+0 −14 Externals.cfg
+ netcdf_test/stuff.nc
+53 −49 route/build/Makefile
+109 −0 route/build/README_NCAR_HPC_build
+0 −88 route/build/README_cheyenne_build
+6 −6 route/build/cpl/RtmMod.F90
+6 −0 route/build/cpl/nuopc/rof_comp_nuopc.F90
+21 −64 route/build/lib/Makefile
+32 −2 route/build/src/csv_data.f90
+7 −10 route/build/src/dataTypes.f90
+2 −0 route/build/src/dfw_route.f90
+6 −2 route/build/src/globalData.f90
+51 −17 route/build/src/histVars_data.f90
+23 −6 route/build/src/historyFile.f90
+488 −0 route/build/src/hydraulic.f90
+16 −2 route/build/src/init_model_data.f90
+5 −2 route/build/src/irf_route.f90
+2 −0 route/build/src/kwe_route.f90
+12 −2 route/build/src/kwt_route.f90
+3 −1 route/build/src/mc_route.f90
+48 −0 route/build/src/mpi_utils.f90
+1 −1 route/build/src/network_topo.f90
+246 −58 route/build/src/nr_utils.f90
+19 −14 route/build/src/popMetadat.f90
+0 −6 route/build/src/process_ntopo.f90
+1 −1 route/build/src/process_remap.f90
+35 −27 route/build/src/public_var.f90
+31 −1 route/build/src/read_control.f90
+1 −1 route/build/src/standalone/get_basin_runoff.f90
+65 −41 route/build/src/standalone/model_setup.f90
+237 −198 route/build/src/standalone/read_runoff.f90
+6 −1 route/build/src/var_lookup.f90
+33 −2 route/build/src/write_restart_pio.f90
+40 −21 route/build/src/write_simoutput_pio.f90
+0 −4 route/build/src/write_streamSeg.f90
+11 −4 route/settings/SAMPLE-coupled.control
+4 −2 route/settings/SAMPLE.control
+0 −2 route/settings/mizuRoute_control.py
2 changes: 1 addition & 1 deletion libraries/parallelio
2 changes: 1 addition & 1 deletion share
Submodule share updated 73 files
+54 −0 .github/actions/buildshare/action.yaml
+108 −0 .github/workflows/extbuild.yml
+0 −177 .github/workflows/srt.yml
+137 −0 CMakeLists.txt
+0 −31 README
+8 −12 buildlib.csm_share
+71 −0 cmake/Compilers.cmake
+147 −0 cmake/FindESMF.cmake
+134 −0 cmake/Sourcelist_utils.cmake
+169 −0 cmake/add_pfunit_ctest.cmake
+90 −0 cmake/genf90_utils.cmake
+10 −17 src/CMakeLists.txt
+0 −19 src/esmf_wrf_timemgr/CMakeLists.txt
+0 −19 src/esmf_wrf_timemgr/ESMF.F90
+0 −102 src/esmf_wrf_timemgr/ESMF_AlarmClockMod.F90
+0 −1,040 src/esmf_wrf_timemgr/ESMF_AlarmMod.F90
+0 −1,089 src/esmf_wrf_timemgr/ESMF_BaseMod.F90
+0 −459 src/esmf_wrf_timemgr/ESMF_BaseTimeMod.F90
+0 −502 src/esmf_wrf_timemgr/ESMF_CalendarMod.F90
+0 −1,247 src/esmf_wrf_timemgr/ESMF_ClockMod.F90
+0 −83 src/esmf_wrf_timemgr/ESMF_FractionMod.F90
+0 −36 src/esmf_wrf_timemgr/ESMF_Macros.inc
+0 −45 src/esmf_wrf_timemgr/ESMF_ShrTimeMod.F90
+0 −167 src/esmf_wrf_timemgr/ESMF_Stubs.F90
+0 −1,739 src/esmf_wrf_timemgr/ESMF_TimeIntervalMod.F90
+0 −45 src/esmf_wrf_timemgr/ESMF_TimeMgr.inc
+0 −1,572 src/esmf_wrf_timemgr/ESMF_TimeMod.F90
+0 −60 src/esmf_wrf_timemgr/Makefile
+0 −65 src/esmf_wrf_timemgr/MeatMod.F90
+0 −19 src/esmf_wrf_timemgr/README
+0 −63 src/esmf_wrf_timemgr/unittests/Makefile
+0 −14 src/esmf_wrf_timemgr/unittests/go.csh
+0 −312 src/esmf_wrf_timemgr/unittests/test.F90
+0 −17 src/esmf_wrf_timemgr/unittests/wrf_stuff.F90
+0 −9 src/esmf_wrf_timemgr/wrf_error_fatal.F90
+0 −5 src/esmf_wrf_timemgr/wrf_message.F90
+1,468 −0 src/m_MergeSorts.F90
+0 −1,242 src/mct_mod.F90
+895 −0 src/nuopc_shr_methods.F90
+1 −1 src/shr_assert_mod.F90.in
+0 −16 src/shr_flds_mod.F90
+0 −3,463 src/shr_map_mod.F90
+0 −860 src/shr_mct_mod.F90
+2 −2 src/shr_mpi_mod.F90
+0 −817 src/shr_pcdf_mod.F90
+54 −23 src/shr_reprosum_mod.F90
+2 −2 src/shr_spfn_mod.F90
+1 −1 src/shr_sys_mod.F90
+0 −403 src/shr_taskmap_mod.F90
+0 −163 test/old_unit_testers/Makefile
+0 −327 test/old_unit_testers/Mkdepends
+0 −60 test/old_unit_testers/Mksrcfiles
+0 −212 test/old_unit_testers/bundle_expected.F90
+0 −7 test/old_unit_testers/config.h
+0 −369 test/old_unit_testers/make.Macros
+0 −10 test/old_unit_testers/namelist
+0 −2 test/old_unit_testers/nl/atm.stdin
+0 −2 test/old_unit_testers/nl/cpl.stdin
+0 −2 test/old_unit_testers/nl/ice.stdin
+0 −2 test/old_unit_testers/nl/lnd.stdin
+0 −2 test/old_unit_testers/nl/ocn.stdin
+0 −96 test/old_unit_testers/run_dshr_bundle_test
+0 −68 test/old_unit_testers/run_file_test
+0 −339 test/old_unit_testers/test_mod.F90
+0 −220 test/old_unit_testers/test_shr_file.F90
+0 −28 test/old_unit_testers/test_shr_log.F90
+0 −291 test/old_unit_testers/test_shr_mpi.F90
+0 −47 test/old_unit_testers/test_shr_orb.F90
+0 −156 test/old_unit_testers/test_shr_scam.F90
+0 −663 test/old_unit_testers/test_shr_streams.F90
+0 −75 test/old_unit_testers/test_shr_sys.F90
+0 −108 test/old_unit_testers/test_shr_tInterp.F90
+3 −6 test/unit/shr_cal_test/CMakeLists.txt

0 comments on commit cbe6f93

Please sign in to comment.