Skip to content

Commit

Permalink
Merge ufs-community develop into gsl/develop (NCAR#119)
Browse files Browse the repository at this point in the history
* Add ufs driver. Remove NEMS submodule. Update CMEPS. Update CDEPS. Feature/ort addition.  (ufs-community#931)

* Add UFS driver, a copy of two fortran files from the NEMS repository. Remove NEMS submodule.

* Update CMEPS for current escomp/master. Implement the ability to write mediator history files for ATM on tiles rather than mesh

* Update CDEPS component. The updated CDEPS includes code updates for GFS v16 data mode.

* Operation requirement test (ORT) for:
  - cpld_control_p7 thread and decomposition tests
  - cpld_bmark_p7 thread and decomposition tests
  - Due to the wave component in these tests, restart and debug do not work

Co-authored-by: Minsuk Ji <[email protected]>
Co-authored-by: Denise Worthen <[email protected]>
Co-authored-by: BinLi-NOAA <[email protected]>

* fv3atm cap cleanup (ufs-community#954)

FV3 nuopc cap code cleanup. Remove used code/variables. Fix minor inconsistencies.

* CCPP cloud cover change for Thompson MP associated with Xu Randall, several bug fixes for regression testing scripts (ufs-community#962)

This PR contains code changes 1) to remove old comments in GFS_typedefs.F90, increase cloud cover for Thompson MP by passing convective cloud water mixing ratio to progcld6. 2) Updates for auto fixes

Co-authored-by: Dusan Jovic <[email protected]>

* ccpp-physics ufs-community#806, #807, ufs-community#813, and ort modifications (ufs-community#970)

- CCPP Physics changes: see Wrapper for ccpp-physics ufs-community#806, #807, ufs-community#813, NOAA-EMC/fv3atm#447.
- UFS weather model changes for ORT updates following changes in Fix Auto-RT on Gaea, Jet and Orion ufs-community#965

* Wrapper for ccpp-physics ufs-community#808 and 816 (roughness length over ice and NoahMP tsurf bugfix) (ufs-community#971)

* update submodule pointer for regression testing for ccpp-physics ufs-community#808,816: roughness length over ice and NoahMP tsurf bugfix
* Reduce time step from 600s to 450s for tests control_csawmg and control_csawmg_debug

Co-authored-by: Dom Heinzeller <[email protected]>
Co-authored-by: climbfuji <[email protected]>

* Use 'model set run clock' routine in FV3 NUOPC cap. (ufs-community#967)

* Update FV3 cap by adding 'model set run clock' specialization routine. Because FV3 cap does not modify 'Earth clock' anymore in case of a restarted run, that adjustment is now done in the UFS driver.
* Fix model_configure file for two tests to define `fhrot` parameter.

* Revert iovr=4 (exponential cloud overlap method) in RRTMG (ufs-community#963)

Revert/cleanup iovr=4 in RRTMG per developer's request. The current exponential cloud overlapping method used in RRTMG represents the method used in the pre-2018 operational HWRF model.

* Add fhzero ort test (ufs-community#977)

* Fhzero ORT applies to the two tests `control` and `control_p7`
* Test can be run by invoking, for example, `./opnReqTest -n control -c fhz`

* Add a new CDEPS test to use GSFv16 data mode in CDEPS ,update rt_weekly.conf and update MOM6 to main branch (20211220) (ufs-community#976)

* add a new cdeps test using GFS data mode
* update rt_weekly.conf to include cpld_bmark_p7_35d tests
* update MOM6

Co-authored-by: jiandewang <[email protected]>

* Bug fixes for WAM physics and regression tests, remove duplicate modules from ccpp-physics CMakeLists.txt (ufs-community#947)

*adds a new regression test control_wam_debug and fixes problems with the existing control_wam test (e.g. IAER was not set as intended).

* Update global inline post for outputting foundation temperature (ufs-community#968)

Update upp submodule in fv3atm with latest UPP version for outputting foundation temperature and fixing land-sea mask issue in global inline post.

* Regression test bug fixes for running on Jet or with Rocoto (ufs-community#981)

* Bug fixes for running on jet or with rocoto
1. Correctly detect Jet when deciding build job runtimes
2. Do not delete out and err files in compile & test jobs
3. Correct dependencies for WW3 in Rocoto
4. Do not hard-code ACCNR to h-nems
This PR also contains fv3/ccpp physics (CCPP PR#812) updates that implements a vertically-integrated formula to properly compute tracer column mass and ensure mass conservation for all tracers except TKE. See issue NCAR/ccpp-physics#811 for details

* MYNN sfclay (RAP suite) restart reproducibility (ufs-community#984)

*This PR turns on the rap_restart tests. Bit-for-bit reproducibility is achieved with the bug fixes for MYNN sfclay in the associated fv3atm and ccpp-physics PRs.

* fixes on initializing snow over fractional ice and GFS_surface_composite and z0ice value change (ufs-community#996)

* Radar-derived microphysics temperature tendencies similar to operational HRRR (ufs-community#986)

This PR implements a feature of the operational HRRR, radar-derived microphysics temperature tendencies applied in the first N minutes of the forecast to improve clouds in the first few hours. Two regression tests are added.

* Turn on CICE albedo use by ATM for coupled model; update Prototype test suite to initial P8 configuration;  (ufs-community#944)

* add updates for suites, tests for initial P8 configuration
* add IOPT_SFC=3 as default; set IOPT_SFC=1 in p7 tests
* change min_seaice to 1e-6; set to 1e-11 in p7 tests
* set dddmp=0.1 in both P7 and P8. This matches the final
P7 configuration. It will change P7 baselines.
* set cdmbwd in both P7 and P8 to the final P7 configuration.
(1.0,2.2,1.0,1.0) for all resolutions. It will change P7 baselines.
* add dusan's ecflow fix for wcoss2
* update FV3 with Moorthis' snod fix
* update rt_weekly to use p8 tests
* change integration length to 5 days

* Thompson MP cloud tuning (ufs-community#1005)

* improves cloud fraction when using Thompson MP. See NCAR/ccpp-physics#809 for more details.

* Add a new HAFS regression test with Thompson MP and GFDL surface layer schemes and Corrected S4 template regression testing job card (ufs-community#995)

* Added a new regression test for HAFS. 
* Fixed the S4 RT template job card.

Co-authored-by: David Huber <[email protected]>
Co-authored-by: Bin Liu <[email protected]>

* CCPP: Update consistency checks and effective radii calculation for Thompson MP (ufs-community#1000)

This PR contains changes in ccpp-physics (Update consistency checks and effective radii calculation for Thompson MP) and adds two new regression tests for both Intel and GNU that use the new prognostic cloud scheme progcld_thompson with GFS v16 and with RAP. The new cloud scheme is activated by setting icloud == 3 in input.nml.

* Rremove nems_datm related code, update CDEPS, and remove run directories that are no longer needed by other tests (ufs-community#1008)

* Add fhzero ort to coupled tests (ufs-community#1009)

* Add fhz ort to cpld tests
* Set ACCNR in rt.sh, not detect_machine.sh. Add some comments explaining where the variable should not be set or used.

Co-authored-by: Samuel Trahan <[email protected]>

* Unified write_netcdf, add single file 'cubed_sphere_grid' output (ufs-community#1011)

* Unify write_netcdf and write_netcdf_parallel modules.
* Add support for writing 'cubed_sphere_grid' history files in a single netcdf file.

* Change standard name and unit of CCPP error flag variable in CCPP framework and physics (ufs-community#1013)

* updates the submodule pointers for fv3atm, ccpp-framework and ccpp-physics for:  Change standard name and unit of CCPP error flag variable in CCPP framework and physics.

* ESMF managed threading (ufs-community#1018)

Add code updates to enable the ESMF managed threading in UFS.


Co-authored-by: Gerhard Theurich <[email protected] >

* sync-ww3 (ufs-community#1026)

* sync with ww3 develop branch

* Revisions to repair iovr=5 cloud overlap option (ufs-community#1025)

* This PR addresses part 2 of issue ufs-community#748 to activate the exponential-random cloud overlap method (iovr=5) in RRTMG. RT tests were added for  iovr=4 and iovr=5 options
* change iovr to use the environment variable in control.nml.IN; modify all tests that use control.nml.IN to set env. var. iovr=3 (except for new tests); remove restart files from new tests

* 2D decomposition on write grid, bug fix in FV3GFS_IO.F90, and quad precision in stochastic physics (ufs-community#1028)

- The 2D decomposition is enabled on write grid component.
- FV3atm PR NOAA-EMC/fv3atm#468 from @MicroTed 
- stochastic physics PR NOAA-PSL/stochastic_physics#53 from Dom.

Co-authored-by: Ted Mansell <[email protected]>
Co-authored-by: Dom Heinzeller <[email protected]>

* Update CMEPS for wave coupling (ufs-community#1034)


* add run phases to allow waves to run in the slow loop
* re-order hafs wave test
* update aliases in fd_nems.yaml
* update CMEPS to prevent advertise conflicts when s2sw is
still using connectors
* add correct masking variables to hafs nems.configure files

* 4DIAU bug fix when iau_filter_increments=T (ufs-community#990)

* Add lsm_cold_start variable for RUC LSM SCM support and gwdps bugfix (combined) (ufs-community#1037)

Co-authored-by: @SMoorthi-emc

* Update esmf 821b04 (ufs-community#1041)

* Update the version of ESMF library to 8.2.1b04
* Add the write group lon info for upp 2d decomposition test.

* Multiple output (nested) grids from fv3atm (ufs-community#1044)

Update fv3atm to support writing multiple history files for parent and nested domains.
Nested HAFS regression tests were updated to write out history files from all nested domains.

Co-authored-by: Bin Liu <[email protected]>

* GPU-enabled version of Grell-Freitas convection in ccpp-physics (ufs-community#1043)

* Enable Thompson microphysics with UFS-Aerosols and update GOCART (ufs-community#1049)

This update allows the Thompson microphysics scheme to be used with prognostic aerosols (UFS-Aerosols) and updates GOCART to version 2.0.2.

* Add support for Stochastically Perturbed Parameterizations (SPP) in FV3 (ufs-community#982)

* Update CICE; add support for restart test when running single RT (was PR 1058); update MOM6 (was PR 1060) (ufs-community#1045)


* update cice
* (1) pointing MOM6 to testing branch (MOM6 main repo PR: mom-ocean/MOM6#1556 (comment))
    (2) add three new files in mom_cmake file
            core/MOM_porous_barriers.F90
            external/drifters/MOM_particles.F90
            external/drifters/MOM_particles_types.F90
    (3) explicitly set in MOM_input for all resolutions to reflect the default value changes in code to retain answer
        EPBL_MLD_BISECTION = True (default changed from T to F in this MOM6 PR)
        INTERNAL_WAVE_SPEED_BETTER_EST = False (default changed from F to T in this MOM6 PR)
        note BBL_USE_EOS now set to use the value of USE_EOS in this MOM6 PR,
        but we set BBL_USE_EOS explicit so it has no impact

* remove duplicated CHL input setting in MOM_input_template_050
* add support for restart tests while running single RT

* lateral boundary fix for regional runs (ufs-community#1050)

This PR fixes a transient increase in noise caused by incorrect processing of winds along the lateral boundary on the final acoustic time step before fresh boundary information is ingested into the model.

* Update pointer to FV3

* Point to Christina's branches.

* Update RT log for Hera Intel.

* Adding RT log for Hera GNU tests.

* Updating RT log for Jet Intel tests.

* Latest regression tests on Jet.

* Adding regression logs.

* Updating regression test date stamp.

* Point to GSL repositories for FV3 and FV3/ccpp/physics

Co-authored-by: Dusan Jovic <[email protected]>
Co-authored-by: Minsuk Ji <[email protected]>
Co-authored-by: Denise Worthen <[email protected]>
Co-authored-by: BinLi-NOAA <[email protected]>
Co-authored-by: Dom Heinzeller <[email protected]>
Co-authored-by: Dusan Jovic <[email protected]>
Co-authored-by: Grant Firl <[email protected]>
Co-authored-by: Dom Heinzeller <[email protected]>
Co-authored-by: mzhangw <[email protected]>
Co-authored-by: jiandewang <[email protected]>
Co-authored-by: WenMeng-NOAA <[email protected]>
Co-authored-by: Samuel Trahan (NOAA contractor) <[email protected]>
Co-authored-by: SMoorthi-emc <[email protected]>
Co-authored-by: ChunxiZhang-NOAA <[email protected]>
Co-authored-by: David Huber <[email protected]>
Co-authored-by: Bin Liu <[email protected]>
Co-authored-by: Samuel Trahan <[email protected]>
Co-authored-by: Jun Wang <[email protected]>
Co-authored-by: Gerhard Theurich <[email protected] >
Co-authored-by: Ali.Abdolali <[email protected]>
Co-authored-by: Ted Mansell <[email protected]>
Co-authored-by: Dom Heinzeller <[email protected]>
Co-authored-by: Jeff Whitaker <[email protected]>
Co-authored-by: DomHeinzeller <[email protected]>
Co-authored-by: Raffaele Montuoro <[email protected]>
Co-authored-by: JeffBeck-NOAA <[email protected]>
Co-authored-by: MatthewPyle-NOAA <[email protected]>
  • Loading branch information
1 parent a2a6a22 commit 4b6eb1a
Show file tree
Hide file tree
Showing 206 changed files with 13,924 additions and 7,304 deletions.
2 changes: 1 addition & 1 deletion .github/pull_request_template.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# PR Checklist

- [ ] Ths PR is up-to-date with the top of all sub-component repositories except for those sub-components which are the subject of this PR. Please consult the ufs-weather-model [wiki](https://github.com/ufs-community/ufs-weather-model/wiki/Making-code-changes-in-the-UFS-weather-model-and-its-subcomponents) if you are unsure how to do this.
- [ ] This PR is up-to-date with the top of all sub-component repositories except for those sub-components which are the subject of this PR. Please consult the ufs-weather-model [wiki](https://github.com/ufs-community/ufs-weather-model/wiki/Making-code-changes-in-the-UFS-weather-model-and-its-subcomponents) if you are unsure how to do this.

- [ ] This PR has been tested using a branch which is up-to-date with the top of all sub-component repositories except for those sub-components which are the subject of this PR

Expand Down
4 changes: 0 additions & 4 deletions .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,6 @@
path = FV3
url = https://github.com/NOAA-GSL/fv3atm
branch = gsl/develop
[submodule "NEMS"]
path = NEMS
url = https://github.com/NOAA-EMC/NEMS
branch = develop
[submodule "WW3"]
path = WW3
url = https://github.com/NOAA-EMC/WW3
Expand Down
1 change: 1 addition & 0 deletions CDEPS-interface/cdeps_files.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ list(APPEND cdeps_datm_files
CDEPS/datm/datm_datamode_cplhist_mod.F90
CDEPS/datm/datm_datamode_era5_mod.F90
CDEPS/datm/datm_datamode_gefs_mod.F90
CDEPS/datm/datm_datamode_gfs_mod.F90
CDEPS/datm/datm_datamode_jra_mod.F90
)

Expand Down
2 changes: 1 addition & 1 deletion CICE-interface/CICE
Submodule CICE updated 30 files
+1 −1 cicecore/cicedynB/analysis/ice_diagnostics.F90
+16 −13 cicecore/cicedynB/analysis/ice_history.F90
+17 −14 cicecore/cicedynB/analysis/ice_history_bgc.F90
+16 −14 cicecore/cicedynB/analysis/ice_history_drag.F90
+16 −13 cicecore/cicedynB/analysis/ice_history_fsd.F90
+16 −13 cicecore/cicedynB/analysis/ice_history_mechred.F90
+16 −13 cicecore/cicedynB/analysis/ice_history_pond.F90
+24 −22 cicecore/cicedynB/analysis/ice_history_snow.F90
+17 −17 cicecore/cicedynB/dynamics/ice_transport_remap.F90
+142 −41 cicecore/cicedynB/general/ice_init.F90
+15 −12 cicecore/cicedynB/infrastructure/ice_domain.F90
+10 −1 cicecore/cicedynB/infrastructure/io/io_pio2/ice_restart.F90
+16 −11 cicecore/drivers/mct/cesm1/ice_prescribed_mod.F90
+1 −5 cicecore/drivers/nuopc/cmeps/CICE_InitMod.F90
+10 −10 cicecore/drivers/nuopc/cmeps/CICE_RunMod.F90
+112 −76 cicecore/drivers/nuopc/cmeps/ice_comp_nuopc.F90
+3 −1 cicecore/drivers/nuopc/cmeps/ice_import_export.F90
+2 −5 cicecore/drivers/nuopc/cmeps/ice_mesh_mod.F90
+14 −13 cicecore/shared/ice_init_column.F90
+20 −1 configuration/scripts/cice.batch.csh
+1 −1 configuration/scripts/cice.launch.csh
+59 −0 configuration/scripts/machines/Macros.narwhal_aocc
+60 −0 configuration/scripts/machines/Macros.narwhal_cray
+67 −0 configuration/scripts/machines/Macros.narwhal_gnu
+57 −0 configuration/scripts/machines/Macros.narwhal_intel
+52 −0 configuration/scripts/machines/env.narwhal_aocc
+53 −0 configuration/scripts/machines/env.narwhal_cray
+52 −0 configuration/scripts/machines/env.narwhal_gnu
+52 −0 configuration/scripts/machines/env.narwhal_intel
+27 −0 configuration/scripts/tests/perf_suite.ts
2 changes: 1 addition & 1 deletion CMEPS-interface/CMEPS
Submodule CMEPS updated 75 files
+9 −14 .github/pull_request_template.md
+153 −0 .github/workflows/srt.yml
+2 −2 CMakeLists.txt
+0 −77 Makefile
+0 −0 cesm/driver/ensemble_driver.F90
+0 −0 cesm/driver/esm.F90
+0 −0 cesm/driver/esmApp.F90
+0 −0 cesm/driver/esm_time_mod.F90
+0 −0 cesm/driver/esm_utils_mod.F90
+0 −0 cesm/driver/t_driver_timers_mod.F90
+0 −0 cesm/driver/util.F90
+2,299 −0 cesm/flux_atmocn/shr_flux_mod.F90
+569 −0 cesm/nuopc_cap_share/glc_elevclass_mod.F90
+0 −0 cesm/nuopc_cap_share/nuopc_shr_methods.F90
+1,220 −0 cesm/nuopc_cap_share/seq_drydep_mod.F90
+76 −0 cesm/nuopc_cap_share/shr_carma_mod.F90
+185 −0 cesm/nuopc_cap_share/shr_expr_parser_mod.F90
+298 −0 cesm/nuopc_cap_share/shr_fire_emis_mod.F90
+310 −0 cesm/nuopc_cap_share/shr_megan_mod.F90
+106 −0 cesm/nuopc_cap_share/shr_ndep_mod.F90
+124 −0 cesm/nuopc_cap_share/shr_ozone_coupling_mod.F90
+3 −3 cime_config/buildexe
+12 −17 cime_config/buildnml
+15 −1 cime_config/config_component.xml
+0 −567 cime_config/config_component_ufs.xml
+49 −32 cime_config/namelist_definition_drv.xml
+2 −1 cime_config/runseq/runseq_general.py
+1 −1 mediator/CMakeLists.txt
+54 −111 mediator/esmFlds.F90
+78 −55 mediator/esmFldsExchange_cesm_mod.F90
+20 −20 mediator/esmFldsExchange_hafs_mod.F90
+79 −6 mediator/esmFldsExchange_nems_mod.F90
+7 −0 mediator/fd_cesm.yaml
+116 −390 mediator/med.F90
+5 −0 mediator/med_constants_mod.F90
+399 −189 mediator/med_diag_mod.F90
+27 −24 mediator/med_fraction_mod.F90
+494 −47 mediator/med_internalstate_mod.F90
+54 −17 mediator/med_io_mod.F90
+72 −59 mediator/med_map_mod.F90
+1 −2 mediator/med_merge_mod.F90
+452 −208 mediator/med_phases_aofluxes_mod.F90
+64 −29 mediator/med_phases_history_mod.F90
+2 −2 mediator/med_phases_ocnalb_mod.F90
+16 −2 mediator/med_phases_post_atm_mod.F90
+57 −30 mediator/med_phases_post_glc_mod.F90
+1 −13 mediator/med_phases_post_ice_mod.F90
+3 −4 mediator/med_phases_post_lnd_mod.F90
+15 −15 mediator/med_phases_post_ocn_mod.F90
+1 −1 mediator/med_phases_post_rof_mod.F90
+1 −1 mediator/med_phases_post_wav_mod.F90
+9 −12 mediator/med_phases_prep_atm_mod.F90
+158 −163 mediator/med_phases_prep_glc_mod.F90
+2 −2 mediator/med_phases_prep_ice_mod.F90
+1 −1 mediator/med_phases_prep_lnd_mod.F90
+1 −3 mediator/med_phases_prep_ocn_mod.F90
+1 −1 mediator/med_phases_prep_rof_mod.F90
+133 −64 mediator/med_phases_prep_wav_mod.F90
+5 −1 mediator/med_phases_profile_mod.F90
+19 −2 mediator/med_phases_restart_mod.F90
+6 −0 ufs/CMakeLists.txt
+28 −83 ufs/flux_atmocn_mod.F90
+2 −2 ufs/glc_elevclass_mod.F90
+0 −0 ufs/perf_mod.F90
+3 −8 ufs/ufs_const_mod.F90
+2 −2 ufs/ufs_kind_mod.F90
+0 −7 util/CMakeLists.txt
+0 −50 util/Makefile
+0 −5 util/dtypes.h
+0 −387 util/genf90.pl
+0 −164 util/shr_abort_mod.F90
+0 −26 util/shr_log_mod.F90
+0 −17 util/shr_mem_mod.F90
+0 −2,217 util/shr_mpi_mod.F90
+0 −320 util/shr_sys_mod.F90
15 changes: 5 additions & 10 deletions CMEPS-interface/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -19,16 +19,11 @@ else()
endif()

list(APPEND _nems_util_files
CMEPS/util/shr_abort_mod.F90
CMEPS/util/shr_log_mod.F90
CMEPS/util/shr_sys_mod.F90
CMEPS/util/shr_flux_mod.F90
CMEPS/util/shr_mpi_mod.F90
CMEPS/util/glc_elevclass_mod.F90
CMEPS/util/shr_mem_mod.F90
CMEPS/util/shr_kind_mod.F90
CMEPS/util/perf_mod.F90
CMEPS/util/shr_const_mod.F90)
CMEPS/ufs/flux_atmocn_mod.F90
CMEPS/ufs/glc_elevclass_mod.F90
CMEPS/ufs/ufs_kind_mod.F90
CMEPS/ufs/perf_mod.F90
CMEPS/ufs/ufs_const_mod.F90)

list(APPEND _mediator_files
CMEPS/mediator/med_phases_restart_mod.F90
Expand Down
28 changes: 6 additions & 22 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ list(APPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/CMakeModules/Modules)
###############################################################################

# Valid applications and choices
list(APPEND VALID_APPS ATM ATMAERO ATMW S2S S2SW HAFS HAFSW HAFS-ALL NG-GODAS NG-GODAS-NEMSDATM)
list(APPEND VALID_APPS ATM ATMAERO ATMW S2S S2SW HAFS HAFSW HAFS-ALL NG-GODAS)
set(APP NONE CACHE BOOL "Application Name")
if(NOT (APP IN_LIST VALID_APPS))
message(FATAL_ERROR "${APP} is not a valid application.\nValid Applications are: ${VALID_APPS}")
Expand All @@ -30,7 +30,6 @@ set(HYCOM OFF CACHE BOOL "Enable HYCOM")
set(CICE6 OFF CACHE BOOL "Enable CICE6")
set(WW3 OFF CACHE BOOL "Enable WW3")
set(STOCH_PHYS OFF CACHE BOOL "Enable Stochastic Physics")
set(NEMSdatm OFF CACHE BOOL "Enable NEMSdatm")
set(CMEPS OFF CACHE BOOL "Enable CMEPS")
set(CDEPS OFF CACHE BOOL "Enable CDEPS")

Expand All @@ -47,7 +46,6 @@ message("HYCOM ............ ${HYCOM}")
message("CICE6 ............ ${CICE6}")
message("WW3 .............. ${WW3}")
message("STOCH_PHYS ....... ${STOCH_PHYS}")
message("NEMSdatm ......... ${NEMSdatm}")
message("CDEPS ............ ${CDEPS}")
message("CMEPS ............ ${CMEPS}")

Expand Down Expand Up @@ -81,7 +79,7 @@ endif()
message("")
message("32BIT ............ ${32BIT}")
message("AVX2 ............. ${AVX2}")
message("SIMDMULTIARCH ... ${SIMDMULTIARCH}")
message("SIMDMULTIARCH .... ${SIMDMULTIARCH}")
message("DEBUG ............ ${DEBUG}")
message("DEBUG_LINKMPI .... ${DEBUG_LINKMPI}")
message("INLINE_POST ...... ${INLINE_POST}")
Expand Down Expand Up @@ -203,24 +201,16 @@ if(CMEPS)
endif()

###############################################################################
### Data Components [NEMSdatm, CDEPS]
### Data Components [CDEPS]
###############################################################################
if(NEMSdatm)
add_subdirectory(DATM/DATM)
endif()

if(CDEPS)
add_subdirectory(CDEPS-interface)
endif()

###############################################################################
### UFS Library [NEMS]
### UFS Library
###############################################################################
list(APPEND _nems_srcs NEMS/src/module_EARTH_GRID_COMP.F90
NEMS/src/module_NEMS_Rusage.F90
NEMS/src/nems_c_rusage.c)

add_library(ufs ${_nems_srcs})
add_library(ufs driver/EARTH_GRID_COMP.F90)
set_target_properties(ufs PROPERTIES Fortran_MODULE_DIRECTORY
${CMAKE_CURRENT_BINARY_DIR}/mod)
target_include_directories(ufs INTERFACE $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}/mod>
Expand Down Expand Up @@ -249,12 +239,6 @@ if(STOCH_PHYS)
list(APPEND _ufs_libs_public stochastic_physics)
endif()

if(NEMSdatm)
add_dependencies(ufs datatm)
list(APPEND _ufs_defs_private FRONT_NEMS_DATM=datm)
list(APPEND _ufs_libs_public datatm)
endif()

if(FV3)
add_dependencies(ufs fv3atm)
list(APPEND _ufs_defs_private FRONT_FV3=fv3gfs_cap_mod)
Expand Down Expand Up @@ -298,7 +282,7 @@ target_link_libraries(ufs PUBLIC "${_ufs_libs_public}")
###############################################################################
### UFS executable
###############################################################################
add_executable(ufs_model NEMS/src/MAIN_NEMS.F90)
add_executable(ufs_model driver/UFS.F90)
add_dependencies(ufs_model ufs)
target_link_libraries(ufs_model ufs esmf w3nco::w3nco_d)

Expand Down
2 changes: 1 addition & 1 deletion GOCART
Submodule GOCART updated 540 files
1 change: 1 addition & 0 deletions MOM6-interface/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@ target_include_directories(mom6_nuopc_obj PRIVATE $<BUILD_INTERFACE:${CMAKE_CURR
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/MOM6/src/framework>)
target_link_libraries(mom6_nuopc_obj PRIVATE mom6_obj
fms
stochastic_physics
esmf)
# OpenMP is disabled in MOM6
#if(OpenMP_Fortran_FOUND)
Expand Down
2 changes: 1 addition & 1 deletion MOM6-interface/MOM6
Submodule MOM6 updated 178 files
6 changes: 5 additions & 1 deletion MOM6-interface/mom6_files.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ list(APPEND mom6_src_files
MOM6/src/core/MOM_interface_heights.F90
MOM6/src/core/MOM_isopycnal_slopes.F90
MOM6/src/core/MOM_open_boundary.F90
MOM6/src/core/MOM_porous_barriers.F90
MOM6/src/core/MOM_transcribe_grid.F90
MOM6/src/core/MOM_unit_tests.F90
MOM6/src/core/MOM_variables.F90
Expand Down Expand Up @@ -181,6 +182,8 @@ list(APPEND mom6_src_files
MOM6/src/parameterizations/CVmix/cvmix_tidal.F90
MOM6/src/parameterizations/CVmix/cvmix_utils.F90

MOM6/src/parameterizations/stochastic/MOM_stochastics.F90

MOM6/src/tracer/DOME_tracer.F90

MOM6/src/tracer/ISOMIP_tracer.F90
Expand Down Expand Up @@ -255,7 +258,8 @@ list(APPEND mom6_src_files
MOM6/config_src/external/ODA_hooks/ocean_da_core.F90
MOM6/config_src/external/ODA_hooks/ocean_da_types.F90
MOM6/config_src/external/ODA_hooks/write_ocean_obs.F90
MOM6/config_src/external/OCEAN_stochastic_phyiscs/MOM_stochastics.F90
MOM6/config_src/external/drifters/MOM_particles.F90
MOM6/config_src/external/drifters/MOM_particles_types.F90

MOM6/config_src/infra/FMS1/MOM_coms_infra.F90
MOM6/config_src/infra/FMS1/MOM_constants.F90
Expand Down
1 change: 0 additions & 1 deletion NEMS
Submodule NEMS deleted from d51fa5
2 changes: 1 addition & 1 deletion WW3
Submodule WW3 updated 52 files
+0 −10 .github/ISSUE_TEMPLATE/add-development-request.md
+2 −2 .github/ISSUE_TEMPLATE/bug_report.md
+8 −0 .github/ISSUE_TEMPLATE/config.yml
+3 −6 .github/ISSUE_TEMPLATE/documentation.md
+26 −22 .github/pull_request_template.md
+2,580 −0 docs/Doxyfile.in
+67 −0 docs/ww3_doxy_tmpl.md
+0 −8 manual/eqs/BT2.tex
+0 −1 manual/makefile
+1 −2 model/bin/build_utils.sh
+1 −1 model/bin/cmplr.env
+1 −1 model/inp/ww3_ounp.inp
+1 −1 model/nml/ww3_ounp.nml
+5 −5 model/nml/ww3_shel.nml
+20 −18 model/src/w3gdatmd.F90
+4 −12 model/src/w3gridmd.F90
+10 −10 model/src/w3initmd.F90
+13 −8 model/src/w3iogrmd.F90
+2 −2 model/src/w3iopomd.F90
+14 −2 model/src/w3iorsmd.F90
+6 −6 model/src/w3iotrmd.F90
+0 −2,449 model/src/w3netcdf.F90
+1 −0 model/src/w3odatmd.F90
+3 −2 model/src/w3ounfmetamd.F90
+2 −2 model/src/w3profsmd.F90
+23 −15 model/src/w3profsmd_pdlib.F90
+1 −1 model/src/w3ref1md.F90
+53 −56 model/src/w3triamd.F90
+24 −62 model/src/w3updtmd.F90
+3 −5 model/src/w3wavemd.F90
+57 −5 model/src/wmesmfmd.F90
+31 −30 model/src/wmgridmd.F90
+8 −8 model/src/wminitmd.F90
+2 −2 model/src/wmiopomd.F90
+20 −20 model/src/wmscrpmd.F90
+16 −16 model/src/wmupdtmd.F90
+3 −3 model/src/ww3_bounc.F90
+3 −3 model/src/ww3_bound.F90
+1 −1 model/src/ww3_gint.F90
+14 −14 model/src/ww3_grib.F90
+3 −3 model/src/ww3_ounf.F90
+19 −15 model/src/ww3_ounp.F90
+59 −5 model/src/ww3_outf.F90
+0 −10 model/src/ww3_outp.F90
+5 −5 model/src/ww3_prep.F90
+6 −6 model/src/ww3_prnc.F90
+2 −2 model/src/ww3_prtide.F90
+1 −7 model/src/ww3_shel.F90
+4 −4 model/src/ww3_strt.F90
+0 −0 model/tools/ftn2src.sh
+1 −1 regtests/bin/matrix.comp
+4 −1 regtests/bin/test.comp
4 changes: 0 additions & 4 deletions build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,9 @@ export CC=${CC:-mpicc}
export CXX=${CXX:-mpicxx}
export FC=${FC:-mpif90}

export ESMFMKFILE=${ESMFMKFILE:?"Please set ESMFMKFILE environment variable"}

BUILD_DIR=${BUILD_DIR:-${UFS_MODEL_DIR}/build}
mkdir -p ${BUILD_DIR}

[[ -n "${MAPL_ROOT:-""}" ]] && CMAKE_FLAGS+=" -DCMAKE_MODULE_PATH=${MAPL_ROOT}/share/MAPL/cmake"

cd ${BUILD_DIR}
cmake ${UFS_MODEL_DIR} ${CMAKE_FLAGS}
# Turn off OpenMP threading for parallel builds
Expand Down
11 changes: 3 additions & 8 deletions cmake/configure_apps.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -25,19 +25,14 @@ if(APP MATCHES "^(ATM|ATMW)$")
endif()
endif()

if(APP MATCHES "^(NG-GODAS|NG-GODAS-NEMSDATM)$")
if(APP MATCHES "^(NG-GODAS)$")
set(CMEPS ON CACHE BOOL "Enable CMEPS" FORCE)
set(STOCH_PHYS ON CACHE BOOL "Enable Stochastic Physics" FORCE)
set(FMS ON CACHE BOOL "Enable FMS" FORCE)
set(MOM6 ON CACHE BOOL "Enable MOM6" FORCE)
set(CICE6 ON CACHE BOOL "Enable CICE6" FORCE)
if(APP MATCHES "NG-GODAS-NEMSDATM")
set(NEMSdatm ON CACHE BOOL "Enable NEMS DataAtm" FORCE)
message("Configuring UFS app in (NEMS) Data Atmosphere mode")
elseif(APP MATCHES "NG-GODAS")
set(CDEPS ON CACHE BOOL "Enable CDEPS" FORCE)
message("Configuring UFS app in (CDEPS) Data Atmosphere mode")
endif()
set(CDEPS ON CACHE BOOL "Enable CDEPS" FORCE)
message("Configuring UFS app in (CDEPS) Data Atmosphere mode")
endif()

if(APP MATCHES "^(S2S|S2SW)$")
Expand Down
4 changes: 0 additions & 4 deletions doc/UsersGuide/source/InputsOutputs.rst
Original file line number Diff line number Diff line change
Expand Up @@ -1146,10 +1146,6 @@ shows the following parameters that can be set in *model_configure* at run-time.
- frequency to output restart file or forecast hours to write out restart file
- integer
- 0 (0: write restart file at the end of integration; 12, -1: write out restart every 12 hours; 12 24 write out restart files at fh=12 and 24)
* - atm_coupling_interval_sec
- fast coupling interval in seconds for atmosphere
- real(8)
- 900
* - quilting
- flag to turn on quilt
- logical
Expand Down
Loading

0 comments on commit 4b6eb1a

Please sign in to comment.