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

UFS-dev PR#153 #125

Merged
merged 10 commits into from
Mar 14, 2024
Merged

UFS-dev PR#153 #125

Show file tree
Hide file tree
Changes from 9 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
407c6fd
Reorganization of ccpp-physics (#2035)
dustinswales Jan 4, 2024
1cab8b7
Spack-stack 1.5.1, ESMF 8.5.0, FMS 2023.02.01 + Remove Gaea C4 + Fix …
FernandoAndrade-NOAA Jan 8, 2024
5662552
Update CICE, update ice_in for consistency w/ G-W (was #2069) (#2027)
DeniseWorthen Jan 10, 2024
a837cfc
update MOM6 to its main repository 20231218 commit (disable FPEs) + A…
jiandewang Jan 11, 2024
1492141
A MERRA2 aerosol interpolation bug was found by RRFS (#2082)
AnningCheng-NOAA Jan 16, 2024
3fcf66a
Merge commit '149214121312b4cacdf5f9bdb492e964730d7fe0' into ufs-dev-…
grantfirl Feb 6, 2024
16d29a8
Merge branch 'main' into ufs-dev-PR153
grantfirl Mar 12, 2024
2a09d89
remove gaea and add gaea-c5 to tests/machine
grantfirl Mar 12, 2024
2eb5ce6
add derecho and remove cheyenne
grantfirl Mar 12, 2024
3427bc8
update FV3, bl_date.ncar.conf, Hera log
grantfirl Mar 14, 2024
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 CDEPS-interface/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# CDEPS compiler flags
if(CMAKE_Fortran_COMPILER_ID MATCHES "GNU")
set(CMAKE_Fortran_FLAGS "-g -fbacktrace -ffree-line-length-none")
set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -g -fbacktrace -ffree-line-length-none")
#Set CPP defintions for the ufs/cdeps_share target library
list(APPEND CDEPS_SHARE_DEFS "CPRGNU")
if(${CMAKE_Fortran_COMPILER_VERSION} VERSION_GREATER_EQUAL 10)
Expand All @@ -9,7 +9,7 @@ if(CMAKE_Fortran_COMPILER_ID MATCHES "GNU")
set(CMAKE_Fortran_FLAGS_RELEASE "-O2")
set(CMAKE_Fortran_FLAGS_DEBUG "-O0 -fcheck=bounds -ffpe-trap=invalid,zero,overflow,underflow" )
elseif(CMAKE_Fortran_COMPILER_ID MATCHES "Intel")
set(CMAKE_Fortran_FLAGS "-g -traceback")
set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -g -traceback")
set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -O -assume realloc_lhs")
set(CMAKE_Fortran_FLAGS_RELEASE "-O2 -fp-model precise")
set(CMAKE_Fortran_FLAGS_DEBUG "-O0 -check -check noarg_temp_created -check nopointer -fpe0 -ftrapuv -init=snan,arrays")
Expand Down
2 changes: 1 addition & 1 deletion CICE-interface/CICE
Open in desktop
Submodule CICE updated 104 files
13 changes: 5 additions & 8 deletions CICE-interface/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
### CICE Fortran compiler flags
if(CMAKE_Fortran_COMPILER_ID MATCHES "GNU")
set(CMAKE_Fortran_FLAGS "-g -fbacktrace")
set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -g -fbacktrace")
set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -fconvert=big-endian -ffree-line-length-none ")
if(${CMAKE_Fortran_COMPILER_VERSION} VERSION_GREATER_EQUAL 10)
set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -fallow-argument-mismatch -fallow-invalid-boz")
Expand All @@ -9,7 +9,7 @@ if(CMAKE_Fortran_COMPILER_ID MATCHES "GNU")
set(CMAKE_Fortran_FLAGS_DEBUG "-O0 -Wall -Wextra -fcheck=bounds -ffpe-trap=invalid,zero,overflow,underflow" )
set(CMAKE_Fortran_LINK_FLAGS "" )
elseif(CMAKE_Fortran_COMPILER_ID MATCHES "Intel")
set(CMAKE_Fortran_FLAGS "-g -traceback")
set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -g -traceback")
set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -FR -convert big_endian -assume byterecl -ftz -align array64byte")
set(CMAKE_Fortran_FLAGS_RELEASE "-O2 -fp-model precise")
set(CMAKE_Fortran_FLAGS_DEBUG "-O0 -check uninit -check bounds -check pointers -fpe0 -check noarg_temp_created -init=snan,arrays")
Expand All @@ -20,20 +20,17 @@ endif()

### CICE C compiler flags
if(CMAKE_C_COMPILER_ID MATCHES "GNU")
set(CMAKE_C_FLAGS "-g")
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS}")
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -g")
set(CMAKE_C_FLAGS_RELEASE "-O3")
set(CMAKE_C_FLAGS_DEBUG "-O0")
set(CMAKE_C_LINK_FLAGS "")
elseif(CMAKE_C_COMPILER_ID MATCHES "Intel")
set( CMAKE_C_FLAGS "-g -traceback")
set( CMAKE_C_FLAGS "${CMAKE_C_FLAGS}")
set( CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -g -traceback")
set( CMAKE_C_FLAGS_RELEASE "-O2 -fp-model precise")
set( CMAKE_C_FLAGS_DEBUG "-O0 -ftrapuv")
set( CMAKE_C_LINK_FLAGS "")
elseif(CMAKE_C_COMPILER_ID MATCHES "Clang")
set(CMAKE_C_FLAGS "-g")
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS}")
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -g")
set( CMAKE_C_FLAGS_RELEASE "-O3" )
set( CMAKE_C_FLAGS_DEBUG "-O0" )
set( CMAKE_C_LINK_FLAGS "" )
Expand Down
4 changes: 3 additions & 1 deletion CICE-interface/cice_files.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,8 @@ list(APPEND cice_shared_files
#Dynamics List:
CICE/cicecore/cicedyn/dynamics/ice_dyn_eap.F90
CICE/cicecore/cicedyn/dynamics/ice_dyn_evp.F90
CICE/cicecore/cicedyn/dynamics/ice_dyn_evp_1d.F90
CICE/cicecore/cicedyn/dynamics/ice_dyn_evp1d.F90
CICE/cicecore/cicedyn/dynamics/ice_dyn_core1d.F90
CICE/cicecore/cicedyn/dynamics/ice_dyn_shared.F90
CICE/cicecore/cicedyn/dynamics/ice_dyn_vp.F90
CICE/cicecore/cicedyn/dynamics/ice_transport_driver.F90
Expand Down Expand Up @@ -75,6 +76,7 @@ list(APPEND icepack_files
CICE/icepack/columnphysics/icepack_orbital.F90
CICE/icepack/columnphysics/icepack_parameters.F90
CICE/icepack/columnphysics/icepack_shortwave.F90
CICE/icepack/columnphysics/icepack_shortwave_data.F90
CICE/icepack/columnphysics/icepack_snow.F90
CICE/icepack/columnphysics/icepack_therm_bl99.F90
CICE/icepack/columnphysics/icepack_therm_itd.F90
Expand Down
2 changes: 1 addition & 1 deletion CMEPS-interface/CMEPS
Open in desktop
Submodule CMEPS updated 2 files
+8 −8 ufs/ccpp/config/ccpp_prebuild_config.py
+1 −1 ufs/ccpp/data/MED_typedefs.meta
5 changes: 2 additions & 3 deletions CMEPS-interface/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,18 +3,17 @@
###############################################################################

if(CMAKE_Fortran_COMPILER_ID MATCHES "GNU")
set(CMAKE_Fortran_FLAGS "-g -fbacktrace -ffree-line-length-none")
set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -g -fbacktrace -ffree-line-length-none")
#Set CPP defintions for the ufs/cdeps_share source component of the cmeps target library
list(APPEND CDEPS_SHARE_DEFS "CPRGNU")
if(${CMAKE_Fortran_COMPILER_VERSION} VERSION_GREATER_EQUAL 10)
set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -fallow-argument-mismatch -fallow-invalid-boz")
endif()
set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS}")
set(CMAKE_Fortran_FLAGS_RELEASE "-O2")
set(CMAKE_Fortran_FLAGS_DEBUG "-O0 -fcheck=bounds -ffpe-trap=invalid,zero,overflow,underflow" )
set(CMAKE_Fortran_LINK_FLAGS "")
elseif(CMAKE_Fortran_COMPILER_ID MATCHES "Intel")
set(CMAKE_Fortran_FLAGS "-g -traceback")
set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -g -traceback")
set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -O -assume realloc_lhs")
set(CMAKE_Fortran_FLAGS_RELEASE "-O2 -fp-model precise")
set(CMAKE_Fortran_FLAGS_DEBUG "-O0 -check -check noarg_temp_created -check nopointer -fpe0 -ftrapuv -init=snan,arrays")
Expand Down
2 changes: 1 addition & 1 deletion FV3
Open in desktop
Submodule FV3 updated 48 files
+83 −0 .github/workflows/GCC.yml
+6 −0 CMakeLists.txt
+132 −136 ccpp/config/ccpp_prebuild_config.py
+2 −5 ccpp/data/CCPP_typedefs.meta
+5 −3 ccpp/data/GFS_typedefs.meta
+1 −1 ccpp/physics
+0 −1 ccpp/suites/suite_FV3_GFS_v15_thompson_mynn_lam3km.xml
+0 −1 ccpp/suites/suite_FV3_GFS_v15p2.xml
+0 −1 ccpp/suites/suite_FV3_GFS_v16.xml
+0 −1 ccpp/suites/suite_FV3_GFS_v16_csawmg.xml
+0 −1 ccpp/suites/suite_FV3_GFS_v16_flake.xml
+0 −1 ccpp/suites/suite_FV3_GFS_v16_fv3wam.xml
+0 −1 ccpp/suites/suite_FV3_GFS_v16_ras.xml
+0 −1 ccpp/suites/suite_FV3_GFS_v17_coupled_p8.xml
+0 −1 ccpp/suites/suite_FV3_GFS_v17_coupled_p8_c3.xml
+0 −1 ccpp/suites/suite_FV3_GFS_v17_coupled_p8_sfcocn.xml
+0 −1 ccpp/suites/suite_FV3_GFS_v17_coupled_p8_ugwpv1.xml
+0 −1 ccpp/suites/suite_FV3_GFS_v17_p8.xml
+0 −1 ccpp/suites/suite_FV3_GFS_v17_p8_c3.xml
+0 −1 ccpp/suites/suite_FV3_GFS_v17_p8_mynn.xml
+0 −1 ccpp/suites/suite_FV3_GFS_v17_p8_ugwpv1.xml
+0 −1 ccpp/suites/suite_FV3_HAFS_v1_gfdlmp_tedmf.xml
+0 −1 ccpp/suites/suite_FV3_HAFS_v1_gfdlmp_tedmf_nonsst.xml
+0 −1 ccpp/suites/suite_FV3_HAFS_v1_thompson_tedmf_gfdlsf.xml
+0 −1 ccpp/suites/suite_FV3_HRRR.xml
+0 −1 ccpp/suites/suite_FV3_HRRR_c3.xml
+0 −1 ccpp/suites/suite_FV3_HRRR_gf.xml
+0 −1 ccpp/suites/suite_FV3_HRRR_gf_nogwd.xml
+0 −1 ccpp/suites/suite_FV3_RAP.xml
+0 −1 ccpp/suites/suite_FV3_RAP_cires_ugwp.xml
+0 −1 ccpp/suites/suite_FV3_RAP_clm_lake.xml
+0 −1 ccpp/suites/suite_FV3_RAP_flake.xml
+0 −1 ccpp/suites/suite_FV3_RAP_noah.xml
+0 −1 ccpp/suites/suite_FV3_RAP_noah_sfcdiff_cires_ugwp.xml
+0 −1 ccpp/suites/suite_FV3_RAP_sfcdiff.xml
+0 −1 ccpp/suites/suite_FV3_RAP_unified_ugwp.xml
+0 −1 ccpp/suites/suite_FV3_RRFS_v1beta.xml
+0 −1 ccpp/suites/suite_FV3_RRFS_v1nssl.xml
+0 −1 ccpp/suites/suite_FV3_WoFS_v0.xml
+0 −1 ccpp/suites/suite_FV3_global_nest_v1.xml
+0 −1 ccpp/suites/suite_RRFSens_phy1.xml
+0 −1 ccpp/suites/suite_RRFSens_phy2.xml
+0 −1 ccpp/suites/suite_RRFSens_phy3.xml
+0 −1 ccpp/suites/suite_RRFSens_phy4.xml
+0 −1 ccpp/suites/suite_RRFSens_phy5.xml
+70 −0 ci/CMakeLists.txt
+29 −0 ci/spack.yaml
+2 −4 io/module_wrt_grid_comp.F90
4 changes: 2 additions & 2 deletions MOM6-interface/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
### MOM6 Fortran compiler flags
if(CMAKE_Fortran_COMPILER_ID MATCHES "GNU")
set(CMAKE_Fortran_FLAGS "-g -fbacktrace")
set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -g -fbacktrace")
set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -fdefault-real-8 -fdefault-double-8")
set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -Waliasing -fcray-pointer -fconvert=big-endian -ffree-line-length-none -fno-range-check -fbacktrace")
set(CMAKE_Fortran_FLAGS_RELEASE "-O2")
set(CMAKE_Fortran_FLAGS_DEBUG "-O0 -fcheck=bounds -ffpe-trap=invalid,zero,overflow,underflow" )
set(CMAKE_Fortran_LINK_FLAGS "")
elseif(CMAKE_Fortran_COMPILER_ID MATCHES "Intel")
set(CMAKE_Fortran_FLAGS "-g -traceback")
set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -g -traceback")
set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -i4 -r8")
set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -fno-alias -auto -safe-cray-ptr -ftz -assume byterecl -sox")
set(CMAKE_Fortran_FLAGS_RELEASE "-O2 -debug minimal -fp-model source")
Expand Down
2 changes: 1 addition & 1 deletion MOM6-interface/MOM6
Open in desktop
Submodule MOM6 updated 3 files
+15 −0 .github/actions/macos-setup/action.yml
+0 −11 .github/actions/testing-setup/action.yml
+12 −0 .github/actions/ubuntu-setup/action.yml
4 changes: 0 additions & 4 deletions cmake/configure_gaea.intel.cmake
View file
Open in desktop

This file was deleted.

Loading