Skip to content

Commit

Permalink
Merge branch 'ufs-community:develop' into feature/ursa_port
Browse files Browse the repository at this point in the history
  • Loading branch information
ulmononian authored Dec 5, 2024
2 parents f7a9083 + a3c3bb5 commit 592112a
Show file tree
Hide file tree
Showing 13 changed files with 2,450 additions and 2,749 deletions.
2 changes: 1 addition & 1 deletion CICE-interface/CICE
Submodule CICE updated 36 files
+2 −4 cicecore/cicedyn/general/ice_flux.F90
+0 −2 cicecore/cicedyn/general/ice_forcing.F90
+18 −8 cicecore/cicedyn/general/ice_init.F90
+12 −17 cicecore/cicedyn/general/ice_step_mod.F90
+1 −2 cicecore/cicedyn/infrastructure/ice_domain.F90
+142 −192 cicecore/cicedyn/infrastructure/ice_grid.F90
+49 −106 cicecore/cicedyn/infrastructure/ice_read_write.F90
+1 −1 cicecore/cicedyn/infrastructure/io/io_netcdf/ice_restart.F90
+6 −0 cicecore/cicedyn/infrastructure/io/io_pio2/ice_history_write.F90
+22 −0 cicecore/cicedyn/infrastructure/io/io_pio2/ice_pio.F90
+13 −4 cicecore/cicedyn/infrastructure/io/io_pio2/ice_restart.F90
+10 −12 cicecore/drivers/mct/cesm1/CICE_InitMod.F90
+1 −3 cicecore/drivers/mct/cesm1/ice_prescribed_mod.F90
+4 −4 cicecore/drivers/nuopc/cmeps/CICE_InitMod.F90
+33 −32 cicecore/drivers/nuopc/cmeps/ice_comp_nuopc.F90
+10 −1 cicecore/drivers/nuopc/cmeps/ice_shr_methods.F90
+4 −4 cicecore/drivers/nuopc/dmi/CICE_InitMod.F90
+4 −4 cicecore/drivers/standalone/cice/CICE_InitMod.F90
+4 −4 cicecore/drivers/unittest/gridavgchk/CICE_InitMod.F90
+4 −4 cicecore/drivers/unittest/halochk/CICE_InitMod.F90
+4 −4 cicecore/drivers/unittest/opticep/CICE_InitMod.F90
+1 −4 cicecore/drivers/unittest/opticep/ice_init_column.F90
+13 −18 cicecore/drivers/unittest/opticep/ice_step_mod.F90
+4 −4 cicecore/drivers/unittest/sumchk/CICE_InitMod.F90
+1 −4 cicecore/shared/ice_init_column.F90
+1 −1 cicecore/version.txt
+11 −0 configuration/scripts/cice.batch.csh
+0 −1 configuration/scripts/ice_in
+2 −2 configuration/scripts/machines/Macros.gadi_intel
+8 −0 configuration/scripts/options/set_nml.histhrly
+9 −13 configuration/scripts/tests/base_suite.ts
+3 −0 configuration/scripts/tests/io_suite.ts
+2 −2 doc/source/conf.py
+0 −1 doc/source/user_guide/ug_case_settings.rst
+17 −8 doc/source/user_guide/ug_implementation.rst
+1 −1 icepack
2 changes: 1 addition & 1 deletion tests/bl_date.conf
Original file line number Diff line number Diff line change
@@ -1 +1 @@
export BL_DATE=20241121
export BL_DATE=20241127
1 change: 1 addition & 0 deletions tests/default_vars.sh
Original file line number Diff line number Diff line change
Expand Up @@ -1240,6 +1240,7 @@ export_cice6() {
CICE_DIAGFREQ=$(( (FHMAX*3600)/DT_CICE ))
export CICE_DIAGFREQ
export CICE_HISTFREQ_N="0, 0, 6, 0, 0"
export CICE_hist_suffix="'x','x','x','x','x'"
export CICE_HIST_AVG=.true.
export CICE_HISTORY_DIR=./history/
export CICE_INCOND_DIR=./history/
Expand Down
520 changes: 260 additions & 260 deletions tests/logs/RegressionTests_acorn.log

Large diffs are not rendered by default.

575 changes: 289 additions & 286 deletions tests/logs/RegressionTests_derecho.log

Large diffs are not rendered by default.

684 changes: 297 additions & 387 deletions tests/logs/RegressionTests_gaea.log

Large diffs are not rendered by default.

822 changes: 377 additions & 445 deletions tests/logs/RegressionTests_hera.log

Large diffs are not rendered by default.

825 changes: 443 additions & 382 deletions tests/logs/RegressionTests_hercules.log

Large diffs are not rendered by default.

554 changes: 242 additions & 312 deletions tests/logs/RegressionTests_jet.log

Large diffs are not rendered by default.

581 changes: 290 additions & 291 deletions tests/logs/RegressionTests_orion.log

Large diffs are not rendered by default.

464 changes: 232 additions & 232 deletions tests/logs/RegressionTests_wcoss2.log

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions tests/parm/ice_in.IN
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@
histfreq = 'm','d','h','1','x'
histfreq_n = @[CICE_HISTFREQ_N]
hist_avg = @[CICE_HIST_AVG]
hist_suffix = @[CICE_hist_suffix]
history_dir = '@[CICE_HISTORY_DIR]'
history_file = 'iceh'
write_ic = .true.
Expand Down
168 changes: 16 additions & 152 deletions tests/test_changes.list
Original file line number Diff line number Diff line change
Expand Up @@ -32,158 +32,22 @@ cpld_control_pdlib_p8 intel
cpld_restart_pdlib_p8 intel
cpld_mpi_pdlib_p8 intel
cpld_debug_pdlib_p8 intel
control_CubedSphereGrid intel
control_CubedSphereGrid_parallel intel
control_latlon intel
control_wrtGauss_netcdf_parallel intel
control_c48 intel
control_c192 intel
control_c384 intel
control_p8 intel
control_p8.v2.sfc intel
control_p8_ugwpv1 intel
control_restart_p8 intel
control_noqr_p8 intel
control_restart_noqr_p8 intel
control_decomp_p8 intel
control_2threads_p8 intel
control_p8_lndp intel
control_p8_rrtmgp intel
control_p8_mynn intel
merra2_thompson intel
regional_control intel
regional_restart intel
regional_decomp intel
regional_2threads intel
regional_noquilt intel
regional_netcdf_parallel intel
regional_2dwrtdecomp intel
rap_control intel
regional_spp_sppt_shum_skeb intel
rap_decomp intel
rap_2threads intel
rap_restart intel
rap_sfcdiff intel
rap_sfcdiff_decomp intel
rap_sfcdiff_restart intel
hrrr_control intel
hrrr_control_decomp intel
hrrr_control_2threads intel
hrrr_control_restart intel
rrfs_v1beta intel
control_wam intel
control_p8_faster intel
regional_control_faster intel
control_CubedSphereGrid_debug intel
control_wrtGauss_netcdf_parallel_debug intel
control_diag_debug intel
control_debug_p8 intel
regional_debug intel
rap_control_debug intel
hrrr_control_debug intel
hrrr_gf_debug intel
hrrr_c3_debug intel
rap_unified_drag_suite_debug intel
rap_diag_debug intel
rap_cires_ugwp_debug intel
rap_unified_ugwp_debug intel
rap_lndp_debug intel
rap_progcld_thompson_debug intel
rap_noah_debug intel
rap_sfcdiff_debug intel
rap_noah_sfcdiff_cires_ugwp_debug intel
rrfs_v1beta_debug intel
rap_clm_lake_debug intel
rap_flake_debug intel
gnv1_c96_no_nest_debug intel
control_wam_debug intel
regional_spp_sppt_shum_skeb_dyn32_phy32 intel
rap_control_dyn32_phy32 intel
hrrr_control_dyn32_phy32 intel
rap_2threads_dyn32_phy32 intel
hrrr_control_2threads_dyn32_phy32 intel
hrrr_control_decomp_dyn32_phy32 intel
rap_restart_dyn32_phy32 intel
hrrr_control_restart_dyn32_phy32 intel
conus13km_control intel
conus13km_2threads intel
conus13km_restart_mismatch intel
rap_control_dyn64_phy32 intel
rap_control_debug_dyn32_phy32 intel
hrrr_control_debug_dyn32_phy32 intel
conus13km_debug intel
conus13km_debug_qr intel
conus13km_debug_2threads intel
conus13km_radar_tten_debug intel
rap_control_dyn64_phy32_debug intel
hafs_regional_atm_thompson_gfdlsf intel
gnv1_nested intel
atm_ds2s_docn_pcice intel
datm_cdeps_control_cfsr intel
datm_cdeps_restart_cfsr intel
datm_cdeps_control_gefs intel
datm_cdeps_iau_gefs intel
datm_cdeps_stochy_gefs intel
datm_cdeps_ciceC_cfsr intel
datm_cdeps_bulk_cfsr intel
datm_cdeps_bulk_gefs intel
datm_cdeps_mx025_cfsr intel
datm_cdeps_mx025_gefs intel
datm_cdeps_multiple_files_cfsr intel
datm_cdeps_3072x1536_cfsr intel
datm_cdeps_gfs intel
datm_cdeps_debug_cfsr intel
datm_cdeps_control_cfsr_faster intel
atm_ds2s_docn_dice intel
control_p8_atmlnd_sbs intel
control_p8_atmlnd intel
control_restart_p8_atmlnd intel
control_p8_atmlnd_debug intel
atmwav_control_noaero_p8 intel
atmaero_control_p8 intel
atmaero_control_p8_rad intel
atmaero_control_p8_rad_micro intel
control_c48 gnu
control_p8 gnu
control_p8_ugwpv1 gnu
rap_control gnu
rap_decomp gnu
rap_2threads gnu
rap_restart gnu
rap_sfcdiff gnu
rap_sfcdiff_decomp gnu
rap_sfcdiff_restart gnu
hrrr_control gnu
hrrr_control_noqr gnu
hrrr_control_2threads gnu
hrrr_control_decomp gnu
hrrr_control_restart gnu
hrrr_control_restart_noqr gnu
rrfs_v1beta gnu
control_diag_debug gnu
regional_debug gnu
rap_control_debug gnu
hrrr_control_debug gnu
hrrr_gf_debug gnu
hrrr_c3_debug gnu
rap_diag_debug gnu
rap_noah_sfcdiff_cires_ugwp_debug gnu
rap_progcld_thompson_debug gnu
rrfs_v1beta_debug gnu
control_debug_p8 gnu
rap_flake_debug gnu
rap_clm_lake_debug gnu
gnv1_c96_no_nest_debug gnu
rap_control_dyn32_phy32 gnu
hrrr_control_dyn32_phy32 gnu
rap_2threads_dyn32_phy32 gnu
hrrr_control_2threads_dyn32_phy32 gnu
hrrr_control_decomp_dyn32_phy32 gnu
rap_restart_dyn32_phy32 gnu
hrrr_control_restart_dyn32_phy32 gnu
conus13km_control gnu
conus13km_2threads gnu
conus13km_restart_mismatch gnu
rap_control_dyn64_phy32 gnu
rap_control_debug_dyn32_phy32 gnu
hrrr_control_debug_dyn32_phy32 gnu
conus13km_debug gnu
conus13km_debug_qr gnu
conus13km_debug_2threads gnu
conus13km_radar_tten_debug gnu
rap_control_dyn64_phy32_debug gnu
cpld_control_nowave_noaero_p8 gnu
cpld_control_pdlib_p8 gnu
cpld_regional_atm_fbh intel
control_c48_lnd_iau intel
cpld_control_gfsv17 intelllvm
cpld_debug_gfsv17 intelllvm
cpld_control_sfs intelllvm
cpld_control_p8 intelllvm
rap_control_dyn32_phy32 intelllvm
rap_control_dyn64_phy32 intelllvm
datm_cdeps_control_cfsr gnu

0 comments on commit 592112a

Please sign in to comment.