-
Notifications
You must be signed in to change notification settings - Fork 250
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'develop' into rrfsv1-to-ufs/dev9
- Loading branch information
Showing
74 changed files
with
3,334 additions
and
2,721 deletions.
There are no files selected for viewing
Submodule CDEPS
updated
69 files
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
137 changes: 137 additions & 0 deletions
137
CDEPS-interface/ufs/cdeps_share/shr_is_restart_fh_mod.F90
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,137 @@ | ||
| module shr_is_restart_fh_mod | ||
|
|
||
| ! Common methods for components to check if it's time to write forecast hour-based restarts | ||
|
|
||
| !use dshr_methods_mod , only : chkerr | ||
| use ESMF, only : ESMF_ConfigCreate, ESMF_ConfigDestroy, ESMF_ConfigLoadFile, & | ||
| ESMF_ConfigGetLen, ESMF_ConfigGetAttribute, ESMF_TimePrint, & | ||
| ESMF_LOGMSG_INFO, ESMF_LogWrite, ESMF_TimeInterval, & | ||
| ESMF_Time, ESMF_KIND_R8, ESMF_Config, ESMF_Clock, & | ||
| ESMF_TimeIntervalSet, ESMF_TimePrint, operator(+), operator(==), & | ||
| ESMF_LogFoundError, ESMF_LOGERR_PASSTHRU | ||
|
|
||
| implicit none | ||
| private | ||
|
|
||
| type :: is_restart_fh_type | ||
| logical :: write_restartfh = .false. | ||
| type(ESMF_Time), allocatable :: restartFhTimes(:) | ||
| end type is_restart_fh_type | ||
|
|
||
| public :: init_is_restart_fh, is_restart_fh, finalize_restart_fh, is_restart_fh_type | ||
|
|
||
| contains | ||
|
|
||
| !----------------------------------------------------------------------- | ||
| subroutine init_is_restart_fh(currentTime, dtime, lLog, restartfh_info) | ||
| ! | ||
| ! !DESCRIPTION: | ||
| ! Process restart_fh attribute from model_configure in UFS | ||
| ! | ||
| ! !USES: | ||
| ! | ||
| ! !ARGUMENTS: | ||
| type(ESMF_Time), intent(in) :: currentTime | ||
| integer, intent(in) :: dtime ! time step (s) | ||
| logical, intent(in) :: lLog ! If true, this task logs restart_fh info | ||
| type(is_restart_fh_type), intent(out) :: restartfh_info !restart_fh info for each task | ||
| ! | ||
| ! !LOCAL VARIABLES: | ||
| character(len=256) :: timestr | ||
| integer :: n, nfh, fh_s, rc | ||
| logical :: isPresent | ||
| real(kind=ESMF_KIND_R8), allocatable :: restart_fh(:) | ||
| type(ESMF_TimeInterval) :: fhInterval | ||
| type(ESMF_Config) :: CF_mc | ||
| !----------------------------------------------------------------------- | ||
|
|
||
| ! set up Times to write non-interval restarts | ||
| inquire(FILE='model_configure', EXIST=isPresent) | ||
| if (isPresent) then !model_configure exists. this is ufs run | ||
| CF_mc = ESMF_ConfigCreate(rc=rc) | ||
| call ESMF_ConfigLoadFile(config=CF_mc,filename='model_configure' ,rc=rc) | ||
| if (ESMF_LogFoundError(rcToCheck=rc, msg=ESMF_LOGERR_PASSTHRU, line=__LINE__, file=__FILE__)) return | ||
|
|
||
| nfh = ESMF_ConfigGetLen(config=CF_mc, label ='restart_fh:',rc=rc) | ||
| if (nfh .gt. 0) then | ||
| allocate(restart_fh(1:nfh)) | ||
| allocate(restartfh_info%restartFhTimes(1:nfh)) !not deallocated here | ||
|
|
||
| call ESMF_ConfigGetAttribute(CF_mc,valueList=restart_fh,label='restart_fh:', rc=rc) | ||
| if (ESMF_LogFoundError(rcToCheck=rc, msg=ESMF_LOGERR_PASSTHRU, line=__LINE__, file=__FILE__)) return | ||
| ! create a list of times at each restart_fh | ||
| do n = 1,nfh | ||
| fh_s = NINT(3600*restart_fh(n)) | ||
| call ESMF_TimeIntervalSet(fhInterval, s=fh_s, rc=rc) | ||
| if (ESMF_LogFoundError(rcToCheck=rc, msg=ESMF_LOGERR_PASSTHRU, line=__LINE__, file=__FILE__)) return | ||
| restartfh_info%restartFhTimes(n) = currentTime + fhInterval | ||
| call ESMF_TimePrint(restartfh_info%restartFhTimes(n), options="string", & | ||
| preString="restart_fh at ", unit=timestr, rc=rc) | ||
| if (ESMF_LogFoundError(rcToCheck=rc, msg=ESMF_LOGERR_PASSTHRU, line=__LINE__, file=__FILE__)) return | ||
| if (lLog) then | ||
| if (mod(fh_s,dtime) /= 0) then | ||
| call ESMF_LogWrite('restart time NOT to be written for '//trim(timestr), ESMF_LOGMSG_INFO) | ||
| else | ||
| call ESMF_LogWrite('restart time to be written for '//trim(timestr), ESMF_LOGMSG_INFO) | ||
| end if | ||
| end if | ||
| end do | ||
| deallocate(restart_fh) | ||
| end if !nfh>0 | ||
| call ESMF_ConfigDestroy(CF_mc, rc=rc) | ||
| if (ESMF_LogFoundError(rcToCheck=rc, msg=ESMF_LOGERR_PASSTHRU, line=__LINE__, file=__FILE__)) return | ||
| end if !model_configure | ||
|
|
||
| end subroutine init_is_restart_fh | ||
|
|
||
| subroutine is_restart_fh(clock, restartfh_info, lWrite) | ||
| ! | ||
| ! !DESCRIPTION: | ||
| ! True/false if time to write restart | ||
| ! | ||
| ! !USES: | ||
| use ESMF, only : ESMF_ClockGetNextTime | ||
|
|
||
| ! | ||
| ! !ARGUMENTS: | ||
| type(ESMF_Clock), intent(in) :: clock | ||
| type(is_restart_fh_type), intent(inout) :: restartfh_info | ||
| logical, intent(out) :: lWrite ! time to write? | ||
| ! | ||
| ! !LOCAL VARIABLES: | ||
| integer :: nfh, rc | ||
| type(ESMF_Time) :: nextTime | ||
| !----------------------------------------------------------------------- | ||
|
|
||
| restartfh_info%write_restartfh = .false. | ||
| if (allocated(restartfh_info%restartFhTimes)) then | ||
| ! check if next time is == to any restartfhtime | ||
| do nfh = 1,size(restartfh_info%restartFhTimes) | ||
| call ESMF_ClockGetNextTime(clock, nextTime=nexttime, rc=rc) | ||
| if (ESMF_LogFoundError(rcToCheck=rc, msg=ESMF_LOGERR_PASSTHRU, line=__LINE__, file=__FILE__)) return | ||
| if (nextTime == restartfh_info%restartFhTimes(nfh)) restartfh_info%write_restartfh = .true. | ||
| end do | ||
| end if | ||
|
|
||
| lWrite = restartfh_info%write_restartfh | ||
|
|
||
| end subroutine is_restart_fh | ||
|
|
||
| subroutine finalize_restart_fh(restartfh_info) | ||
| ! | ||
| ! !DESCRIPTION: | ||
| ! Clean-up...release allocated memory | ||
| ! | ||
| ! !USES: | ||
| ! | ||
| ! !ARGUMENTS: | ||
| type(is_restart_fh_type), intent(inout) :: restartfh_info | ||
| ! | ||
| ! !LOCAL VARIABLES: | ||
| !----------------------------------------------------------------------- | ||
|
|
||
| if (allocated(restartfh_info%restartFhTimes)) deallocate(restartfh_info%restartFhTimes) | ||
|
|
||
| end subroutine finalize_restart_fh | ||
|
|
||
| end module shr_is_restart_fh_mod |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Submodule CMEPS
updated
26 files
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Submodule FV3
updated
9 files
| +1 −1 | atmos_cubed_sphere | |
| +2 −2 | ccpp/data/CCPP_typedefs.F90 | |
| +97 −79 | ccpp/data/GFS_typedefs.F90 | |
| +31 −4 | ccpp/data/GFS_typedefs.meta | |
| +12 −0 | ccpp/driver/GFS_diagnostics.F90 | |
| +1 −1 | ccpp/framework | |
| +2 −0 | ccpp/suites/suite_RRFSens_phy1.xml | |
| +2 −0 | ccpp/suites/suite_RRFSens_phy4.xml | |
| +3 −1 | io/fv3atm_rrfs_sd_io.F90 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Submodule WW3
updated
8 files
| +1 −1 | model/bin/switch_meshcap | |
| +1 −1 | model/bin/switch_meshcap_pdlib | |
| +4 −0 | model/src/CMakeLists.txt | |
| +10 −6 | model/src/cmake/src_list.cmake | |
| +11 −0 | model/src/cmake/switches.json | |
| +7 −0 | model/src/w3initmd.F90 | |
| +8 −1 | model/src/w3wavemd.F90 | |
| +14 −1 | model/src/wav_comp_nuopc.F90 |
File renamed without changes.
File renamed without changes.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,4 @@ | ||
| set(PARALLEL_NETCDF ON CACHE BOOL "Enable parallel NetCDF" FORCE) | ||
| set(MOM6_Extra_FORTRAN_FLAGS "-xsse2") | ||
| set(HYCOM_Extra_FORTRAN_FLAGS "-xSSE4.2") | ||
| set(HYCOM_Extra_C_FLAGS "-xSSE4.2") |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,2 @@ | ||
| set(PARALLEL_NETCDF ON CACHE BOOL "Enable parallel NetCDF" FORCE) | ||
| set(AVX2 OFF CACHE BOOL "Enable AVX2 instruction set" FORCE) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,33 @@ | ||
| help([[ | ||
| This module loads libraries required for building and running UFS Weather Model | ||
| on the NOAA RDHPC machine Gaea C6 using Intel-2023.2.0. | ||
| ]]) | ||
|
|
||
| whatis([===[Loads libraries needed for building the UFS Weather Model on Gaea C6]===]) | ||
|
|
||
| prepend_path("MODULEPATH", "/ncrc/proj/epic/spack-stack/c6/spack-stack-1.6.0/envs/fms-2024.01/install/modulefiles/Core") | ||
|
|
||
| stack_intel_ver=os.getenv("stack_intel_ver") or "2023.2.0" | ||
| load(pathJoin("stack-intel", stack_intel_ver)) | ||
|
|
||
| stack_cray_mpich_ver=os.getenv("stack_cray_mpich_ver") or "8.1.29" | ||
| load(pathJoin("stack-cray-mpich", stack_cray_mpich_ver)) | ||
|
|
||
| stack_python_ver=os.getenv("stack_python_ver") or "3.10.13" | ||
| load(pathJoin("stack-python", stack_python_ver)) | ||
|
|
||
| cmake_ver=os.getenv("cmake_ver") or "3.23.1" | ||
| load(pathJoin("cmake", cmake_ver)) | ||
|
|
||
| load("ufs_common") | ||
|
|
||
| nccmp_ver=os.getenv("nccmp_ver") or "1.9.0.1" | ||
| load(pathJoin("nccmp", nccmp_ver)) | ||
|
|
||
| unload("darshan-runtime") | ||
| unload("cray-libsci") | ||
|
|
||
| setenv("CC","cc") | ||
| setenv("CXX","CC") | ||
| setenv("FC","ftn") | ||
| setenv("CMAKE_Platform","gaeac6.intel") |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,40 @@ | ||
| help([[ | ||
| This module loads libraries required for building and running UFS Weather Model | ||
| on the NOAA RDHPC machine Gaea C6 using Intel-2023.2.0. | ||
| ]]) | ||
|
|
||
| whatis([===[Loads libraries needed for building the UFS Weather Model on Gaea C6]===]) | ||
|
|
||
| prepend_path("MODULEPATH", "/ncrc/proj/epic/spack-stack/c6/spack-stack-1.6.0/envs/fms-2024.01/install/modulefiles/Core") | ||
|
|
||
| stack_intel_ver=os.getenv("stack_intel_ver") or "2023.2.0" | ||
| load(pathJoin("stack-intel", stack_intel_ver)) | ||
|
|
||
| stack_cray_mpich_ver=os.getenv("stack_cray_mpich_ver") or "8.1.29" | ||
| load(pathJoin("stack-cray-mpich", stack_cray_mpich_ver)) | ||
|
|
||
| stack_python_ver=os.getenv("stack_python_ver") or "3.10.13" | ||
| load(pathJoin("stack-python", stack_python_ver)) | ||
|
|
||
| cmake_ver=os.getenv("cmake_ver") or "3.23.1" | ||
| load(pathJoin("cmake", cmake_ver)) | ||
|
|
||
| load("ufs_common") | ||
|
|
||
| nccmp_ver=os.getenv("nccmp_ver") or "1.9.0.1" | ||
| load(pathJoin("nccmp", nccmp_ver)) | ||
|
|
||
| unload("darshan-runtime") | ||
| unload("cray-libsci") | ||
|
|
||
| unload("intel-classic/2023.2.0") | ||
| load("intel-oneapi/2023.2.0") | ||
|
|
||
| setenv("I_MPI_CC", "icx") | ||
| setenv("I_MPI_CXX", "icpx") | ||
| setenv("I_MPI_F90", "ifx") | ||
|
|
||
| setenv("CC","cc") | ||
| setenv("CXX","CC") | ||
| setenv("FC","ftn") | ||
| setenv("CMAKE_Platform","gaeac6.intelllvm") |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1 +1 @@ | ||
| export BL_DATE=20241127 | ||
| export BL_DATE=20241212 |
Oops, something went wrong.