Skip to content

update with fv3 & ccpp/physics updates in order to turn the NSST model on in the coupled model #453

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

Closed
XuLi-NOAA wants to merge 5 commits into from
Closed

update with fv3 & ccpp/physics updates in order to turn the NSST model on in the coupled model #453

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
a39e138
update with fv3 merge
XuLi-NOAA Mar 5, 2021
8d708a9
Modifcations to tun the rt, including adding a new test: cpld_control…
XuLi-NOAA Mar 16, 2021
da7506a
Merge remote-tracking branch 'upstream/develop' into feature/ufs-nst
XuLi-NOAA Mar 24, 2021
a6b7225
merge to the develop branch in ufs-weather-model
XuLi-NOAA Mar 24, 2021
4bbb2ab
Resolve conflict in rt.sh
XuLi-NOAA Mar 25, 2021
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 .gitmodules
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[submodule "FV3"]
path = FV3
url = https://github.com/NOAA-EMC/fv3atm
branch = develop
url = https://github.com/XuLi-NOAA/fv3atm
branch = feature/ufs-nst
[submodule "NEMS"]
path = NEMS
url = https://github.com/NOAA-EMC/NEMS
Expand Down
2 changes: 1 addition & 1 deletion FMS
Open in desktop
Submodule FMS updated 2 files
+1 −3 CHANGELOG.md
+5 −5 CMakeLists.txt
2 changes: 1 addition & 1 deletion FV3
Open in desktop
Submodule FV3 updated 4 files
+2 −2 .gitmodules
+1 −1 ccpp/physics
+94 −0 ccpp/suites/suite_FV3_GFS_v15p2_couplednsst.xml
+1 −1 io/FV3GFS_io.F90
2 changes: 1 addition & 1 deletion MOM6-interface/MOM6
Open in desktop
Submodule MOM6 updated 53 files
+3 −3 .gitlab-ci.yml
+11 −9 .testing/Makefile
+4 −5 ac/configure.ac
+0 −0 config_src/coupled_driver/MOM_surface_forcing_gfdl.F90
+0 −0 config_src/coupled_driver/ocean_model_MOM.F90
+0 −0 config_src/dynamic/MOM_memory.h
+0 −0 config_src/dynamic_symmetric/MOM_memory.h
+0 −0 config_src/ice_solo_driver/atmos_ocean_fluxes.F90
+0 −0 config_src/ice_solo_driver/ice_shelf_driver.F90
+0 −0 config_src/mct_driver/mom_ocean_model_mct.F90
+0 −0 config_src/mct_driver/mom_surface_forcing_mct.F90
+0 −0 config_src/mct_driver/ocn_cap_methods.F90
+0 −0 config_src/mct_driver/ocn_comp_mct.F90
+0 −0 config_src/mct_driver/ocn_cpl_indices.F90
+0 −0 config_src/nuopc_driver/mom_cap.F90
+0 −0 config_src/nuopc_driver/mom_cap_methods.F90
+0 −0 config_src/nuopc_driver/mom_cap_time.F90
+0 −0 config_src/nuopc_driver/mom_ocean_model_nuopc.F90
+0 −0 config_src/nuopc_driver/mom_surface_forcing_nuopc.F90
+0 −0 config_src/nuopc_driver/ocn_comp_NUOPC.F90
+0 −0 config_src/nuopc_driver/time_utils.F90
+0 −0 config_src/solo_driver/MESO_surface_forcing.F90
+0 −0 config_src/solo_driver/MOM_driver.F90
+0 −0 config_src/solo_driver/MOM_surface_forcing.F90
+0 −0 config_src/solo_driver/atmos_ocean_fluxes.F90
+0 −0 config_src/solo_driver/user_surface_forcing.F90
+0 −0 config_src/unit_drivers/MOM_sum_driver.F90
+4 −4 docs/Doxyfile_nortd
+4 −4 docs/Doxyfile_nortd_latex
+4 −4 docs/Doxyfile_rtd
+7 −7 docs/Doxyfile_rtd_dox
+8 −12 docs/README.md
+15 −22 docs/code_organization.rst
+15 −86 src/core/MOM_CoriolisAdv.F90
+21 −75 src/core/MOM_barotropic.F90
+6 −90 src/core/MOM_dynamics_split_RK2.F90
+0 −3 src/core/MOM_variables.F90
+2 −2 src/diagnostics/MOM_diagnostics.F90
+0 −0 src/framework/MOM_coms_infra.F90
+0 −0 src/framework/MOM_constants.F90
+0 −0 src/framework/MOM_couplertype_infra.F90
+0 −0 src/framework/MOM_cpu_clock_infra.F90
+0 −0 src/framework/MOM_data_override_infra.F90
+0 −0 src/framework/MOM_diag_manager_infra.F90
+0 −0 src/framework/MOM_domain_infra.F90
+0 −0 src/framework/MOM_ensemble_manager_infra.F90
+0 −0 src/framework/MOM_error_infra.F90
+0 −0 src/framework/MOM_interp_infra.F90
+0 −0 src/framework/MOM_io_infra.F90
+0 −0 src/framework/MOM_time_manager.F90
+2 −33 src/parameterizations/lateral/MOM_hor_visc.F90
+1 −1 src/parameterizations/vertical/MOM_diabatic_driver.F90
+2 −2 src/parameterizations/vertical/MOM_vert_friction.F90
2 changes: 1 addition & 1 deletion WW3
Open in desktop
Submodule WW3 updated 189 files
2 changes: 1 addition & 1 deletion stochastic_physics
Open in desktop
Submodule stochastic_physics updated from d0e62e to c39bb8
11 changes: 6 additions & 5 deletions tests/rt.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,11 +133,12 @@ RUN | fv3_gfs_v16_ras_debug
# CPLD tests #
###################################################################################################################################################################################

COMPILE | APP=S2S SUITES=FV3_GFS_2017_coupled,FV3_GFS_2017_satmedmf_coupled,FV3_GFS_v15p2_coupled,FV3_GFS_v16_coupled | - wcoss_cray jet.intel | fv3 |
RUN | cpld_control | - wcoss_cray jet.intel | fv3 |
RUN | cpld_restart | - wcoss_cray jet.intel | | cpld_control
RUN | cpld_controlfrac | - wcoss_cray jet.intel | fv3 |
RUN | cpld_restartfrac | - wcoss_cray jet.intel | | cpld_controlfrac
COMPILE | APP=S2S SUITES=FV3_GFS_2017_coupled,FV3_GFS_2017_satmedmf_coupled,FV3_GFS_v15p2_coupled,FV3_GFS_v16_coupled FV3_GFS_v15p2_couplednsst | - wcoss_cray jet.intel | fv3 |
RUN | cpld_control | - wcoss_cray jet.intel | fv3 |
RUN | cpld_control_nsst | - wcoss_cray jet.intel | fv3 |
RUN | cpld_restart | - wcoss_cray jet.intel | | cpld_control
RUN | cpld_controlfrac | - wcoss_cray jet.intel | fv3 |
RUN | cpld_restartfrac | - wcoss_cray jet.intel | | cpld_controlfrac

RUN | cpld_2threads | - wcoss_cray jet.intel | |
RUN | cpld_decomp | - wcoss_cray jet.intel | |
Expand Down
4 changes: 2 additions & 2 deletions tests/rt.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@ if [[ $MACHINE_ID = wcoss_cray ]]; then
QUEUE=debug
COMPILE_QUEUE=dev
PARTITION=
ACCNR=GFS-DEV
ACCNR=DA-DEV
if [[ -d /gpfs/hps3/ptmp ]] ; then
STMP=/gpfs/hps3/stmp
PTMP=/gpfs/hps3/stmp
Expand Down Expand Up @@ -242,7 +242,7 @@ elif [[ $MACHINE_ID = hera.* ]]; then
QUEUE=batch
COMPILE_QUEUE=batch

#ACCNR=fv3-cpu
ACCNR=da-cpu

@DeniseWorthen DeniseWorthen Mar 16, 2021

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please revert these two changes to ACCNR.

@XuLi-NOAA XuLi-NOAA Mar 16, 2021

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please revert these two changes to ACCNR.

Will do in the final push, and that's why I didn't push it earlier. Thanks!

PARTITION=
dprefix=/scratch1/NCEPDEV
DISKNM=$dprefix/nems/emc.nemspara/RT
Expand Down