From f878b9737188c1bda4bad2209d4e1db04bd093b4 Mon Sep 17 00:00:00 2001 From: Dom Heinzeller Date: Fri, 27 Dec 2019 09:21:18 -0700 Subject: [PATCH] Merge NCAR dtc/develop into NOAA-EMC develop, merge selected updates from NOAA-EMC ufs_public_release, updates for jet and gaea --- .gitmodules | 8 +- CMakeLists.txt | 2 +- FMS | 2 +- FV3 | 2 +- cmake/configure_cheyenne.gnu.cmake | 35 ++ cmake/configure_cheyenne.intel-impi.cmake | 35 ++ cmake/configure_cheyenne.intel.cmake | 35 ++ compsets/fv3.input | 3 + conf/configure.fv3.macosx.gnu | 4 +- modulefiles/cheyenne.gnu/fv3 | 8 + modulefiles/cheyenne.intel-impi/fv3 | 8 + modulefiles/cheyenne.intel/fv3 | 8 + modulefiles/gaea.intel/fv3 | 4 +- modulefiles/gaea.intel/fv3.intel-16.0.3.210 | 7 +- parm/ccpp_control.nml.IN | 2 +- parm/ccpp_gfdlmp.nml.IN | 2 + parm/ccpp_gsd_sar-model_configure.IN | 48 +++ parm/ccpp_gsd_sar.nml.IN | 311 ++++++++++++++++ parm/ccpp_gsd_sar_25km-model_configure.IN | 48 +++ parm/ccpp_gsd_sar_25km.nml.IN | 312 ++++++++++++++++ parm/ccpp_regional_c768_FA.nml.IN | 305 ++++++++++++++++ parm/ccpp_v15p2_c96.nml.IN | 305 ++++++++++++++++ parm/ccpp_v16beta_c96.nml.IN | 338 ++++++++++++++++++ parm/gfdlmp.nml.IN | 4 +- parm/input.nml.IN | 2 +- stochastic_physics | 2 +- tests/compile.sh | 6 + tests/compile_cmake.sh | 9 +- tests/default_vars.sh | 1 + tests/detect_machine.sh | 3 + tests/fv3_conf/ccpp_control_run.IN | 11 +- tests/fv3_conf/ccpp_cpt_run.IN | 5 +- tests/fv3_conf/ccpp_csawmg3shoc127_run.IN | 5 +- tests/fv3_conf/ccpp_csawmg_run.IN | 6 +- tests/fv3_conf/ccpp_csawmgshoc_run.IN | 6 +- tests/fv3_conf/ccpp_gf_thompson_run.IN | 4 +- tests/fv3_conf/ccpp_gfdlmp_run.IN | 11 +- tests/fv3_conf/ccpp_gfs_v15_run.IN | 6 +- tests/fv3_conf/ccpp_gsd_run.IN | 4 +- tests/fv3_conf/ccpp_gsd_sar_25km_run.IN | 35 ++ tests/fv3_conf/ccpp_gsd_sar_run.IN | 34 ++ tests/fv3_conf/ccpp_regional_FA_run.IN | 30 ++ tests/fv3_conf/ccpp_regional_run.IN | 4 +- tests/fv3_conf/ccpp_satmedmf_run.IN | 6 +- tests/fv3_conf/ccpp_stretched_run.IN | 5 +- tests/rt.conf | 87 +++-- tests/rt.sh | 6 +- tests/rt_fv3.sh | 10 +- tests/rt_gnu.conf | 45 --- tests/run_test.sh | 3 +- tests/tests/fv3_ccpp_gf_thompson | 2 +- tests/tests/fv3_ccpp_gfdlmprad | 14 +- tests/tests/fv3_ccpp_gfs_v15p2 | 85 +++++ tests/tests/fv3_ccpp_gfs_v15p2_debug | 24 ++ tests/tests/fv3_ccpp_gfs_v16beta | 85 +++++ tests/tests/fv3_ccpp_gfs_v16beta_debug | 24 ++ tests/tests/fv3_ccpp_gsd | 2 +- tests/tests/fv3_ccpp_gsd_coldstart | 2 +- tests/tests/fv3_ccpp_gsd_debug | 102 ++++++ tests/tests/fv3_ccpp_gsd_drag_suite | 2 +- tests/tests/fv3_ccpp_gsd_noah | 2 +- tests/tests/fv3_ccpp_gsd_sar | 37 ++ tests/tests/fv3_ccpp_gsd_sar_25km_debug | 36 ++ tests/tests/fv3_ccpp_gsd_warmstart | 2 +- .../fv3_ccpp_regional_c768_FA_update_moist | 27 ++ tests/tests/fv3_ccpp_sas | 71 ++++ tests/tests/fv3_ccpp_satmedmfq | 70 ++++ tests/tests/fv3_ccpp_shinhong | 2 +- tests/tests/fv3_ccpp_thompson | 2 +- tests/tests/fv3_ccpp_thompson_mynn | 2 +- tests/tests/fv3_ccpp_wrtGauss_nemsio_c768 | 20 +- tests/tests/fv3_ccpp_ysu | 2 +- tests/tests/fv3_sas | 69 ++++ tests/tests/fv3_satmedmfq | 67 ++++ 74 files changed, 2758 insertions(+), 175 deletions(-) create mode 100644 cmake/configure_cheyenne.gnu.cmake create mode 100644 cmake/configure_cheyenne.intel-impi.cmake create mode 100644 cmake/configure_cheyenne.intel.cmake create mode 100644 parm/ccpp_gsd_sar-model_configure.IN create mode 100644 parm/ccpp_gsd_sar.nml.IN create mode 100644 parm/ccpp_gsd_sar_25km-model_configure.IN create mode 100644 parm/ccpp_gsd_sar_25km.nml.IN create mode 100644 parm/ccpp_regional_c768_FA.nml.IN create mode 100644 parm/ccpp_v15p2_c96.nml.IN create mode 100644 parm/ccpp_v16beta_c96.nml.IN create mode 100644 tests/fv3_conf/ccpp_gsd_sar_25km_run.IN create mode 100644 tests/fv3_conf/ccpp_gsd_sar_run.IN create mode 100644 tests/fv3_conf/ccpp_regional_FA_run.IN delete mode 100644 tests/rt_gnu.conf create mode 100644 tests/tests/fv3_ccpp_gfs_v15p2 create mode 100644 tests/tests/fv3_ccpp_gfs_v15p2_debug create mode 100644 tests/tests/fv3_ccpp_gfs_v16beta create mode 100644 tests/tests/fv3_ccpp_gfs_v16beta_debug create mode 100644 tests/tests/fv3_ccpp_gsd_debug create mode 100644 tests/tests/fv3_ccpp_gsd_sar create mode 100644 tests/tests/fv3_ccpp_gsd_sar_25km_debug create mode 100644 tests/tests/fv3_ccpp_regional_c768_FA_update_moist create mode 100644 tests/tests/fv3_ccpp_sas create mode 100644 tests/tests/fv3_ccpp_satmedmfq create mode 100644 tests/tests/fv3_sas create mode 100644 tests/tests/fv3_satmedmfq diff --git a/.gitmodules b/.gitmodules index 02d35c657d..03a501b0ef 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,15 +1,15 @@ [submodule "FV3"] path = FV3 - url = https://github.com/NOAA-EMC/fv3atm - branch = develop + url = https://github.com/climbfuji/fv3atm + branch = emc_devemc_update_from_dtc_develop_20191217 [submodule "NEMS"] path = NEMS url = https://github.com/NOAA-EMC/NEMS branch = develop [submodule "FMS"] path = FMS - url = https://github.com/NOAA-EMC/FMS - branch = GFS-FMS + url = https://github.com/NOAA-GFDL/FMS + branch = master [submodule "WW3"] path = WW3 url = https://github.com/NOAA-EMC/WW3 diff --git a/CMakeLists.txt b/CMakeLists.txt index 2ae305662e..b36d0dd51e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -125,7 +125,7 @@ add_library( FMS/mosaic/interp.c FMS/mosaic/mosaic_util.c FMS/mosaic/read_mosaic.c - FMS/mpp/affinity.c + FMS/affinity/affinity.c FMS/mpp/nsclock.c FMS/mpp/threadloc.c ) diff --git a/FMS b/FMS index 46014b4f9a..708b8d5e5e 160000 --- a/FMS +++ b/FMS @@ -1 +1 @@ -Subproject commit 46014b4f9a83128488b735d438ed82edd2dedf0c +Subproject commit 708b8d5e5e044860bfc409c22524eb9fb8b25ff3 diff --git a/FV3 b/FV3 index 869374c057..5a167d42a0 160000 --- a/FV3 +++ b/FV3 @@ -1 +1 @@ -Subproject commit 869374c057e71b9289eba638daacc35290219bb7 +Subproject commit 5a167d42a053df8f6f2354839428d1359987ab81 diff --git a/cmake/configure_cheyenne.gnu.cmake b/cmake/configure_cheyenne.gnu.cmake new file mode 100644 index 0000000000..7efcb1633e --- /dev/null +++ b/cmake/configure_cheyenne.gnu.cmake @@ -0,0 +1,35 @@ +message("") +message("Setting configuration for $ENV{CMAKE_Platform}") +message("") + +get_filename_component (C_COMPILER_NAME ${CMAKE_C_COMPILER} NAME) +get_filename_component (CXX_COMPILER_NAME ${CMAKE_CXX_COMPILER} NAME) +get_filename_component (Fortran_COMPILER_NAME ${CMAKE_Fortran_COMPILER} NAME) +message("C compiler: ${CMAKE_C_COMPILER_ID} ${CMAKE_C_COMPILER_VERSION} (${C_COMPILER_NAME})") +message("CXX compiler: ${CMAKE_CXX_COMPILER_ID} ${CMAKE_CXX_COMPILER_VERSION} (${CXX_COMPILER_NAME})") +message("Fortran compiler: ${CMAKE_Fortran_COMPILER_ID} ${CMAKE_Fortran_COMPILER_VERSION} (${Fortran_COMPILER_NAME})") +message("") + +option(DEBUG "Enable DEBUG mode" OFF) +option(REPRO "Enable REPRO mode" OFF) +option(VERBOSE "Enable VERBOSE mode" OFF) +option(32BIT "Enable 32BIT (single precision arithmetic in dycore)" OFF) +option(OPENMP "Enable OpenMP threading" ON) +option(AVX2 "Enable AVX2 instruction set" OFF) + +option(INLINE_POST "Enable inline post" OFF) + +include( cmake/${CMAKE_Fortran_COMPILER_ID}.cmake ) + +set(NEMSIO_INC $ENV{NEMSIO_INC}) +set(POST_INC $ENV{POST_INC}) +set(NCEP_LIBS $ENV{POST_LIB} $ENV{NEMSIO_LIB} $ENV{G2_LIB4} $ENV{G2TMPL_LIB} $ENV{BACIO_LIB4} $ENV{SP_LIBd} $ENV{W3EMC_LIBd} $ENV{W3NCO_LIBd} $ENV{CRTM_LIB} $ENV{PNG_LIB} $ENV{JASPER_LIB} $ENV{Z_LIB}) + +set(ESMF_MOD ${ESMF_F90COMPILEPATHS}) +set(ESMF_LIBS "${ESMF_F90ESMFLINKRPATHS} ${ESMF_F90ESMFLINKPATHS} ${ESMF_F90ESMFLINKLIBS}") + +set(NETCDF_INC_DIR $ENV{NETCDF}/include) +set(NETCDF_LIBDIR $ENV{NETCDF}/lib) +set(NETCDF_LIBS -L$ENV{NETCDF}/lib -lnetcdff -lnetcdf) + +message("") diff --git a/cmake/configure_cheyenne.intel-impi.cmake b/cmake/configure_cheyenne.intel-impi.cmake new file mode 100644 index 0000000000..534d580aa7 --- /dev/null +++ b/cmake/configure_cheyenne.intel-impi.cmake @@ -0,0 +1,35 @@ +message("") +message("Setting configuration for $ENV{CMAKE_Platform}") +message("") + +get_filename_component (C_COMPILER_NAME ${CMAKE_C_COMPILER} NAME) +get_filename_component (CXX_COMPILER_NAME ${CMAKE_CXX_COMPILER} NAME) +get_filename_component (Fortran_COMPILER_NAME ${CMAKE_Fortran_COMPILER} NAME) +message("C compiler: ${CMAKE_C_COMPILER_ID} ${CMAKE_C_COMPILER_VERSION} (${C_COMPILER_NAME})") +message("CXX compiler: ${CMAKE_CXX_COMPILER_ID} ${CMAKE_CXX_COMPILER_VERSION} (${CXX_COMPILER_NAME})") +message("Fortran compiler: ${CMAKE_Fortran_COMPILER_ID} ${CMAKE_Fortran_COMPILER_VERSION} (${Fortran_COMPILER_NAME})") +message("") + +option(DEBUG "Enable DEBUG mode" OFF) +option(REPRO "Enable REPRO mode" OFF) +option(VERBOSE "Enable VERBOSE mode" OFF) +option(32BIT "Enable 32BIT (single precision arithmetic in dycore)" OFF) +option(OPENMP "Enable OpenMP threading" ON) +option(AVX2 "Enable AVX2 instruction set" ON) + +option(INLINE_POST "Enable inline post" OFF) + +include( cmake/${CMAKE_Fortran_COMPILER_ID}.cmake ) + +set(NEMSIO_INC $ENV{NEMSIO_INC}) +set(POST_INC $ENV{POST_INC}) +set(NCEP_LIBS $ENV{POST_LIB} $ENV{NEMSIO_LIB} $ENV{G2_LIB4} $ENV{G2TMPL_LIB} $ENV{BACIO_LIB4} $ENV{SP_LIBd} $ENV{W3EMC_LIBd} $ENV{W3NCO_LIBd} $ENV{CRTM_LIB} $ENV{PNG_LIB} $ENV{JASPER_LIB} $ENV{Z_LIB}) + +set(ESMF_MOD ${ESMF_F90COMPILEPATHS}) +set(ESMF_LIBS "${ESMF_F90ESMFLINKRPATHS} ${ESMF_F90ESMFLINKPATHS} ${ESMF_F90ESMFLINKLIBS}") + +set(NETCDF_INC_DIR $ENV{NETCDF}/include) +set(NETCDF_LIBDIR $ENV{NETCDF}/lib) +set(NETCDF_LIBS -L$ENV{NETCDF}/lib -lnetcdff -lnetcdf) + +message("") diff --git a/cmake/configure_cheyenne.intel.cmake b/cmake/configure_cheyenne.intel.cmake new file mode 100644 index 0000000000..534d580aa7 --- /dev/null +++ b/cmake/configure_cheyenne.intel.cmake @@ -0,0 +1,35 @@ +message("") +message("Setting configuration for $ENV{CMAKE_Platform}") +message("") + +get_filename_component (C_COMPILER_NAME ${CMAKE_C_COMPILER} NAME) +get_filename_component (CXX_COMPILER_NAME ${CMAKE_CXX_COMPILER} NAME) +get_filename_component (Fortran_COMPILER_NAME ${CMAKE_Fortran_COMPILER} NAME) +message("C compiler: ${CMAKE_C_COMPILER_ID} ${CMAKE_C_COMPILER_VERSION} (${C_COMPILER_NAME})") +message("CXX compiler: ${CMAKE_CXX_COMPILER_ID} ${CMAKE_CXX_COMPILER_VERSION} (${CXX_COMPILER_NAME})") +message("Fortran compiler: ${CMAKE_Fortran_COMPILER_ID} ${CMAKE_Fortran_COMPILER_VERSION} (${Fortran_COMPILER_NAME})") +message("") + +option(DEBUG "Enable DEBUG mode" OFF) +option(REPRO "Enable REPRO mode" OFF) +option(VERBOSE "Enable VERBOSE mode" OFF) +option(32BIT "Enable 32BIT (single precision arithmetic in dycore)" OFF) +option(OPENMP "Enable OpenMP threading" ON) +option(AVX2 "Enable AVX2 instruction set" ON) + +option(INLINE_POST "Enable inline post" OFF) + +include( cmake/${CMAKE_Fortran_COMPILER_ID}.cmake ) + +set(NEMSIO_INC $ENV{NEMSIO_INC}) +set(POST_INC $ENV{POST_INC}) +set(NCEP_LIBS $ENV{POST_LIB} $ENV{NEMSIO_LIB} $ENV{G2_LIB4} $ENV{G2TMPL_LIB} $ENV{BACIO_LIB4} $ENV{SP_LIBd} $ENV{W3EMC_LIBd} $ENV{W3NCO_LIBd} $ENV{CRTM_LIB} $ENV{PNG_LIB} $ENV{JASPER_LIB} $ENV{Z_LIB}) + +set(ESMF_MOD ${ESMF_F90COMPILEPATHS}) +set(ESMF_LIBS "${ESMF_F90ESMFLINKRPATHS} ${ESMF_F90ESMFLINKPATHS} ${ESMF_F90ESMFLINKLIBS}") + +set(NETCDF_INC_DIR $ENV{NETCDF}/include) +set(NETCDF_LIBDIR $ENV{NETCDF}/lib) +set(NETCDF_LIBS -L$ENV{NETCDF}/lib -lnetcdff -lnetcdf) + +message("") diff --git a/compsets/fv3.input b/compsets/fv3.input index cb2725a165..cdd09d8ffb 100644 --- a/compsets/fv3.input +++ b/compsets/fv3.input @@ -201,7 +201,10 @@ fv3_defaults = { MAKE_NH='.T.' MOUNTAIN='.F.' SATMEDMF='.F.' + ISATMEDMF='0' HYBEDMF='.T.' + IMFSHALCNV='2' + IMFDEEPCNV='2' LHEATSTRG='.F.' LGFDLMPRAD='.F.' EFFR_IN='.F.' diff --git a/conf/configure.fv3.macosx.gnu b/conf/configure.fv3.macosx.gnu index b6988c7dfe..3b32c0edb1 100644 --- a/conf/configure.fv3.macosx.gnu +++ b/conf/configure.fv3.macosx.gnu @@ -122,8 +122,8 @@ CPPDEFS += -DMULTI_GASES endif FFLAGS_OPT = -O2 -g -fno-range-check -FFLAGS_REPRO = -O2 -g -fbacktrace -fno-range-check -FFLAGS_DEBUG = -g -O0 -ggdb -fno-unsafe-math-optimizations -frounding-math -fsignaling-nans -Wuninitialized -ffpe-trap=invalid,zero,overflow -fbounds-check -fbacktrace -fno-range-check -Wall +FFLAGS_REPRO = -O0 -g -fbacktrace -fno-range-check +FFLAGS_DEBUG = -g -O0 -ggdb -fno-unsafe-math-optimizations -frounding-math -fsignaling-nans -ffpe-trap=invalid,zero,overflow -fbounds-check -fbacktrace -fno-range-check -Wall TRANSCENDENTALS := FFLAGS_OPENMP = -fopenmp diff --git a/modulefiles/cheyenne.gnu/fv3 b/modulefiles/cheyenne.gnu/fv3 index d53d1befab..2bbb20fd1e 100644 --- a/modulefiles/cheyenne.gnu/fv3 +++ b/modulefiles/cheyenne.gnu/fv3 @@ -37,3 +37,11 @@ module load NCEPlibs/9.9.9 ## SIONlib library ## module load SIONlib/1.7.4 + +## +## set cmake compilers +## +setenv CMAKE_C_COMPILER mpicc +setenv CMAKE_CXX_COMPILER mpicxx +setenv CMAKE_Fortran_COMPILER mpif90 +setenv CMAKE_Platform cheyenne.gnu diff --git a/modulefiles/cheyenne.intel-impi/fv3 b/modulefiles/cheyenne.intel-impi/fv3 index ec97290589..e0160b61dc 100644 --- a/modulefiles/cheyenne.intel-impi/fv3 +++ b/modulefiles/cheyenne.intel-impi/fv3 @@ -37,3 +37,11 @@ module load NCEPlibs/9.9.9 ## SIONlib library ## module load SIONlib/1.7.4 + +## +## set cmake compilers +## +setenv CMAKE_C_COMPILER mpicc +setenv CMAKE_CXX_COMPILER mpicxx +setenv CMAKE_Fortran_COMPILER mpif90 +setenv CMAKE_Platform cheyenne.intel-impi diff --git a/modulefiles/cheyenne.intel/fv3 b/modulefiles/cheyenne.intel/fv3 index 010dede82a..f009c137d1 100644 --- a/modulefiles/cheyenne.intel/fv3 +++ b/modulefiles/cheyenne.intel/fv3 @@ -37,3 +37,11 @@ module load NCEPlibs/9.9.9 ## SIONlib library ## module load SIONlib/1.7.4 + +## +## set cmake compilers +## +setenv CMAKE_C_COMPILER mpicc +setenv CMAKE_CXX_COMPILER mpicxx +setenv CMAKE_Fortran_COMPILER mpif90 +setenv CMAKE_Platform cheyenne.intel diff --git a/modulefiles/gaea.intel/fv3 b/modulefiles/gaea.intel/fv3 index 828deb2856..c6be478d3c 100644 --- a/modulefiles/gaea.intel/fv3 +++ b/modulefiles/gaea.intel/fv3 @@ -20,7 +20,7 @@ module rm intel module load intel/18.0.3.222 module load cray-netcdf -module use -a /lustre/f2/pdata/esrl/gsd/gmtb/NEMSfv3gfs/modules/modulefiles/intel-18.0.3.222 +module use -a /lustre/f2/pdata/esrl/gsd/ufs/modules/modulefiles/intel-18.0.3.222 ## ## Libxml2 - compiled manually because of issues with linking the code @@ -46,5 +46,5 @@ module load alps setenv CMAKE_C_COMPILER cc setenv CMAKE_CXX_COMPILER CC setenv CMAKE_Fortran_COMPILER ftn -setenv CMAKE_Platform gaea +setenv CMAKE_Platform gaea.intel setenv NETCDF ${NETCDF_DIR} diff --git a/modulefiles/gaea.intel/fv3.intel-16.0.3.210 b/modulefiles/gaea.intel/fv3.intel-16.0.3.210 index 67bb46ad0e..b17769eb6a 100644 --- a/modulefiles/gaea.intel/fv3.intel-16.0.3.210 +++ b/modulefiles/gaea.intel/fv3.intel-16.0.3.210 @@ -22,7 +22,7 @@ module load cray-netcdf setenv NETCDF /opt/cray/pe/netcdf/4.4.0/INTEL/15.0 setenv HDF5 /opt/cray/pe/hdf5/1.8.16/INTEL/15.0 -module use -a /lustre/f2/pdata/esrl/gsd/gmtb/NEMSfv3gfs/modules/modulefiles/intel-16.0.3.210 +module use -a /lustre/f2/pdata/esrl/gsd/ufs/modules/modulefiles/intel-16.0.3.210 ## ## Libxml2 - compiled manually because of issues with linking the code @@ -37,7 +37,7 @@ module load NCEPlibs/9.9.9 ## ## use pre-compiled EMSF library for above compiler / MPI combination ## -module load esmf/8.0.0_bs50 +module load esmf/8.0.0 # Needed at runtime: module load alps @@ -51,4 +51,5 @@ setenv F90 mpif90 setenv CMAKE_C_COMPILER mpicc setenv CMAKE_CXX_COMPILER mpic++ setenv CMAKE_Fortran_COMPILER mpif90 -setenv CMAKE_Platform theia.gnu +setenv CMAKE_Platform gaea.intel +setenv NETCDF ${NETCDF_DIR} diff --git a/parm/ccpp_control.nml.IN b/parm/ccpp_control.nml.IN index 87b887c300..c25b4038db 100644 --- a/parm/ccpp_control.nml.IN +++ b/parm/ccpp_control.nml.IN @@ -159,7 +159,7 @@ cnvcld = .true. imfshalcnv = 2 imfdeepcnv = 2 - isatmedmf = 0 + isatmedmf = @[ISATMEDMF] cdmbgwd = 3.5,0.25 prslrd0 = 0. ivegsrc = 1 diff --git a/parm/ccpp_gfdlmp.nml.IN b/parm/ccpp_gfdlmp.nml.IN index 8475c4cc10..47daf17aa8 100644 --- a/parm/ccpp_gfdlmp.nml.IN +++ b/parm/ccpp_gfdlmp.nml.IN @@ -178,6 +178,8 @@ oz_phys_2015 = @[OZ_PHYS_NEW] h2o_phys = @[H2O_PHYS] nstf_name = @[NSTF_NAME] + cplflx = @[CPLFLX] + cplwav = @[CPLWAV] xkzminv = 0.3 xkzm_m = 1.0 xkzm_h = 1.0 diff --git a/parm/ccpp_gsd_sar-model_configure.IN b/parm/ccpp_gsd_sar-model_configure.IN new file mode 100644 index 0000000000..8b8737b003 --- /dev/null +++ b/parm/ccpp_gsd_sar-model_configure.IN @@ -0,0 +1,48 @@ +total_member: 1 +PE_MEMBER01: 840 +start_year: 2019 +start_month: 07 +start_day: 12 +start_hour: 12 +start_minute: 0 +start_second: 0 +nhours_fcst: 3 +RUN_CONTINUE: .false. +ENS_SPS: .false. +dt_atmos: 50 +cpl: .false. +calendar: 'julian' +memuse_verbose: .false. +atmos_nthreads: 2 +use_hyper_thread: .false. +ncores_per_node: 24 +debug_affinity: .true. +restart_interval: 0 +output_1st_tstep_rst: .false. +quilting: .true. +print_esmf: .false. + +write_groups: 1 +write_tasks_per_group: 24 +num_files: 2 +filename_base: 'dyn''phy' +output_file: 'netcdf' +write_nemsioflip: .false. +write_fsyncflag: .false. + +output_grid: 'lambert_conformal' +cen_lon: -97.5 +cen_lat: 38.5 +stdlat1: 38.5 +stdlat2: 38.5 +nx: 1738 +ny: 974 +lon1: -122.21414225 +lat1: 22.41403305 +dx: 3000.0 +dy: 3000.0 + +nfhout: 1 +nfhmax_hf: 60 +nfhout_hf: 1 +nsout: -1 diff --git a/parm/ccpp_gsd_sar.nml.IN b/parm/ccpp_gsd_sar.nml.IN new file mode 100644 index 0000000000..1fea8f7c85 --- /dev/null +++ b/parm/ccpp_gsd_sar.nml.IN @@ -0,0 +1,311 @@ +&amip_interp_nml + interp_oi_sst = .true. + use_ncep_sst = .true. + use_ncep_ice = .false. + no_anom_sst = .false. + data_set = 'reynolds_oi', + date_out_of_range = 'climo', +/ + +&atmos_model_nml + blocksize = 32 + chksum_debug = .false. + dycore_only = .false. + fdiag = 3 + ccpp_suite = 'FV3_GSD_SAR' +/ + +&diag_manager_nml + prepend_date = .F. +/ + +&fms_io_nml + checksum_required = .false. + max_files_r = 100, + max_files_w = 100, +/ + +&fms_nml + clock_grain = 'ROUTINE', + domains_stack_size = 2000200, + print_memory_usage = .false. +/ + +&fv_grid_nml + grid_file = 'INPUT/grid_spec.nc' +/ + + &fv_core_nml + layout = 34,24 + io_layout = 1,1 + npx = 1735 + npy = 1009 + ntiles = 1, + npz = 64 + !grid_type = -1 + make_nh = .T. + fv_debug = .T. + range_warn = .T. + reset_eta = .F. + n_sponge = 24 + nudge_qv = .F. + tau = 5. + rf_cutoff = 20.e2 + d2_bg_k1 = 0.20 + d2_bg_k2 = 0.04 + kord_tm = -11 + kord_mt = 11 + kord_wz = 11 + kord_tr = 11 + hydrostatic = .F. + phys_hydrostatic = .F. + use_hydro_pressure = .F. + beta = 0. + a_imp = 1. + p_fac = 0.1 + k_split = 4 + n_split = 5 + nwat = 6 + na_init = 1 + d_ext = 0.0 + dnats = 0 + fv_sg_adj = 300 + d2_bg = 0. + nord = 2 + dddmp = 0.1 + d4_bg = 0.12 + vtdm4 = 0.02 + ke_bg = 0. + do_vort_damp = .true. + external_ic = .T. + external_eta = .T. + gfs_phil = .false. + nggps_ic = .T. + mountain = .F. + ncep_ic = .F. + d_con = 1.0 + delt_max = 0.002 + hord_mt = 6 + hord_vt = 6 + hord_tm = 6 + hord_dp = -6 + hord_tr = 8 + adjust_dry_mass = .F. + consv_te = 0. + do_sat_adj = .F. + consv_am = .F. + fill = .T. + dwind_2d = .F. + print_freq = 6 + warm_start = .F. + no_dycore = .false. + z_tracer = .T. + read_increment = .F. + res_latlon_dynamics = "fv3_increment.nc" + + do_schmidt = .true. + target_lat = 38.5 + target_lon = -97.5 + stretch_fac = 0.999 +!! nord_zs_filter = 4 + n_zs_filter = 0 + regional = .true. + bc_update_interval = 3 + + full_zs_filter = .F. !unreleased feature + + nord_zs_filter = 4 + n_zs_filter = 0 ! safety +/ + +&surf_map_nml + zero_ocean = .F. + cd4 = 0.12 + cd2 = -1 + n_del2_strong = 0 + n_del2_weak = 2 + n_del4 = 1 + max_slope = 0.4 + peak_fac = 1. +/ + +&external_ic_nml + filtered_terrain = .true. + levp = 65 + gfs_dwinds = .true. + checker_tr = .F. + nt_checker = 0 +/ + +&gfs_physics_nml + fhzero = 6. + h2o_phys = .true. + ldiag3d = .false. + fhcyc = 0 + nst_anl = .true. + use_ufo = .true. + pre_rad = .false. + ncld = 5 + imp_physics = 8 + ttendlim = 0.005 + ltaerosol = .T. + lradar = .T. + pdfcld = .false. + fhswr = 3600. + fhlwr = 3600. + ialb = 1 + iems = 1 + iaer = 111 + ico2 = 2 + isubc_sw = 2 + isubc_lw = 2 + isol = 2 + lwhtr = .true. + swhtr = .true. + cnvgwd = .false. + shal_cnv = .false. + cal_pre = .false. + redrag = .true. + dspheat = .true. + hybedmf = .F. + satmedmf = .false. + lheatstrg = .F. + do_mynnedmf = .T. + do_mynnsfclay = .false. + random_clds = .false. + trans_trac = .true. + cnvcld = .false. + imfshalcnv = 0 + imfdeepcnv = 0 + cdmbgwd = 3.5,0.25 + prslrd0 = 0. + ivegsrc = 1 + isot = 1 + debug = .false. + oz_phys = .false. + oz_phys_2015 = .true. + nstf_name = 2,1,1,0,5 + cplflx = .F. + iau_delthrs = 6 + iaufhrs = 30 + iau_inc_files = '' + do_sppt = .F. + do_shum = .F. + do_skeb = .F. + do_sfcperts = .F. + lsm = 3 + lsoil = 4 + lsoil_lsm = 9 + iopt_dveg = 2 + iopt_crs = 1 + iopt_btr = 1 + iopt_run = 1 + iopt_sfc = 1 + iopt_frz = 1 + iopt_inf = 1 + iopt_rad = 1 + iopt_alb = 2 + iopt_snf = 4 + iopt_tbot = 2 + iopt_stc = 1 + icloud_bl = 1 + bl_mynn_tkeadvect = .true. + bl_mynn_edmf = 1 + bl_mynn_edmf_mom = 1 +/ + +&interpolator_nml + interp_method = 'conserve_great_circle' +/ + +&namsfc + FNGLAC = "global_glacier.2x2.grb", + FNMXIC = "global_maxice.2x2.grb", + FNTSFC = "RTGSST.1982.2012.monthly.clim.grb", + FNSNOC = "global_snoclim.1.875.grb", + FNZORC = "igbp", + FNALBC = "global_snowfree_albedo.bosu.t126.384.190.rg.grb", + FNALBC2 = "global_albedo4.1x1.grb", + FNAISC = "CFSR.SEAICE.1982.2012.monthly.clim.grb", + FNTG3C = "global_tg3clim.2.6x1.5.grb", + FNVEGC = "global_vegfrac.0.144.decpercent.grb", + FNVETC = "global_vegtype.igbp.t126.384.190.rg.grb", + FNSOTC = "global_soiltype.statsgo.t126.384.190.rg.grb", + FNSMCC = "global_soilmgldas.t126.384.190.grb", + FNMSKH = "seaice_newland.grb", + FNTSFA = "", + FNACNA = "", + FNSNOA = "", + FNVMNC = "global_shdmin.0.144x0.144.grb", + FNVMXC = "global_shdmax.0.144x0.144.grb", + FNSLPC = "global_slope.1x1.grb", + FNABSC = "global_mxsnoalb.uariz.t126.384.190.rg.grb", + LDEBUG =.false., + FSMCL(2) = 99999 + FSMCL(3) = 99999 + FSMCL(4) = 99999 + FTSFS = 90 + FAISS = 99999 + FSNOL = 99999 + FSICL = 99999 + FTSFL = 99999, + FAISL = 99999, + FVETL = 99999, + FSOTL = 99999, + FvmnL = 99999, + FvmxL = 99999, + FSLPL = 99999, + FABSL = 99999, + FSNOS = 99999, + FSICS = 99999, +/ +&nam_stochy + lon_s=768, + lat_s=384, + ntrunc=382, + SKEBNORM=1, + SKEB_NPASS=30, + SKEB_VDOF=5, + SKEB=@[SKEB], + SKEB_TAU=2.16E4, + SKEB_LSCALE=1000.E3, + SHUM=@[SHUM], + SHUM_TAU=21600, + SHUM_LSCALE=500000, + SPPT=@[SPPT], + SPPT_TAU=21600, + SPPT_LSCALE=500000, + SPPT_LOGIT=.TRUE., + SPPT_SFCLIMIT=.TRUE., + ISEED_SHUM=1, + ISEED_SKEB=2, + ISEED_SPPT=3, +/ +&nam_sfcperts + NSFCPERT=6, + PERTZ0=-999., + PERTSHC=-999., + PERTZT=-999., + PERTLAI=-999., + PERTVEGF=-999., + PERTALB=-999., + SFC_TAU=21600, + SFC_LSCALE=500000, + ISEED_SFC=0, + SPPT_LAND=.FALSE., +/ + +&cires_ugwp_nml + knob_ugwp_solver = 2 + knob_ugwp_source = 1,1,0,0 + knob_ugwp_wvspec = 1,25,25,25 + knob_ugwp_azdir = 2,4,4,4 + knob_ugwp_stoch = 0,0,0,0 + knob_ugwp_effac = 1,1,1,1 + knob_ugwp_doaxyz = 1 + knob_ugwp_doheat = 1 + knob_ugwp_dokdis = 1 + knob_ugwp_ndx4lh = 1 + knob_ugwp_version = 0 + launch_level = 25 +/ diff --git a/parm/ccpp_gsd_sar_25km-model_configure.IN b/parm/ccpp_gsd_sar_25km-model_configure.IN new file mode 100644 index 0000000000..d2a512c56d --- /dev/null +++ b/parm/ccpp_gsd_sar_25km-model_configure.IN @@ -0,0 +1,48 @@ +total_member: 1 +PE_MEMBER01: 24 +start_year: 2019 +start_month: 05 +start_day: 20 +start_hour: 00 +start_minute: 0 +start_second: 0 +nhours_fcst: 1 +RUN_CONTINUE: .false. +ENS_SPS: .false. +dt_atmos: 300 +cpl: .false. +calendar: 'julian' +memuse_verbose: .false. +atmos_nthreads: 2 +use_hyper_thread: .false. +ncores_per_node: 24 +debug_affinity: .true. +restart_interval: 0 +output_1st_tstep_rst: .false. + +quilting: .true. +print_esmf: .false. +write_groups: 1 +write_tasks_per_group: 4 +num_files: 2 +filename_base: 'dyn''phy' +output_file: 'netcdf' +write_nemsioflip: .false. +write_fsyncflag: .false. + +output_grid: 'lambert_conformal' +cen_lon: -97.5 +cen_lat: 38.5 +stdlat1: 38.5 +stdlat2: 38.5 +nx: 191 +ny: 97 +lon1: -120.72962370 +lat1: 25.11648583 +dx: 25000.0 +dy: 25000.0 + +nfhout: 1 +nfhmax_hf: 60 +nfhout_hf: 1 +nsout: -1 diff --git a/parm/ccpp_gsd_sar_25km.nml.IN b/parm/ccpp_gsd_sar_25km.nml.IN new file mode 100644 index 0000000000..53583e3790 --- /dev/null +++ b/parm/ccpp_gsd_sar_25km.nml.IN @@ -0,0 +1,312 @@ +&amip_interp_nml + interp_oi_sst = .true. + use_ncep_sst = .true. + use_ncep_ice = .false. + no_anom_sst = .false. + data_set = 'reynolds_oi', + date_out_of_range = 'climo', +/ + +&atmos_model_nml + blocksize = 550 + chksum_debug = .false. + dycore_only = .false. + fdiag = 1 + ccpp_suite = 'FV3_GSD_SAR' +/ + +&diag_manager_nml + prepend_date = .F. +/ + +&fms_io_nml + checksum_required = .false. + max_files_r = 100, + max_files_w = 100, +/ + +&fms_nml + clock_grain = 'ROUTINE', + domains_stack_size = 3000000, + print_memory_usage = .false. +/ + +&fv_grid_nml + grid_file = 'INPUT/grid_spec.nc' +/ + +&fv_core_nml + layout = 4,5 + io_layout = 1,1 + npx = 201 + npy = 111 + ntiles = 1, + npz = 64 + !grid_type = -1 + make_nh = .T. + fv_debug = .T. + range_warn = .T. + reset_eta = .F. + n_sponge = 24 + nudge_qv = .F. + tau = 5. + rf_cutoff = 20.e2 + d2_bg_k1 = 0.20 + d2_bg_k2 = 0.04 + kord_tm = -11 + kord_mt = 11 + kord_wz = 11 + kord_tr = 11 + hydrostatic = .F. + phys_hydrostatic = .F. + use_hydro_pressure = .F. + beta = 0. + a_imp = 1. + p_fac = 0.1 + k_split = 4 + n_split = 5 + nwat = 6 + na_init = 1 + d_ext = 0.0 + dnats = 0 + fv_sg_adj = 300 + d2_bg = 0. + nord = 2 + dddmp = 0.1 + d4_bg = 0.12 + vtdm4 = 0.02 + ke_bg = 0. + do_vort_damp = .true. + external_ic = .T. + external_eta = .T. + gfs_phil = .false. + nggps_ic = .T. + mountain = .F. + ncep_ic = .F. + d_con = 1.0 + delt_max = 0.002 + hord_mt = 6 + hord_vt = 6 + hord_tm = 6 + hord_dp = -6 + hord_tr = 8 + adjust_dry_mass = .F. + consv_te = 0. + do_sat_adj = .F. + consv_am = .F. + fill = .T. + dwind_2d = .F. + print_freq = 6 + warm_start = .F. + no_dycore = .false. + z_tracer = .T. + read_increment = .F. + res_latlon_dynamics = "fv3_increment.nc" + + do_schmidt = .true. + target_lat = 38.5 + target_lon = -97.5 + stretch_fac = 0.999 +! nord_zs_filter = 4 + n_zs_filter = 0 + regional = .true. + bc_update_interval = 6 + + full_zs_filter = .F. !unreleased feature + + nord_zs_filter = 4 + n_zs_filter = 0 ! safety +/ + +&surf_map_nml + zero_ocean = .F. + cd4 = 0.12 + cd2 = -1 + n_del2_strong = 0 + n_del2_weak = 2 + n_del4 = 1 + max_slope = 0.4 + peak_fac = 1. +/ + +&external_ic_nml + filtered_terrain = .true. + levp = 65 + gfs_dwinds = .true. + checker_tr = .F. + nt_checker = 0 +/ + +&gfs_physics_nml + fhzero = 1. + h2o_phys = .true. + ldiag3d = .false. + fhcyc = 0. + nst_anl = .true. + use_ufo = .true. + pre_rad = .false. + ncld = 5 + imp_physics = 8 +! ttendlim = 0.005 + ttendlim = 50.0 + ltaerosol = .T. + lradar = .T. + pdfcld = .false. + fhswr = 3600. + fhlwr = 3600. + ialb = 1 + iems = 1 + iaer = 111 + ico2 = 2 + isubc_sw = 2 + isubc_lw = 2 + isol = 2 + lwhtr = .true. + swhtr = .true. + cnvgwd = .false. + shal_cnv = .false. + cal_pre = .false. + redrag = .true. + dspheat = .true. + hybedmf = .false. + satmedmf = .false. + lheatstrg = .F. + do_mynnedmf = .true. + do_mynnsfclay = .false. + random_clds = .false. + trans_trac = .true. + cnvcld = .false. + imfshalcnv = 0 + imfdeepcnv = 0 + cdmbgwd = 3.5,0.25 + prslrd0 = 0. + ivegsrc = 1 + isot = 1 + debug = .false. + oz_phys = .false. + oz_phys_2015 = .true. + nstf_name = 2,1,1,0,5 + cplflx = .F. + iau_delthrs = 6 + iaufhrs = 30 + iau_inc_files = '' + do_sppt = .F. + do_shum = .F. + do_skeb = .F. + do_sfcperts = .F. + lsm = 3 + lsoil = 9 + lsoil_lsm = 9 + iopt_dveg = 2 + iopt_crs = 1 + iopt_btr = 1 + iopt_run = 1 + iopt_sfc = 1 + iopt_frz = 1 + iopt_inf = 1 + iopt_rad = 1 + iopt_alb = 2 + iopt_snf = 4 + iopt_tbot = 2 + iopt_stc = 1 + icloud_bl = 1 + bl_mynn_tkeadvect = .true. + bl_mynn_edmf = 1 + bl_mynn_edmf_mom = 1 +/ + +&cires_ugwp_nml + knob_ugwp_solver = 2 + knob_ugwp_source = 1,1,0,0 + knob_ugwp_wvspec = 1,25,25,25 + knob_ugwp_azdir = 2,4,4,4 + knob_ugwp_stoch = 0,0,0,0 + knob_ugwp_effac = 1,1,1,1 + knob_ugwp_doaxyz = 1 + knob_ugwp_doheat = 1 + knob_ugwp_dokdis = 1 + knob_ugwp_ndx4lh = 1 + knob_ugwp_version = 0 + launch_level = 25 +/ + +&interpolator_nml + interp_method = 'conserve_great_circle' +/ + +&namsfc + FNGLAC = "global_glacier.2x2.grb", + FNMXIC = "global_maxice.2x2.grb", + FNTSFC = "RTGSST.1982.2012.monthly.clim.grb", + FNSNOC = "global_snoclim.1.875.grb", + FNZORC = "igbp", + FNALBC = "global_snowfree_albedo.bosu.t126.384.190.rg.grb", + FNALBC2 = "global_albedo4.1x1.grb", + FNAISC = "CFSR.SEAICE.1982.2012.monthly.clim.grb", + FNTG3C = "global_tg3clim.2.6x1.5.grb", + FNVEGC = "global_vegfrac.0.144.decpercent.grb", + FNVETC = "global_vegtype.igbp.t126.384.190.rg.grb", + FNSOTC = "global_soiltype.statsgo.t126.384.190.rg.grb", + FNSMCC = "global_soilmgldas.t126.384.190.grb", + FNMSKH = "seaice_newland.grb", + FNTSFA = "", + FNACNA = "", + FNSNOA = "", + FNVMNC = "global_shdmin.0.144x0.144.grb", + FNVMXC = "global_shdmax.0.144x0.144.grb", + FNSLPC = "global_slope.1x1.grb", + FNABSC = "global_mxsnoalb.uariz.t126.384.190.rg.grb", + LDEBUG =.false., + FSMCL(2) = 99999 + FSMCL(3) = 99999 + FSMCL(4) = 99999 + FTSFS = 90 + FAISS = 99999 + FSNOL = 99999 + FSICL = 99999 + FTSFL = 99999, + FAISL = 99999, + FVETL = 99999, + FSOTL = 99999, + FvmnL = 99999, + FvmxL = 99999, + FSLPL = 99999, + FABSL = 99999, + FSNOS = 99999, + FSICS = 99999, + +&nam_stochy + lon_s=768, + lat_s=384, + ntrunc=382, + SKEBNORM=1, + SKEB_NPASS=30, + SKEB_VDOF=5, + SKEB=@[SKEB], + SKEB_TAU=2.16E4, + SKEB_LSCALE=1000.E3, + SHUM=@[SHUM], + SHUM_TAU=21600, + SHUM_LSCALE=500000, + SPPT=@[SPPT], + SPPT_TAU=21600, + SPPT_LSCALE=500000, + SPPT_LOGIT=.TRUE., + SPPT_SFCLIMIT=.TRUE., + ISEED_SHUM=1, + ISEED_SKEB=2, + ISEED_SPPT=3, +/ +&nam_sfcperts + NSFCPERT=6, + PERTZ0=-999., + PERTSHC=-999., + PERTZT=-999., + PERTLAI=-999., + PERTVEGF=-999., + PERTALB=-999., + SFC_TAU=21600, + SFC_LSCALE=500000, + ISEED_SFC=0, + SPPT_LAND=.FALSE., +/ diff --git a/parm/ccpp_regional_c768_FA.nml.IN b/parm/ccpp_regional_c768_FA.nml.IN new file mode 100644 index 0000000000..c6f5435227 --- /dev/null +++ b/parm/ccpp_regional_c768_FA.nml.IN @@ -0,0 +1,305 @@ +&amip_interp_nml + interp_oi_sst = .true. + use_ncep_sst = .true. + use_ncep_ice = .false. + no_anom_sst = .false. + data_set = 'reynolds_oi', + date_out_of_range = 'climo', +/ + + &atmos_model_nml + blocksize = 32 + chksum_debug = .false. + dycore_only = .false. + fdiag = 1 + ccpp_suite = '@[CCPP_SUITE]' +/ + +&diag_manager_nml + prepend_date = .F. +/ + + &fms_io_nml + checksum_required = .false. + max_files_r = 100, + max_files_w = 100, +/ + + &fms_nml + clock_grain = 'ROUTINE', + domains_stack_size = 3000000, + print_memory_usage = .false. +/ + + &fv_grid_nml + grid_file = 'INPUT/grid_spec.nc' +/ + + &fv_core_nml + layout = 24,20 + io_layout = 1,1 + npx = 1729 + npy = 1441 + ntiles = 1, + npz = 64 + !grid_type = -1 + make_nh = @[MAKE_NH] + fv_debug = .F. + range_warn = .T. + reset_eta = .F. + n_sponge = 24 + nudge_qv = .T. + tau = 5. + rf_cutoff = 20.e2 + d2_bg_k1 = 0.20 + d2_bg_k2 = 0.04 + kord_tm = -11 + kord_mt = 11 + kord_wz = 11 + kord_tr = 11 + hydrostatic = .F. + phys_hydrostatic = .F. + use_hydro_pressure = .F. + beta = 0. + a_imp = 1. + p_fac = 0.1 + k_split = 4 + n_split = 5 + nwat = 4 + na_init = @[NA_INIT] + d_ext = 0.0 + dnats = 1 + fv_sg_adj = 300 + d2_bg = 0. + nord = 2 + dddmp = 0.1 + d4_bg = 0.12 + vtdm4 = 0.02 + delt_max = 0.008 + ke_bg = 0. + do_vort_damp = .T. + external_ic = @[EXTERNAL_IC] + external_eta = .T. + gfs_phil = .false. + nggps_ic = @[NGGPS_IC] + mountain = @[MOUNTAIN] + ncep_ic = .F. + d_con = 1.0 + hord_mt = 6 + hord_vt = 6 + hord_tm = 6 + hord_dp = -6 + hord_tr = 8 + adjust_dry_mass = .F. + consv_te = 0. + consv_am = .F. + fill = .T. + dwind_2d = .F. + print_freq = 6 + warm_start = @[WARM_START] + no_dycore = .false. + z_tracer = .T. + read_increment = @[READ_INCREMENT] + res_latlon_dynamics = "fv3_increment.nc" + + do_schmidt = .true. + target_lat = 35.5 + target_lon = -97.5 + stretch_fac = 1.5 +!! nord_zs_filter = 4 + n_zs_filter = 0 + regional = .true. + bc_update_interval = 6 +/ + + &external_ic_nml + filtered_terrain = .true. + levp = 65 + gfs_dwinds = .true. + checker_tr = .F. + nt_checker = 0 +/ + + &gfs_physics_nml + fhzero = 3. + ldiag3d = .false. + fhcyc = 24. + nst_anl = .true. + use_ufo = .true. + pre_rad = .false. + ncld = 5 + imp_physics = 15 + spec_adv = .true. + RHGRD = 0.98 + lradar = @[LRADAR] + pdfcld = .false. + fhswr = 3600. + fhlwr = 3600. + ialb = 1 + iems = 1 + IAER = 111 + ico2 = 2 + isubc_sw = 2 + isubc_lw = 2 + isol = 2 + lwhtr = .true. + swhtr = .true. + cnvgwd = .true. + shal_cnv = .false. + cal_pre = .false. + redrag = .true. + dspheat = .true. + hybedmf = @[HYBEDMF] + satmedmf = @[SATMEDMF] + lheatstrg = @[LHEATSTRG] + random_clds = .false. + trans_trac = .true. + cnvcld = .false. + imfshalcnv = 2 + imfdeepcnv = 2 + cdmbgwd = 3.5, 0.25 ! NCEP default + prslrd0 = 0. + ivegsrc = 1 + isot = 1 + lsm = 1 + iopt_dveg = 2 + iopt_crs = 1 + iopt_btr = 1 + iopt_run = 1 + iopt_sfc = 1 + iopt_frz = 1 + iopt_inf = 1 + iopt_rad = 1 + iopt_alb = 2 + iopt_snf = 4 + iopt_tbot = 2 + iopt_stc = 1 + debug = .false. + oz_phys = @[OZ_PHYS_OLD] + oz_phys_2015 = @[OZ_PHYS_NEW] + nstf_name = 1,1,1,0,5 + cplflx = .F. + iau_delthrs = 6 + iaufhrs = 30 + iau_inc_files = @[IAU_INC_FILES] + do_sppt = @[DO_SPPT] + do_shum = @[DO_SHUM] + do_skeb = @[DO_SKEB] + do_sfcperts = @[DO_SFCPERTS] +/ + + &interpolator_nml + interp_method = 'conserve_great_circle' +/ + +&namsfc + FNGLAC = "global_glacier.2x2.grb", + FNMXIC = "global_maxice.2x2.grb", + FNTSFC = "RTGSST.1982.2012.monthly.clim.grb", + FNSNOC = "global_snoclim.1.875.grb", + FNZORC = "igbp" + FNALBC = "global_snowfree_albedo.bosu.t126.384.190.rg.grb", + FNALBC2 = "global_albedo4.1x1.grb", + FNAISC = "CFSR.SEAICE.1982.2012.monthly.clim.grb", + FNTG3C = "global_tg3clim.2.6x1.5.grb", + FNVEGC = "global_vegfrac.0.144.decpercent.grb", + FNVETC = "global_vegtype.igbp.t126.384.190.rg.grb", + FNSOTC = "global_soiltype.statsgo.t126.384.190.rg.grb", + FNSMCC = "global_soilmgldas.t126.384.190.grb", + FNMSKH = "seaice_newland.grb", + FNTSFA = "", + FNACNA = "", + FNSNOA = "", + FNVMNC = "global_shdmin.0.144x0.144.grb", + FNVMXC = "global_shdmax.0.144x0.144.grb", + FNSLPC = "global_slope.1x1.grb", + FNABSC = "global_mxsnoalb.uariz.t126.384.190.rg.grb", + LDEBUG =.false., + FSMCL(2) = 99999 + FSMCL(3) = 99999 + FSMCL(4) = 99999 + FTSFS = 90 + FAISS = 99999 + FSNOL = 99999 + FSICL = 99999 + FTSFL = 99999, + FAISL = 99999, + FVETL = 99999, + FSOTL = 99999, + FvmnL = 99999, + FvmxL = 99999, + FSLPL = 99999, + FABSL = 99999, + FSNOS = 99999, + FSICS = 99999, +/ + + &gfdl_cloud_microphysics_nml + sedi_transport = .false. + do_sedi_heat = .false. + rad_snow = .true. + rad_graupel = .true. + rad_rain = .true. + const_vi = .F. + const_vs = .F. + const_vg = .F. + const_vr = .F. + vi_max = 1. + vs_max = 2. + vg_max = 12. + vr_max = 12. + qi_lim = 1. + prog_ccn = .false. + do_qa = .true. + fast_sat_adj = .true. + tau_l2v = 180. + tau_v2l = 90. + tau_g2v = 900. + rthresh = 10.e-6 ! This is a key parameter for cloud water + dw_land = 0.16 + dw_ocean = 0.10 + ql_gen = 1.0e-3 + ql_mlt = 1.0e-3 + qi0_crt = 8.0E-5 + qs0_crt = 1.0e-3 + tau_i2s = 1000. + c_psaci = 0.05 + c_pgacs = 0.01 + rh_inc = 0.30 + rh_inr = 0.30 + rh_ins = 0.30 + ccn_l = 300. + ccn_o = 100. + c_paut = 0.5 + c_cracw = 0.8 + use_ppm = .false. + use_ccn = .true. + mono_prof = .true. + z_slope_liq = .true. + z_slope_ice = .true. + de_ice = .false. + fix_negative = .true. + icloud_f = 1 + mp_time = 90. +/ + +&nam_stochy +/ + +&nam_sfcperts +/ + +&cires_ugwp_nml + knob_ugwp_solver = 2 + knob_ugwp_source = 1,1,0,0 + knob_ugwp_wvspec = 1,25,25,25 + knob_ugwp_azdir = 2,4,4,4 + knob_ugwp_stoch = 0,0,0,0 + knob_ugwp_effac = 1,1,1,1 + knob_ugwp_doaxyz = 1 + knob_ugwp_doheat = 1 + knob_ugwp_dokdis = 1 + knob_ugwp_ndx4lh = 1 + knob_ugwp_version = 0 + launch_level = 25 +/ diff --git a/parm/ccpp_v15p2_c96.nml.IN b/parm/ccpp_v15p2_c96.nml.IN new file mode 100644 index 0000000000..334d887db6 --- /dev/null +++ b/parm/ccpp_v15p2_c96.nml.IN @@ -0,0 +1,305 @@ +&amip_interp_nml + interp_oi_sst = .true. + use_ncep_sst = .true. + use_ncep_ice = .false. + no_anom_sst = .false. + data_set = 'reynolds_oi' + date_out_of_range = 'climo' +/ + +&atmos_model_nml + blocksize = 32 + chksum_debug = .false. + dycore_only = .false. + fdiag = 1 + fhmax = 384 + fhout = 3 + fhmaxhf = 120 + fhouthf = 1 + ccpp_suite = 'FV3_GFS_v15p2' +/ + +&diag_manager_nml + prepend_date = .false. +/ + +&fms_io_nml + checksum_required = .false. + max_files_r = 100 + max_files_w = 100 +/ + +&fms_nml + clock_grain = 'ROUTINE' + domains_stack_size = 3000000 + print_memory_usage = .false. +/ + +&fv_core_nml + layout = 3,8 + io_layout = 1,1 + npx = 97 + npy = 97 + ntiles = 6 + npz = 64 + grid_type = -1 + make_nh = .false. + fv_debug = .false. + range_warn = .false. + reset_eta = .false. + n_sponge = 10 + nudge_qv = .true. + nudge_dz = .false. + tau = 10. + rf_cutoff = 7.5e2 + d2_bg_k1 = 0.15 + d2_bg_k2 = 0.02 + kord_tm = -9 + kord_mt = 9 + kord_wz = 9 + kord_tr = 9 + hydrostatic = .false. + phys_hydrostatic = .false. + use_hydro_pressure = .false. + beta = 0. + a_imp = 1. + p_fac = 0.1 + k_split = 2 + n_split = 6 + nwat = 6 + na_init = 0 + d_ext = 0. + dnats = 1 + fv_sg_adj = 450 + d2_bg = 0. + nord = 2 + dddmp = 0.1 + d4_bg = 0.12 + vtdm4 = 0.02 + delt_max = 0.002 + ke_bg = 0. + do_vort_damp = .true. + external_ic = .true. + external_eta = .true. + gfs_phil = .false. + nggps_ic = .true. + mountain = .false. + ncep_ic = .false. + d_con = 1. + hord_mt = 5 + hord_vt = 5 + hord_tm = 5 + hord_dp = -5 + hord_tr = 8 + adjust_dry_mass = .false. + consv_te = 1. + do_sat_adj = .true. + consv_am = .false. + fill = .true. + dwind_2d = .false. + print_freq = 6 + warm_start = .false. + no_dycore = .false. + z_tracer = .true. + agrid_vel_rst = .true. + read_increment = .false. + res_latlon_dynamics = "" +/ + +&external_ic_nml + filtered_terrain = .true. + levp = 65 + gfs_dwinds = .true. + checker_tr = .false. + nt_checker = 0 +/ + +&gfs_physics_nml + fhzero = 6 + h2o_phys = .true. + ldiag3d = .false. + fhcyc = 24 + use_ufo = .true. + pre_rad = .false. + ncld = 5 + imp_physics = 11 + pdfcld = .false. + fhswr = 3600. + fhlwr = 3600. + ialb = 1 + iems = 1 + iaer = 111 + ico2 = 2 + isubc_sw = 2 + isubc_lw = 2 + isol = 2 + lwhtr = .true. + swhtr = .true. + cnvgwd = .true. + shal_cnv = .true. + cal_pre = .false. + redrag = .true. + dspheat = .true. + hybedmf = .true. + random_clds = .false. + trans_trac = .true. + cnvcld = .true. + imfshalcnv = 2 + imfdeepcnv = 2 + cdmbgwd = 3.5,0.25 + prslrd0 = 0. + ivegsrc = 1 + isot = 1 + debug = .false. + oz_phys = .F. + oz_phys_2015 = .T. + nstf_name = 2,1,0,0,0 + nst_anl = .true. + psautco = 0.0008,0.0005 + prautco = 0.00015,0.00015 + lgfdlmprad = .true. + effr_in = .true. + do_sppt = .T. + do_shum = .T. + do_skeb = .T. + do_sfcperts = .F. +/ + +&gfdl_cloud_microphysics_nml + sedi_transport = .true. + do_sedi_heat = .false. + rad_snow = .true. + rad_graupel = .true. + rad_rain = .true. + const_vi = .F. + const_vs = .F. + const_vg = .F. + const_vr = .F. + vi_max = 1. + vs_max = 2. + vg_max = 12. + vr_max = 12. + qi_lim = 1. + prog_ccn = .false. + do_qa = .true. + fast_sat_adj = .true. + tau_l2v = 225. + tau_v2l = 150. + tau_g2v = 900. + rthresh = 10.e-6 ! This is a key parameter for cloud water + dw_land = 0.16 + dw_ocean = 0.10 + ql_gen = 1.0e-3 + ql_mlt = 1.0e-3 + qi0_crt = 8.0E-5 + qs0_crt = 1.0e-3 + tau_i2s = 1000. + c_psaci = 0.05 + c_pgacs = 0.01 + rh_inc = 0.30 + rh_inr = 0.30 + rh_ins = 0.30 + ccn_l = 300. + ccn_o = 100. + c_paut = 0.5 + c_cracw = 0.8 + use_ppm = .false. + use_ccn = .true. + mono_prof = .true. + z_slope_liq = .true. + z_slope_ice = .true. + de_ice = .false. + fix_negative = .true. + icloud_f = 1 + mp_time = 150. +/ + +&interpolator_nml + interp_method = 'conserve_great_circle' +/ + +&namsfc + FNGLAC = 'global_glacier.2x2.grb' + FNMXIC = 'global_maxice.2x2.grb' + FNTSFC = 'RTGSST.1982.2012.monthly.clim.grb' + FNSNOC = 'global_snoclim.1.875.grb' + FNZORC = 'igbp' + FNALBC = 'global_snowfree_albedo.bosu.t126.384.190.rg.grb' + FNALBC2 = 'global_albedo4.1x1.grb' + FNAISC = 'CFSR.SEAICE.1982.2012.monthly.clim.grb' + FNTG3C = 'global_tg3clim.2.6x1.5.grb' + FNVEGC = 'global_vegfrac.0.144.decpercent.grb' + FNVETC = 'global_vegtype.igbp.t126.384.190.rg.grb' + FNSOTC = 'global_soiltype.statsgo.t126.384.190.rg.grb' + FNSMCC = 'global_soilmgldas.t126.384.190.grb' + FNMSKH = 'seaice_newland.grb' + FNTSFA = '' + FNACNA = '' + FNSNOA = '' + FNVMNC = 'global_shdmin.0.144x0.144.grb' + FNVMXC = 'global_shdmax.0.144x0.144.grb' + FNSLPC = 'global_slope.1x1.grb' + FNABSC = 'global_mxsnoalb.uariz.t126.384.190.rg.grb' + LDEBUG = .false. + FSMCL(2) = 99999 + FSMCL(3) = 99999 + FSMCL(4) = 99999 + FTSFS = 90 + FSNOL = 99999 + FSICL = 99999 + FTSFL = 99999 + FAISL = 99999 + FVETL = 99999 + FSOTL = 99999 + FvmnL = 99999 + FvmxL = 99999 + FSLPL = 99999 + FABSL = 99999 +/ + +&fv_grid_nml + grid_file = 'INPUT/grid_spec.nc' +/ + +&nam_stochy + ntrunc = 766 + lon_s = 1536 + lat_s = 768 + skeb = 0.3 + iseed_skeb = 2019102712451 + iseed_shum = 2019102712452 + iseed_sppt = 2019102712453 + skeb_tau = 21600. + skeb_lscale = 500000. + skebnorm = 0 + skeb_npass = 30 + skeb_vdof = 5 + shum = 0.005 + shum_tau = 21600. + shum_lscale = 500000. + sppt = 0.5 + sppt_tau = 21600. + sppt_lscale = 500000. + sppt_logit = .true. + sppt_sfclimit = .true. + use_zmtnblck = .true. +/ + +&nam_sfcperts +/ + +&cires_ugwp_nml + knob_ugwp_solver = 2 + knob_ugwp_source = 1,1,0,0 + knob_ugwp_wvspec = 1,25,25,25 + knob_ugwp_azdir = 2,4,4,4 + knob_ugwp_stoch = 0,0,0,0 + knob_ugwp_effac = 1,1,1,1 + knob_ugwp_doaxyz = 1 + knob_ugwp_doheat = 1 + knob_ugwp_dokdis = 1 + knob_ugwp_ndx4lh = 1 + knob_ugwp_version = 0 + launch_level = 25 +/ + diff --git a/parm/ccpp_v16beta_c96.nml.IN b/parm/ccpp_v16beta_c96.nml.IN new file mode 100644 index 0000000000..a51fc7089c --- /dev/null +++ b/parm/ccpp_v16beta_c96.nml.IN @@ -0,0 +1,338 @@ +&amip_interp_nml + interp_oi_sst = .true. + use_ncep_sst = .true. + use_ncep_ice = .false. + no_anom_sst = .false. + data_set = 'reynolds_oi' + date_out_of_range = 'climo' +/ + +&atmos_model_nml + blocksize = 32 + chksum_debug = .false. + dycore_only = .false. + fdiag = 1 + fhmax = 384 + fhout = 3 + fhmaxhf = 120 + fhouthf = 1 + ccpp_suite = 'FV3_GFS_v16beta' +/ + +&diag_manager_nml + prepend_date = .false. +/ + +&fms_io_nml + checksum_required = .false. + max_files_r = 100 + max_files_w = 100 +/ + +&mpp_io_nml +shuffle=1 +deflate_level=1 +/ + +&fms_nml + clock_grain = 'ROUTINE' + domains_stack_size = 3000000 + print_memory_usage = .false. +/ + +&fv_core_nml + layout = 3,8 + io_layout = 1,1 + npx = 97 + npy = 97 + ntiles = 6 + npz = 64 + grid_type = -1 + make_nh = .false. + fv_debug = .false. + range_warn = .false. + reset_eta = .false. + n_sponge = 10 + nudge_qv = .true. + nudge_dz = .false. + tau = 10. + rf_cutoff = 7.5e2 + d2_bg_k1 = 0.20 + d2_bg_k2 = 0.0 + kord_tm = -9 + kord_mt = 9 + kord_wz = 9 + kord_tr = 9 + hydrostatic = .false. + phys_hydrostatic = .false. + use_hydro_pressure = .false. + beta = 0. + a_imp = 1. + p_fac = 0.1 + k_split = 2 + n_split = 6 + nwat = 6 + na_init = 0 + d_ext = 0. + dnats = 1 + fv_sg_adj = 450 + d2_bg = 0. + nord = 2 + dddmp = 0.1 + d4_bg = 0.12 + vtdm4 = 0.02 + delt_max = 0.002 + ke_bg = 0. + do_vort_damp = .true. + external_ic = .true. + external_eta = .true. + gfs_phil = .false. + nggps_ic = .true. + mountain = .false. + ncep_ic = .false. + d_con = 1. + hord_mt = 5 + hord_vt = 5 + hord_tm = 5 + hord_dp = -5 + hord_tr = 8 + adjust_dry_mass = .false. + consv_te = 1. + do_sat_adj = .true. + consv_am = .false. + fill = .true. + dwind_2d = .false. + print_freq = 6 + warm_start = .false. + no_dycore = .false. + z_tracer = .true. + agrid_vel_rst = .true. + read_increment = .false. + res_latlon_dynamics = "" +/ + +&external_ic_nml + filtered_terrain = .true. + levp = 65 + gfs_dwinds = .true. + checker_tr = .false. + nt_checker = 0 +/ + +&gfs_physics_nml + fhzero = 6 + h2o_phys = .true. + ldiag3d = .false. + fhcyc = 24 + use_ufo = .true. + pre_rad = .false. + ncld = 5 + imp_physics = 11 + pdfcld = .false. + fhswr = 3600. + fhlwr = 3600. + ialb = 1 + iems = 1 + iaer = 5111 + icliq_sw = 2 + iovr_lw = 3 + iovr_sw = 3 + ico2 = 2 + isubc_sw = 2 + isubc_lw = 2 + isol = 2 + lwhtr = .true. + swhtr = .true. + cnvgwd = .true. + shal_cnv = .true. + cal_pre = .false. + redrag = .true. + dspheat = .true. + hybedmf = .false. + satmedmf = .true. + isatmedmf = 1 + lheatstrg = .true. + random_clds = .false. + trans_trac = .true. + cnvcld = .true. + imfshalcnv = 2 + imfdeepcnv = 2 + cdmbgwd = 4.0,0.15,1.0,1.0 + prslrd0 = 0. + ivegsrc = 1 + isot = 1 + lsoil = 4 + lsm = 1 + iopt_dveg = 1 + iopt_crs = 1 + iopt_btr = 1 + iopt_run = 1 + iopt_sfc = 1 + iopt_frz = 1 + iopt_inf = 1 + iopt_rad = 1 + iopt_alb = 2 + iopt_snf = 4 + iopt_tbot = 2 + iopt_stc = 1 + debug = .false. + oz_phys = .F. + oz_phys_2015 = .T. + nstf_name = 2,1,0,0,0 + nst_anl = .true. + psautco = 0.0008,0.0005 + prautco = 0.00015,0.00015 + lgfdlmprad = .true. + effr_in = .true. + ldiag_ugwp = .false. + do_ugwp = .false. + do_tofd = .true. + do_sppt = .true. + do_shum = .true. + do_skeb = .true. + do_sfcperts = .false. +/ + +&gfdl_cloud_microphysics_nml + sedi_transport = .true. + do_sedi_heat = .false. + rad_snow = .true. + rad_graupel = .true. + rad_rain = .true. + const_vi = .F. + const_vs = .F. + const_vg = .F. + const_vr = .F. + vi_max = 1. + vs_max = 2. + vg_max = 12. + vr_max = 12. + qi_lim = 1. + prog_ccn = .false. + do_qa = .true. + fast_sat_adj = .true. + tau_l2v = 225. + tau_v2l = 150. + tau_g2v = 900. + rthresh = 10.e-6 ! This is a key parameter for cloud water + dw_land = 0.16 + dw_ocean = 0.10 + ql_gen = 1.0e-3 + ql_mlt = 1.0e-3 + qi0_crt = 8.0E-5 + qs0_crt = 1.0e-3 + tau_i2s = 1000. + c_psaci = 0.05 + c_pgacs = 0.01 + rh_inc = 0.30 + rh_inr = 0.30 + rh_ins = 0.30 + ccn_l = 300. + ccn_o = 100. + c_paut = 0.5 + c_cracw = 0.8 + use_ppm = .false. + use_ccn = .true. + mono_prof = .true. + z_slope_liq = .true. + z_slope_ice = .true. + de_ice = .false. + fix_negative = .true. + icloud_f = 1 + mp_time = 150. + reiflag = 2 +/ + +&interpolator_nml + interp_method = 'conserve_great_circle' +/ + +&namsfc + FNGLAC = 'global_glacier.2x2.grb' + FNMXIC = 'global_maxice.2x2.grb' + FNTSFC = 'RTGSST.1982.2012.monthly.clim.grb' + FNSNOC = 'global_snoclim.1.875.grb' + FNZORC = 'igbp' + FNALBC = 'global_snowfree_albedo.bosu.t126.384.190.rg.grb' + FNALBC2 = 'global_albedo4.1x1.grb' + FNAISC = 'CFSR.SEAICE.1982.2012.monthly.clim.grb' + FNTG3C = 'global_tg3clim.2.6x1.5.grb' + FNVEGC = 'global_vegfrac.0.144.decpercent.grb' + FNVETC = 'global_vegtype.igbp.t126.384.190.rg.grb' + FNSOTC = 'global_soiltype.statsgo.t126.384.190.rg.grb' + FNSMCC = 'global_soilmgldas.t126.384.190.grb' + FNMSKH = 'seaice_newland.grb' + FNTSFA = '' + FNACNA = '' + FNSNOA = '' + FNVMNC = 'global_shdmin.0.144x0.144.grb' + FNVMXC = 'global_shdmax.0.144x0.144.grb' + FNSLPC = 'global_slope.1x1.grb' + FNABSC = 'global_mxsnoalb.uariz.t126.384.190.rg.grb' + LDEBUG = .false. + FSMCL(2) = 99999 + FSMCL(3) = 99999 + FSMCL(4) = 99999 + LANDICE = .true. + FTSFS = 90 + FAISL = 99999 + FAISS = 99999 + FSNOL = 99999 + FSNOS = 99999 + FSICL = 99999 + FSICS = 99999 + FTSFL = 99999 + FVETL = 99999 + FSOTL = 99999 + FvmnL = 99999 + FvmxL = 99999 + FSLPL = 99999 + FABSL = 99999 +/ + +&fv_grid_nml + grid_file = 'INPUT/grid_spec.nc' +/ + +&nam_stochy + ntrunc = 766 + lon_s = 1536 + lat_s = 768 + skeb = 0.3 + iseed_skeb = 2019102712451 + iseed_shum = 2019102712452 + iseed_sppt = 2019102712453 + skeb_tau = 21600. + skeb_lscale = 500000. + skebnorm = 0 + skeb_npass = 30 + skeb_vdof = 5 + shum = 0.005 + shum_tau = 21600. + shum_lscale = 500000. + sppt = 0.5 + sppt_tau = 21600. + sppt_lscale = 500000. + sppt_logit = .true. + sppt_sfclimit = .true. + use_zmtnblck = .true. +/ + +&nam_sfcperts +/ + +&cires_ugwp_nml + knob_ugwp_solver = 2 + knob_ugwp_source = 1,1,0,0 + knob_ugwp_wvspec = 1,25,25,25 + knob_ugwp_azdir = 2,4,4,4 + knob_ugwp_stoch = 0,0,0,0 + knob_ugwp_effac = 1,1,1,1 + knob_ugwp_doaxyz = 1 + knob_ugwp_doheat = 1 + knob_ugwp_dokdis = 1 + knob_ugwp_ndx4lh = 1 + knob_ugwp_version = 0 + launch_level = 27 +/ + diff --git a/parm/gfdlmp.nml.IN b/parm/gfdlmp.nml.IN index c003ab6cdd..8b9750155c 100644 --- a/parm/gfdlmp.nml.IN +++ b/parm/gfdlmp.nml.IN @@ -149,8 +149,8 @@ random_clds = .false. trans_trac = .false. cnvcld = .true. - imfshalcnv = 2 - imfdeepcnv = 2 + imfshalcnv = @[IMFSHALCNV] + imfdeepcnv = @[IMFDEEPCNV] cdmbgwd = 3.5,0.25 prslrd0 = 0. ivegsrc = 1 diff --git a/parm/input.nml.IN b/parm/input.nml.IN index c4d53f76ca..e3a4fd75ab 100644 --- a/parm/input.nml.IN +++ b/parm/input.nml.IN @@ -158,7 +158,7 @@ cnvcld = .true. imfshalcnv = 2 imfdeepcnv = 2 - isatmedmf = 0 + isatmedmf = @[ISATMEDMF] cdmbgwd = 3.5,0.25 prslrd0 = 0. ivegsrc = 1 diff --git a/stochastic_physics b/stochastic_physics index 25c3321ec7..1745422af7 160000 --- a/stochastic_physics +++ b/stochastic_physics @@ -1 +1 @@ -Subproject commit 25c3321ec77fe0de50b60399a4eff71363fabd90 +Subproject commit 1745422af76d830757cd6035b6ea101e92b4cac1 diff --git a/tests/compile.sh b/tests/compile.sh index f97c101521..43d3fb6734 100755 --- a/tests/compile.sh +++ b/tests/compile.sh @@ -60,6 +60,12 @@ cd "$PATHTR/../NEMS" COMPONENTS="FMS,FV3" if [[ "${MAKE_OPT}" == *"CCPP=Y"* ]]; then COMPONENTS="CCPP,$COMPONENTS" + # FIXME - create CCPP include directory before building FMS to avoid + # gfortran warnings of non-existent include directory (adding + # -Wno-missing-include-dirs) to the GNU compiler flags does not work, + # see also https://gcc.gnu.org/bugzilla/show_bug.cgi?id=55534); + # this line can be removed once FMS becomes a pre-installed library + mkdir -p $PATHTR/ccpp/include fi if [[ "${MAKE_OPT}" == *"WW3=Y"* ]]; then diff --git a/tests/compile_cmake.sh b/tests/compile_cmake.sh index 434c205869..c422307f72 100755 --- a/tests/compile_cmake.sh +++ b/tests/compile_cmake.sh @@ -89,13 +89,7 @@ fi if [[ "${MAKE_OPT}" == *"CCPP=Y"* ]]; then - # Account for inconsistencies in HPC modules: if environment variable - # NETCDF is undefined, try to set from NETCDF_DIR, NETCDF_ROOT, ... - if [[ "${MACHINE_ID}" == "wcoss_cray" ]]; then - NETCDF=${NETCDF:-${NETCDF_DIR}} - fi - - CCPP_CMAKE_FLAGS="${CCPP_CMAKE_FLAGS} -DNETCDF_DIR=${NETCDF} -DCCPP=ON -DMPI=ON" + CCPP_CMAKE_FLAGS="${CCPP_CMAKE_FLAGS} -DCCPP=ON -DMPI=ON" if [[ "${MAKE_OPT}" == *"DEBUG=Y"* ]]; then CCPP_CMAKE_FLAGS="${CCPP_CMAKE_FLAGS} -DCMAKE_BUILD_TYPE=Debug" @@ -157,6 +151,7 @@ CCPP_CMAKE_FLAGS=$(trim "${CCPP_CMAKE_FLAGS}") else module use $PATHTR/modulefiles/${MACHINE_ID} module load fv3 + module list fi cd ${BUILD_DIR} diff --git a/tests/default_vars.sh b/tests/default_vars.sh index 110993b338..a8dc0f2f36 100755 --- a/tests/default_vars.sh +++ b/tests/default_vars.sh @@ -135,6 +135,7 @@ export GWD_OPT=1 # PBL export SATMEDMF=.F. +export ISATMEDMF=0 export HYBEDMF=.T. export SHINHONG=.F. export DO_YSU=.F. diff --git a/tests/detect_machine.sh b/tests/detect_machine.sh index e3c8b63879..20acc01f9b 100755 --- a/tests/detect_machine.sh +++ b/tests/detect_machine.sh @@ -122,6 +122,9 @@ case $(hostname -f) in login4.stampede2.tacc.utexas.edu) MACHINE_ID=stampede ;; ### stampede4 esac +# Overwrite auto-detect with NEMS_MACHINE if set +MACHINE_ID=${NEMS_MACHINE:-${MACHINE_ID}} + # For Theia and Cheyenne, append compiler if [ $MACHINE_ID = theia ] || [ $MACHINE_ID = hera ] || [ $MACHINE_ID = cheyenne ] || [ $MACHINE_ID = jet ] || [ $MACHINE_ID = gaea ] || [ $MACHINE_ID = stampede ] ; then MACHINE_ID=${MACHINE_ID}.${COMPILER} diff --git a/tests/fv3_conf/ccpp_control_run.IN b/tests/fv3_conf/ccpp_control_run.IN index 591497e49c..73cb9b984d 100644 --- a/tests/fv3_conf/ccpp_control_run.IN +++ b/tests/fv3_conf/ccpp_control_run.IN @@ -1,4 +1,4 @@ - +rm -fr INPUT RESTART if [ $NPX = 97 ]; then inputdir=FV3_input_data elif [ $NPX = 193 ]; then @@ -32,10 +32,15 @@ cp @[RTPWD]/${inputdir}/*grb . cp @[RTPWD]/${inputdir}/*_table . cp @[RTPWD]/${inputdir}/*configure . -cp ${PATHRT}/../ccpp/suites/suite_${CCPP_SUITE}.xml suite_${CCPP_SUITE}.xml +if [ $CPLWAV = .T. ]; then +cp @[RTPWD]/WW3_input_data/mod_def.* . +cp @[RTPWD]/WW3_input_data/@[SYEAR]@[SMONTH]@[SDAY]/ww3_multi.inp . +fi + +cp ${PATHRT}/../FV3/ccpp/suites/suite_${CCPP_SUITE}.xml suite_${CCPP_SUITE}.xml # Add path to libccpp.so and libccpphys.so to LD_LIBRARY_PATH, append to module-setup.sh echo " " >> module-setup.sh echo "# Add path to libccpp.so and libccpphys.so to LD_LIBRARY_PATH" -echo "export LD_LIBRARY_PATH=${PATHRT}/../${CCPP_LIB_DIR}:${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}" >> module-setup.sh +echo "export LD_LIBRARY_PATH=${PATHRT}/../FV3/${CCPP_LIB_DIR}:${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}" >> module-setup.sh echo " " >> module-setup.sh diff --git a/tests/fv3_conf/ccpp_cpt_run.IN b/tests/fv3_conf/ccpp_cpt_run.IN index d6d84e1338..49792171ed 100644 --- a/tests/fv3_conf/ccpp_cpt_run.IN +++ b/tests/fv3_conf/ccpp_cpt_run.IN @@ -1,3 +1,4 @@ +rm -fr INPUT RESTART inputdir=FV3_input_data_127 if [ $WARM_START = .F. ]; then cp -r @[RTPWD]/${inputdir}/INPUT . @@ -18,10 +19,10 @@ cp @[RTPWD]/${inputdir}/diag_table_mg3tke diag_table cp @[RTPWD]/${inputdir}/field_table_csawmg3shoc field_table cp @[RTPWD]/${inputdir}/*configure . -cp ${PATHRT}/../ccpp/suites/suite_${CCPP_SUITE}.xml suite_${CCPP_SUITE}.xml +cp ${PATHRT}/../FV3/ccpp/suites/suite_${CCPP_SUITE}.xml suite_${CCPP_SUITE}.xml # Add path to libccpp.so and libccpphys.so to LD_LIBRARY_PATH, append to module-setup.sh echo " " >> module-setup.sh echo "# Add path to libccpp.so and libccpphys.so to LD_LIBRARY_PATH" -echo "export LD_LIBRARY_PATH=${PATHRT}/../${CCPP_LIB_DIR}:${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}" >> module-setup.sh +echo "export LD_LIBRARY_PATH=${PATHRT}/../FV3/${CCPP_LIB_DIR}:${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}" >> module-setup.sh echo " " >> module-setup.sh diff --git a/tests/fv3_conf/ccpp_csawmg3shoc127_run.IN b/tests/fv3_conf/ccpp_csawmg3shoc127_run.IN index d6d84e1338..49792171ed 100644 --- a/tests/fv3_conf/ccpp_csawmg3shoc127_run.IN +++ b/tests/fv3_conf/ccpp_csawmg3shoc127_run.IN @@ -1,3 +1,4 @@ +rm -fr INPUT RESTART inputdir=FV3_input_data_127 if [ $WARM_START = .F. ]; then cp -r @[RTPWD]/${inputdir}/INPUT . @@ -18,10 +19,10 @@ cp @[RTPWD]/${inputdir}/diag_table_mg3tke diag_table cp @[RTPWD]/${inputdir}/field_table_csawmg3shoc field_table cp @[RTPWD]/${inputdir}/*configure . -cp ${PATHRT}/../ccpp/suites/suite_${CCPP_SUITE}.xml suite_${CCPP_SUITE}.xml +cp ${PATHRT}/../FV3/ccpp/suites/suite_${CCPP_SUITE}.xml suite_${CCPP_SUITE}.xml # Add path to libccpp.so and libccpphys.so to LD_LIBRARY_PATH, append to module-setup.sh echo " " >> module-setup.sh echo "# Add path to libccpp.so and libccpphys.so to LD_LIBRARY_PATH" -echo "export LD_LIBRARY_PATH=${PATHRT}/../${CCPP_LIB_DIR}:${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}" >> module-setup.sh +echo "export LD_LIBRARY_PATH=${PATHRT}/../FV3/${CCPP_LIB_DIR}:${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}" >> module-setup.sh echo " " >> module-setup.sh diff --git a/tests/fv3_conf/ccpp_csawmg_run.IN b/tests/fv3_conf/ccpp_csawmg_run.IN index 7f61d03250..ae0b1746e3 100644 --- a/tests/fv3_conf/ccpp_csawmg_run.IN +++ b/tests/fv3_conf/ccpp_csawmg_run.IN @@ -1,4 +1,4 @@ - +rm -fr INPUT RESTART if [ $WARM_START = .F. ]; then cp -r @[RTPWD]/FV3_input_data/INPUT . mkdir RESTART @@ -19,10 +19,10 @@ cp @[RTPWD]/FV3_input_data/diag_table_mgrs diag_table cp @[RTPWD]/FV3_input_data/field_table_csawmg field_table cp @[RTPWD]/FV3_input_data/*configure . -cp ${PATHRT}/../ccpp/suites/suite_${CCPP_SUITE}.xml suite_${CCPP_SUITE}.xml +cp ${PATHRT}/../FV3/ccpp/suites/suite_${CCPP_SUITE}.xml suite_${CCPP_SUITE}.xml # Add path to libccpp.so and libccpphys.so to LD_LIBRARY_PATH, append to module-setup.sh echo " " >> module-setup.sh echo "# Add path to libccpp.so and libccpphys.so to LD_LIBRARY_PATH" -echo "export LD_LIBRARY_PATH=${PATHRT}/../${CCPP_LIB_DIR}:${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}" >> module-setup.sh +echo "export LD_LIBRARY_PATH=${PATHRT}/../FV3/${CCPP_LIB_DIR}:${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}" >> module-setup.sh echo " " >> module-setup.sh diff --git a/tests/fv3_conf/ccpp_csawmgshoc_run.IN b/tests/fv3_conf/ccpp_csawmgshoc_run.IN index 0524a05561..e41ea32fd6 100644 --- a/tests/fv3_conf/ccpp_csawmgshoc_run.IN +++ b/tests/fv3_conf/ccpp_csawmgshoc_run.IN @@ -1,4 +1,4 @@ - +rm -fr INPUT RESTART if [ $WARM_START = .F. ]; then cp -r @[RTPWD]/FV3_input_data/INPUT . mkdir RESTART @@ -19,10 +19,10 @@ cp @[RTPWD]/FV3_input_data/diag_table_mgtkers diag_table cp @[RTPWD]/FV3_input_data/field_table_csawmgshoc field_table cp @[RTPWD]/FV3_input_data/*configure . -cp ${PATHRT}/../ccpp/suites/suite_${CCPP_SUITE}.xml suite_${CCPP_SUITE}.xml +cp ${PATHRT}/../FV3/ccpp/suites/suite_${CCPP_SUITE}.xml suite_${CCPP_SUITE}.xml # Add path to libccpp.so and libccpphys.so to LD_LIBRARY_PATH, append to module-setup.sh echo " " >> module-setup.sh echo "# Add path to libccpp.so and libccpphys.so to LD_LIBRARY_PATH" -echo "export LD_LIBRARY_PATH=${PATHRT}/../${CCPP_LIB_DIR}:${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}" >> module-setup.sh +echo "export LD_LIBRARY_PATH=${PATHRT}/../FV3/${CCPP_LIB_DIR}:${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}" >> module-setup.sh echo " " >> module-setup.sh diff --git a/tests/fv3_conf/ccpp_gf_thompson_run.IN b/tests/fv3_conf/ccpp_gf_thompson_run.IN index 3a79ce13b2..3b6af18ae8 100644 --- a/tests/fv3_conf/ccpp_gf_thompson_run.IN +++ b/tests/fv3_conf/ccpp_gf_thompson_run.IN @@ -22,11 +22,11 @@ cp @[RTPWD]/FV3_input_data_gsd/qr_acr_qg.dat . cp @[RTPWD]/FV3_input_data_gsd/freezeH2O.dat . cp @[RTPWD]/FV3_input_data_gsd/CCN_ACTIVATE.BIN . -cp ${PATHRT}/../ccpp/suites/suite_${CCPP_SUITE}.xml suite_${CCPP_SUITE}.xml +cp ${PATHRT}/../FV3/ccpp/suites/suite_${CCPP_SUITE}.xml suite_${CCPP_SUITE}.xml # Add path to libccpp.so and libccpphys.so to LD_LIBRARY_PATH, append to module-setup.sh echo " " >> module-setup.sh echo "# Add path to libccpp.so and libccpphys.so to LD_LIBRARY_PATH" -echo "export LD_LIBRARY_PATH=${PATHRT}/../${CCPP_LIB_DIR}:${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}" >> module-setup.sh +echo "export LD_LIBRARY_PATH=${PATHRT}/../FV3/${CCPP_LIB_DIR}:${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}" >> module-setup.sh echo " " >> module-setup.sh diff --git a/tests/fv3_conf/ccpp_gfdlmp_run.IN b/tests/fv3_conf/ccpp_gfdlmp_run.IN index d52f6beeab..095bac5f42 100644 --- a/tests/fv3_conf/ccpp_gfdlmp_run.IN +++ b/tests/fv3_conf/ccpp_gfdlmp_run.IN @@ -1,4 +1,4 @@ - +rm -fr INPUT RESTART if [ $WARM_START = .F. ]; then cp -r @[RTPWD]/FV3_input_data/INPUT . mkdir RESTART @@ -17,10 +17,15 @@ cp @[RTPWD]/FV3_input_data/diag_table_gfdlmp diag_table cp @[RTPWD]/FV3_input_data/field_table_gfdlmp field_table cp @[RTPWD]/FV3_input_data/*configure . -cp ${PATHRT}/../ccpp/suites/suite_${CCPP_SUITE}.xml suite_${CCPP_SUITE}.xml +if [ $CPLWAV = .T. ]; then +cp @[RTPWD]/WW3_input_data/mod_def.* . +cp @[RTPWD]/WW3_input_data/@[SYEAR]@[SMONTH]@[SDAY]/ww3_multi.inp . +fi + +cp ${PATHRT}/../FV3/ccpp/suites/suite_${CCPP_SUITE}.xml suite_${CCPP_SUITE}.xml # Add path to libccpp.so and libccpphys.so to LD_LIBRARY_PATH, append to module-setup.sh echo " " >> module-setup.sh echo "# Add path to libccpp.so and libccpphys.so to LD_LIBRARY_PATH" -echo "export LD_LIBRARY_PATH=${PATHRT}/../${CCPP_LIB_DIR}:${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}" >> module-setup.sh +echo "export LD_LIBRARY_PATH=${PATHRT}/../FV3/${CCPP_LIB_DIR}:${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}" >> module-setup.sh echo " " >> module-setup.sh diff --git a/tests/fv3_conf/ccpp_gfs_v15_run.IN b/tests/fv3_conf/ccpp_gfs_v15_run.IN index c87765f2e4..3295cd354c 100644 --- a/tests/fv3_conf/ccpp_gfs_v15_run.IN +++ b/tests/fv3_conf/ccpp_gfs_v15_run.IN @@ -1,4 +1,4 @@ - +rm -fr INPUT RESTART if [ $WARM_START = .F. ]; then cp -r @[RTPWD]/FV3_input_data/INPUT . mkdir RESTART @@ -18,10 +18,10 @@ cp @[RTPWD]/FV3_input_data/diag_table_gfdlmp diag_table cp @[RTPWD]/FV3_input_data_gsd/field_table_suite2 field_table cp @[RTPWD]/FV3_input_data/*configure . -cp ${PATHRT}/../ccpp/suites/suite_${CCPP_SUITE}.xml suite_${CCPP_SUITE}.xml +cp ${PATHRT}/../FV3/ccpp/suites/suite_${CCPP_SUITE}.xml suite_${CCPP_SUITE}.xml # Add path to libccpp.so and libccpphys.so to LD_LIBRARY_PATH, append to module-setup.sh echo " " >> module-setup.sh echo "# Add path to libccpp.so and libccpphys.so to LD_LIBRARY_PATH" -echo "export LD_LIBRARY_PATH=${PATHRT}/../${CCPP_LIB_DIR}:${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}" >> module-setup.sh +echo "export LD_LIBRARY_PATH=${PATHRT}/../FV3/${CCPP_LIB_DIR}:${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}" >> module-setup.sh echo " " >> module-setup.sh diff --git a/tests/fv3_conf/ccpp_gsd_run.IN b/tests/fv3_conf/ccpp_gsd_run.IN index 2f12b2a2c9..957dd6d5a3 100644 --- a/tests/fv3_conf/ccpp_gsd_run.IN +++ b/tests/fv3_conf/ccpp_gsd_run.IN @@ -53,11 +53,11 @@ if [ $IMP_PHYSICS = 8 ]; then cp @[RTPWD]/FV3_input_data_gsd/CCN_ACTIVATE.BIN . fi -cp ${PATHRT}/../ccpp/suites/suite_${CCPP_SUITE}.xml suite_${CCPP_SUITE}.xml +cp ${PATHRT}/../FV3/ccpp/suites/suite_${CCPP_SUITE}.xml suite_${CCPP_SUITE}.xml # Add path to libccpp.so and libccpphys.so to LD_LIBRARY_PATH, append to module-setup.sh echo " " >> module-setup.sh echo "# Add path to libccpp.so and libccpphys.so to LD_LIBRARY_PATH" -echo "export LD_LIBRARY_PATH=${PATHRT}/../${CCPP_LIB_DIR}:${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}" >> module-setup.sh +echo "export LD_LIBRARY_PATH=${PATHRT}/../FV3/${CCPP_LIB_DIR}:${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}" >> module-setup.sh echo " " >> module-setup.sh diff --git a/tests/fv3_conf/ccpp_gsd_sar_25km_run.IN b/tests/fv3_conf/ccpp_gsd_sar_25km_run.IN new file mode 100644 index 0000000000..dabc2ad2c5 --- /dev/null +++ b/tests/fv3_conf/ccpp_gsd_sar_25km_run.IN @@ -0,0 +1,35 @@ + +rm -fr INPUT RESTART +mkdir INPUT RESTART +cp -r /scratch1/BMC/gmtb/ufs-weather-model/RT/NEMSfv3gfs/FV3_input_data_temporary_gsd_sar_25km/*.nc INPUT/ + +cp @[RTPWD]/FV3_input_data/INPUT/aerosol.dat . +cp @[RTPWD]/FV3_input_data/INPUT/co2historicaldata_201*.txt . +cp @[RTPWD]/FV3_input_data/INPUT/sfc_emissivity_idx.txt . +cp @[RTPWD]/FV3_input_data/INPUT/solarconstant_noaa_an.txt . +cp @[RTPWD]/FV3_input_data/ozprdlos_2015_new_sbuvO3_tclm15_nuchem.f77 ./global_o3prdlos.f77 +cp @[RTPWD]/FV3_input_data/global_h2o_pltc.f77 ./global_h2oprdlos.f77 +cp @[RTPWD]/FV3_input_data/*grb . +cp @[RTPWD]/FV3_input_data/*_table . + +# Copy SAR diag and field table files +cp /scratch1/BMC/gmtb/ufs-weather-model/RT/NEMSfv3gfs/FV3_input_data_temporary_gsd_sar_25km/diag_table_gsd_sar diag_table +cp /scratch1/BMC/gmtb/ufs-weather-model/RT/NEMSfv3gfs/FV3_input_data_temporary_gsd_sar_25km/field_table_gsd_sar field_table + +cp @[RTPWD]/FV3_input_data/*configure . + +# Thompson MP lookup tables - copy standard and SIONlib tables of precomputed tables +cp @[RTPWD]/FV3_input_data_gsd/thompson_tables_precomp.sl . +cp @[RTPWD]/FV3_input_data_gsd/qr_acr_qs.dat . +cp @[RTPWD]/FV3_input_data_gsd/qr_acr_qg.dat . +cp @[RTPWD]/FV3_input_data_gsd/freezeH2O.dat . +cp @[RTPWD]/FV3_input_data_gsd/CCN_ACTIVATE.BIN . + +cp ${PATHRT}/../FV3/ccpp/suites/suite_${CCPP_SUITE}.xml suite_${CCPP_SUITE}.xml + +# Add path to libccpp.so and libccpphys.so to LD_LIBRARY_PATH, append to module-setup.sh +echo " " >> module-setup.sh +echo "# Add path to libccpp.so and libccpphys.so to LD_LIBRARY_PATH" +echo "export LD_LIBRARY_PATH=${PATHRT}/../FV3/${CCPP_LIB_DIR}:${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}" >> module-setup.sh +echo " " >> module-setup.sh + diff --git a/tests/fv3_conf/ccpp_gsd_sar_run.IN b/tests/fv3_conf/ccpp_gsd_sar_run.IN new file mode 100644 index 0000000000..a10b277155 --- /dev/null +++ b/tests/fv3_conf/ccpp_gsd_sar_run.IN @@ -0,0 +1,34 @@ +rm -fr INPUT RESTART +mkdir INPUT RESTART +cp -r /scratch1/BMC/gmtb/ufs-weather-model/RT/NEMSfv3gfs/FV3_input_data_temporary_gsd_sar/*.nc INPUT/ + +cp @[RTPWD]/FV3_input_data/INPUT/aerosol.dat . +cp @[RTPWD]/FV3_input_data/INPUT/co2historicaldata_201*.txt . +cp @[RTPWD]/FV3_input_data/INPUT/sfc_emissivity_idx.txt . +cp @[RTPWD]/FV3_input_data/INPUT/solarconstant_noaa_an.txt . +cp @[RTPWD]/FV3_input_data/ozprdlos_2015_new_sbuvO3_tclm15_nuchem.f77 ./global_o3prdlos.f77 +cp @[RTPWD]/FV3_input_data/global_h2o_pltc.f77 ./global_h2oprdlos.f77 +cp @[RTPWD]/FV3_input_data/*grb . +cp @[RTPWD]/FV3_input_data/*_table . + +# Copy SAR diag and field table files +cp /scratch1/BMC/gmtb/ufs-weather-model/RT/NEMSfv3gfs/FV3_input_data_temporary_gsd_sar/diag_table_gsd_sar diag_table +cp /scratch1/BMC/gmtb/ufs-weather-model/RT/NEMSfv3gfs/FV3_input_data_temporary_gsd_sar/field_table_gsd_sar field_table + +cp @[RTPWD]/FV3_input_data/*configure . + +# Thompson MP lookup tables - copy standard and SIONlib tables of precomputed tables +cp @[RTPWD]/FV3_input_data_gsd/thompson_tables_precomp.sl . +cp @[RTPWD]/FV3_input_data_gsd/qr_acr_qs.dat . +cp @[RTPWD]/FV3_input_data_gsd/qr_acr_qg.dat . +cp @[RTPWD]/FV3_input_data_gsd/freezeH2O.dat . +cp @[RTPWD]/FV3_input_data_gsd/CCN_ACTIVATE.BIN . + +cp ${PATHRT}/../FV3/ccpp/suites/suite_${CCPP_SUITE}.xml suite_${CCPP_SUITE}.xml + +# Add path to libccpp.so and libccpphys.so to LD_LIBRARY_PATH, append to module-setup.sh +echo " " >> module-setup.sh +echo "# Add path to libccpp.so and libccpphys.so to LD_LIBRARY_PATH" +echo "export LD_LIBRARY_PATH=${PATHRT}/../FV3/${CCPP_LIB_DIR}:${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}" >> module-setup.sh +echo " " >> module-setup.sh + diff --git a/tests/fv3_conf/ccpp_regional_FA_run.IN b/tests/fv3_conf/ccpp_regional_FA_run.IN new file mode 100644 index 0000000000..f3181c4be4 --- /dev/null +++ b/tests/fv3_conf/ccpp_regional_FA_run.IN @@ -0,0 +1,30 @@ +rsync -arv @[RTPWD]/FV3_regional_input_data/. . +rsync -arv @[RTPWD]/@[INPUT_DIR]/model_configure . + +rm -rf INPUT RESTART +mkdir INPUT RESTART + +rsync -arv @[RTPWD]/@[INPUT_DIR]/INPUT/. INPUT/. + +if [ $WARM_START = .T. ]; then + cp ../fv3_ccpp_regional_control${RT_SUFFIX}/RESTART/20181015.120000.coupler.res INPUT/coupler.res + cp ../fv3_ccpp_regional_control${RT_SUFFIX}/RESTART/20181015.120000.fv_core.res.nc INPUT/fv_core.res.nc + cp ../fv3_ccpp_regional_control${RT_SUFFIX}/RESTART/20181015.120000.fv_core.res.tile1.nc INPUT/fv_core.res.tile1.nc + cp ../fv3_ccpp_regional_control${RT_SUFFIX}/RESTART/20181015.120000.fv_srf_wnd.res.tile1.nc INPUT/fv_srf_wnd.res.tile1.nc + cp ../fv3_ccpp_regional_control${RT_SUFFIX}/RESTART/20181015.120000.fv_tracer.res.tile1.nc INPUT/fv_tracer.res.tile1.nc + cp ../fv3_ccpp_regional_control${RT_SUFFIX}/RESTART/20181015.120000.phy_data.nc INPUT/phy_data.nc + cp ../fv3_ccpp_regional_control${RT_SUFFIX}/RESTART/20181015.120000.sfc_data.nc INPUT/sfc_data.nc +fi +cp @[RTPWD]/FV3_input_data/DETAMPNEW_DATA* . +cp @[RTPWD]/FV3_input_data/*grb . +cp @[RTPWD]/FV3_input_data/*_table . +cp /scratch1/BMC/gmtb/ufs-weather-model/RT/NEMSfv3gfs/FV3_input_data_temporary_hafs/diag_table_FA diag_table +cp /scratch1/BMC/gmtb/ufs-weather-model/RT/NEMSfv3gfs/FV3_input_data_temporary_hafs/field_table_FA_nwat4 field_table + +cp ${PATHRT}/../FV3/ccpp/suites/suite_${CCPP_SUITE}.xml suite_${CCPP_SUITE}.xml + +# Add path to libccpp.so and libccpphys.so to LD_LIBRARY_PATH, append to module-setup.sh +echo " " >> module-setup.sh +echo "# Add path to libccpp.so and libccpphys.so to LD_LIBRARY_PATH" +echo "export LD_LIBRARY_PATH=${PATHRT}/../FV3/${CCPP_LIB_DIR}:${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}" >> module-setup.sh +echo " " >> module-setup.sh diff --git a/tests/fv3_conf/ccpp_regional_run.IN b/tests/fv3_conf/ccpp_regional_run.IN index 65311d91e6..d4070e0c6a 100644 --- a/tests/fv3_conf/ccpp_regional_run.IN +++ b/tests/fv3_conf/ccpp_regional_run.IN @@ -16,10 +16,10 @@ if [ $WARM_START = .T. ]; then cp ../fv3_ccpp_regional_control${RT_SUFFIX}/RESTART/20181015.120000.sfc_data.nc INPUT/sfc_data.nc fi -cp ${PATHRT}/../ccpp/suites/suite_${CCPP_SUITE}.xml suite_${CCPP_SUITE}.xml +cp ${PATHRT}/../FV3/ccpp/suites/suite_${CCPP_SUITE}.xml suite_${CCPP_SUITE}.xml # Add path to libccpp.so and libccpphys.so to LD_LIBRARY_PATH, append to module-setup.sh echo " " >> module-setup.sh echo "# Add path to libccpp.so and libccpphys.so to LD_LIBRARY_PATH" -echo "export LD_LIBRARY_PATH=${PATHRT}/../${CCPP_LIB_DIR}:${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}" >> module-setup.sh +echo "export LD_LIBRARY_PATH=${PATHRT}/../FV3/${CCPP_LIB_DIR}:${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}" >> module-setup.sh echo " " >> module-setup.sh diff --git a/tests/fv3_conf/ccpp_satmedmf_run.IN b/tests/fv3_conf/ccpp_satmedmf_run.IN index bb8b2b57d0..7ab7565912 100644 --- a/tests/fv3_conf/ccpp_satmedmf_run.IN +++ b/tests/fv3_conf/ccpp_satmedmf_run.IN @@ -1,4 +1,4 @@ - +rm -fr INPUT RESTART if [ $NPX = 97 ]; then inputdir=FV3_input_data elif [ $NPX = 193 ]; then @@ -26,10 +26,10 @@ cp @[RTPWD]/${inputdir}/*_table . cp @[RTPWD]/${inputdir}/field_table_satmedmf field_table cp @[RTPWD]/${inputdir}/*configure . -cp ${PATHRT}/../ccpp/suites/suite_${CCPP_SUITE}.xml suite_${CCPP_SUITE}.xml +cp ${PATHRT}/../FV3/ccpp/suites/suite_${CCPP_SUITE}.xml suite_${CCPP_SUITE}.xml # Add path to libccpp.so and libccpphys.so to LD_LIBRARY_PATH, append to module-setup.sh echo " " >> module-setup.sh echo "# Add path to libccpp.so and libccpphys.so to LD_LIBRARY_PATH" -echo "export LD_LIBRARY_PATH=${PATHRT}/../${CCPP_LIB_DIR}:${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}" >> module-setup.sh +echo "export LD_LIBRARY_PATH=${PATHRT}/../FV3/${CCPP_LIB_DIR}:${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}" >> module-setup.sh echo " " >> module-setup.sh diff --git a/tests/fv3_conf/ccpp_stretched_run.IN b/tests/fv3_conf/ccpp_stretched_run.IN index cdb8d702a6..41793a8143 100644 --- a/tests/fv3_conf/ccpp_stretched_run.IN +++ b/tests/fv3_conf/ccpp_stretched_run.IN @@ -1,4 +1,3 @@ - rsync -arv @[RTPWD]/FV3_nest_input_data/. . rm -rf INPUT RESTART mkdir INPUT RESTART @@ -17,10 +16,10 @@ mkdir INPUT RESTART rsync -arv @[RTPWD]/@[INPUT_DIR]/INPUT/. INPUT/. # *DH 20190528 -cp ${PATHRT}/../ccpp/suites/suite_${CCPP_SUITE}.xml suite_${CCPP_SUITE}.xml +cp ${PATHRT}/../FV3/ccpp/suites/suite_${CCPP_SUITE}.xml suite_${CCPP_SUITE}.xml # Add path to libccpp.so and libccpphys.so to LD_LIBRARY_PATH, append to module-setup.sh echo " " >> module-setup.sh echo "# Add path to libccpp.so and libccpphys.so to LD_LIBRARY_PATH" -echo "export LD_LIBRARY_PATH=${PATHRT}/../${CCPP_LIB_DIR}:${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}" >> module-setup.sh +echo "export LD_LIBRARY_PATH=${PATHRT}/../FV3/${CCPP_LIB_DIR}:${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}" >> module-setup.sh echo " " >> module-setup.sh diff --git a/tests/rt.conf b/tests/rt.conf index 6bb1c4517a..521c817525 100644 --- a/tests/rt.conf +++ b/tests/rt.conf @@ -5,7 +5,6 @@ COMPILE | | standard | wcoss_cray | fv3 | COMPILE | | standard | wcoss_dell_p3 | fv3 | COMPILE | | standard | hera.intel | fv3 | -COMPILE | | standard | cheyenne.intel | fv3 | COMPILE | | standard | gaea.intel | fv3 | COMPILE | | standard | jet.intel | fv3 | @@ -36,10 +35,10 @@ RUN | fv3_lheatstrg COMPILE | WW3=Y | standard | wcoss_cray | fv3 | COMPILE | WW3=Y | standard | wcoss_dell_p3 | fv3 | COMPILE | WW3=Y | standard | hera.intel | fv3 | -COMPILE | WW3=Y | standard | cheyenne.intel | fv3 | +COMPILE | WW3=Y | standard | gaea.intel | fv3 | +COMPILE | WW3=Y | standard | jet.intel | fv3 | RUN | fv3_gfdlmprad | standard | | fv3 | RUN | fv3_wrtGauss_nemsio_c768 | standard | hera.intel | fv3 | -RUN | fv3_wrtGauss_nemsio_c768 | standard | cheyenne.intel | fv3 | RUN | fv3_wrtGauss_nemsio_c768 | standard | wcoss_cray | fv3 | ###RUN | fv3_wrtGauss_nemsio_c768 | standard | wcoss_dell_p3 | fv3 | @@ -47,7 +46,6 @@ RUN | fv3_wrtGauss_nemsio_c768 APPBUILD| standaloneFV3 | standard | wcoss_cray | | APPBUILD| standaloneFV3 | standard | wcoss_dell_p3 | | APPBUILD| standaloneFV3 | standard | hera.intel | | -APPBUILD| standaloneFV3 | standard | cheyenne.intel | | APPBUILD| standaloneFV3 | standard | gaea.intel | | APPBUILD| standaloneFV3 | standard | jet.intel | | RUN | fv3_appbuild | standard | | | @@ -55,7 +53,6 @@ RUN | fv3_appbuild COMPILE | 32BIT=Y | standard | wcoss_cray | fv3 | COMPILE | 32BIT=Y | standard | wcoss_dell_p3 | fv3 | COMPILE | 32BIT=Y | standard | hera.intel | fv3 | -COMPILE | 32BIT=Y | standard | cheyenne.intel | fv3 | COMPILE | 32BIT=Y | standard | gaea.intel | fv3 | COMPILE | 32BIT=Y | standard | jet.intel | fv3 | RUN | fv3_control_32bit | standard | | fv3 | @@ -67,24 +64,18 @@ RUN | fv3_stretched_nest RUN | fv3_stretched_nest_quilt | standard | wcoss_cray | fv3 | RUN | fv3_stretched_nest_quilt | standard | wcoss_dell_p3 | fv3 | RUN | fv3_stretched_nest_quilt | standard | hera.intel | fv3 | -RUN | fv3_stretched_nest_quilt | standard | cheyenne.intel | fv3 | RUN | fv3_regional_control | standard | | fv3 | RUN | fv3_regional_restart | standard | | fv3 | fv3_regional_control RUN | fv3_regional_quilt | standard | | fv3 | -# fv3_regional_c768 not working on Cheyenne, code aborts with invalid values -# for surface pressure, out of range warnings and all other sorts of errors RUN | fv3_regional_c768 | standard | wcoss_dell_p3 | fv3 | RUN | fv3_regional_c768 | standard | hera.intel | fv3 | RUN | fv3_regional_c768 | standard | gaea.intel | fv3 | RUN | fv3_regional_c768 | standard | jet.intel | fv3 | COMPILE | 32BIT=Y DEBUG=Y | standard | hera.intel | fv3 | -COMPILE | 32BIT=Y DEBUG=Y | standard | cheyenne.intel | fv3 | RUN | fv3_control_debug | standard | hera.intel | fv3 | -RUN | fv3_control_debug | standard | cheyenne.intel | fv3 | RUN | fv3_stretched_nest_debug | standard | hera.intel | fv3 | -RUN | fv3_stretched_nest_debug | standard | cheyenne.intel | fv3 | ####################################################################################################################################################################################### # IPD REPRO tests # @@ -93,7 +84,6 @@ RUN | fv3_stretched_nest_debug COMPILE | REPRO=Y | standard | wcoss_cray | fv3 | COMPILE | REPRO=Y | standard | wcoss_dell_p3 | fv3 | COMPILE | REPRO=Y | standard | hera.intel | fv3 | -COMPILE | REPRO=Y | standard | cheyenne.intel | fv3 | COMPILE | REPRO=Y | standard | gaea.intel | fv3 | COMPILE | REPRO=Y | standard | jet.intel | fv3 | @@ -116,18 +106,19 @@ RUN | fv3_csawmg3shoc127 RUN | fv3_csawmg | standard | | fv3 | RUN | fv3_satmedmf | standard | | fv3 | -COMPILE | REPRO=Y WW3=Y | standard | hera.intel | fv3 | -COMPILE | REPRO=Y WW3=Y | standard | cheyenne.intel | fv3 | COMPILE | REPRO=Y WW3=Y | standard | wcoss_cray | fv3 | +COMPILE | REPRO=Y WW3=Y | standard | wcoss_dell_p3 | fv3 | +COMPILE | REPRO=Y WW3=Y | standard | hera.intel | fv3 | +COMPILE | REPRO=Y WW3=Y | standard | gaea.intel | fv3 | +COMPILE | REPRO=Y WW3=Y | standard | jet.intel | fv3 | +RUN | fv3_gfdlmprad | standard | | fv3 | RUN | fv3_wrtGauss_nemsio_c768 | standard | hera.intel | fv3 | -RUN | fv3_wrtGauss_nemsio_c768 | standard | cheyenne.intel | fv3 | RUN | fv3_wrtGauss_nemsio_c768 | standard | wcoss_cray | fv3 | # Run one test using the NEMSAppBuilder, to ensure we don't break it: APPBUILD| standaloneFV3_repro | standard | wcoss_cray | | APPBUILD| standaloneFV3_repro | standard | wcoss_dell_p3 | | APPBUILD| standaloneFV3_repro | standard | hera.intel | | -APPBUILD| standaloneFV3_repro | standard | cheyenne.intel | | APPBUILD| standaloneFV3_repro | standard | gaea.intel | | APPBUILD| standaloneFV3_repro | standard | jet.intel | | RUN | fv3_appbuild | standard | | | @@ -135,7 +126,6 @@ RUN | fv3_appbuild COMPILE | REPRO=Y 32BIT=Y | standard | wcoss_cray | fv3 | COMPILE | REPRO=Y 32BIT=Y | standard | wcoss_dell_p3 | fv3 | COMPILE | REPRO=Y 32BIT=Y | standard | hera.intel | fv3 | -COMPILE | REPRO=Y 32BIT=Y | standard | cheyenne.intel | fv3 | COMPILE | REPRO=Y 32BIT=Y | standard | gaea.intel | fv3 | COMPILE | REPRO=Y 32BIT=Y | standard | jet.intel | fv3 | @@ -148,8 +138,6 @@ RUN | fv3_stretched_nest RUN | fv3_regional_control | standard | | fv3 | RUN | fv3_regional_restart | standard | | fv3 | fv3_regional_control RUN | fv3_regional_quilt | standard | | fv3 | -# fv3_regional_c768 not working on Cheyenne, code aborts with invalid values -# for surface pressure, out of range warnings and all other sorts of errors RUN | fv3_regional_c768 | standard | wcoss_dell_p3 | fv3 | RUN | fv3_regional_c768 | standard | hera.intel | fv3 | RUN | fv3_regional_c768 | standard | gaea.intel | fv3 | @@ -166,7 +154,6 @@ RUN | fv3_cpt COMPILE | REPRO=Y CCPP=Y STATIC=Y SUITES=FV3_GFS_2017 | standard | wcoss_cray | | COMPILE | REPRO=Y CCPP=Y STATIC=Y SUITES=FV3_GFS_2017 | standard | wcoss_dell_p3 | | COMPILE | REPRO=Y CCPP=Y STATIC=Y SUITES=FV3_GFS_2017 | standard | hera.intel | | -COMPILE | REPRO=Y CCPP=Y STATIC=Y SUITES=FV3_GFS_2017 | standard | cheyenne.intel | | COMPILE | REPRO=Y CCPP=Y STATIC=Y SUITES=FV3_GFS_2017 | standard | gaea.intel | | COMPILE | REPRO=Y CCPP=Y STATIC=Y SUITES=FV3_GFS_2017 | standard | jet.intel | | @@ -179,17 +166,22 @@ RUN | fv3_ccpp_wrtGauss_netcdf_esmf RUN | fv3_ccpp_wrtGauss_netcdf | standard | | | RUN | fv3_ccpp_wrtGauss_nemsio | standard | | | RUN | fv3_ccpp_wrtGauss_nemsio_c192 | standard | | | -RUN | fv3_ccpp_wrtGauss_nemsio_c768 | standard | hera.intel | | -RUN | fv3_ccpp_wrtGauss_nemsio_c768 | standard | cheyenne.intel | | -RUN | fv3_ccpp_wrtGauss_nemsio_c768 | standard | wcoss_cray | | RUN | fv3_ccpp_stochy | standard | | | RUN | fv3_ccpp_iau | standard | | | +COMPILE | REPRO=Y CCPP=Y STATIC=Y SUITES=FV3_GFS_2017,FV3_GFS_2017_gfdlmp WW3=Y | standard | wcoss_cray | | +COMPILE | REPRO=Y CCPP=Y STATIC=Y SUITES=FV3_GFS_2017,FV3_GFS_2017_gfdlmp WW3=Y | standard | wcoss_dell_p3 | | +COMPILE | REPRO=Y CCPP=Y STATIC=Y SUITES=FV3_GFS_2017,FV3_GFS_2017_gfdlmp WW3=Y | standard | hera.intel | | +COMPILE | REPRO=Y CCPP=Y STATIC=Y SUITES=FV3_GFS_2017,FV3_GFS_2017_gfdlmp WW3=Y | standard | gaea.intel | | +COMPILE | REPRO=Y CCPP=Y STATIC=Y SUITES=FV3_GFS_2017,FV3_GFS_2017_gfdlmp WW3=Y | standard | jet.intel | | +RUN | fv3_ccpp_gfdlmprad | standard | | | +RUN | fv3_ccpp_wrtGauss_nemsio_c768 | standard | hera.intel | | +RUN | fv3_ccpp_wrtGauss_nemsio_c768 | standard | wcoss_cray | | + # Run one test using the NEMSAppBuilder, to ensure we don't break it: APPBUILD| CCPP_repro | standard | wcoss_cray | | APPBUILD| CCPP_repro | standard | wcoss_dell_p3 | | APPBUILD| CCPP_repro | standard | hera.intel | | -APPBUILD| CCPP_repro | standard | cheyenne.intel | | APPBUILD| CCPP_repro | standard | gaea.intel | | APPBUILD| CCPP_repro | standard | jet.intel | | RUN | fv3_ccpp_appbuild | standard | | | @@ -197,7 +189,6 @@ RUN | fv3_ccpp_appbuild COMPILE | REPRO=Y CCPP=Y STATIC=Y SUITES=FV3_GFS_2017,FV3_GFS_2017_stretched 32BIT=Y | standard | wcoss_cray | | COMPILE | REPRO=Y CCPP=Y STATIC=Y SUITES=FV3_GFS_2017,FV3_GFS_2017_stretched 32BIT=Y | standard | wcoss_dell_p3 | | COMPILE | REPRO=Y CCPP=Y STATIC=Y SUITES=FV3_GFS_2017,FV3_GFS_2017_stretched 32BIT=Y | standard | hera.intel | | -COMPILE | REPRO=Y CCPP=Y STATIC=Y SUITES=FV3_GFS_2017,FV3_GFS_2017_stretched 32BIT=Y | standard | cheyenne.intel | | COMPILE | REPRO=Y CCPP=Y STATIC=Y SUITES=FV3_GFS_2017,FV3_GFS_2017_stretched 32BIT=Y | standard | gaea.intel | | COMPILE | REPRO=Y CCPP=Y STATIC=Y SUITES=FV3_GFS_2017,FV3_GFS_2017_stretched 32BIT=Y | standard | jet.intel | | @@ -205,17 +196,15 @@ RUN | fv3_ccpp_control_32bit RUN | fv3_ccpp_stretched | standard | | | RUN | fv3_ccpp_stretched_nest | standard | | | +COMPILE | REPRO=Y CCPP=Y STATIC=Y SUITES=FV3_GFS_2017_gfdlmp_regional,FV3_GFS_2017_gfdlmp_regional_c768 32BIT=Y | standard | wcoss_cray | | COMPILE | REPRO=Y CCPP=Y STATIC=Y SUITES=FV3_GFS_2017_gfdlmp_regional,FV3_GFS_2017_gfdlmp_regional_c768 32BIT=Y | standard | wcoss_dell_p3 | | COMPILE | REPRO=Y CCPP=Y STATIC=Y SUITES=FV3_GFS_2017_gfdlmp_regional,FV3_GFS_2017_gfdlmp_regional_c768 32BIT=Y | standard | hera.intel | | -COMPILE | REPRO=Y CCPP=Y STATIC=Y SUITES=FV3_GFS_2017_gfdlmp_regional,FV3_GFS_2017_gfdlmp_regional_c768 32BIT=Y | standard | cheyenne.intel | | COMPILE | REPRO=Y CCPP=Y STATIC=Y SUITES=FV3_GFS_2017_gfdlmp_regional,FV3_GFS_2017_gfdlmp_regional_c768 32BIT=Y | standard | gaea.intel | | COMPILE | REPRO=Y CCPP=Y STATIC=Y SUITES=FV3_GFS_2017_gfdlmp_regional,FV3_GFS_2017_gfdlmp_regional_c768 32BIT=Y | standard | jet.intel | | RUN | fv3_ccpp_regional_control | standard | | | RUN | fv3_ccpp_regional_restart | standard | | | fv3_ccpp_regional_control RUN | fv3_ccpp_regional_quilt | standard | | | -# fv3_regional_c768 not working on Cheyenne, code aborts with invalid values -# for surface pressure, out of range warnings and all other sorts of errors RUN | fv3_ccpp_regional_c768 | standard | wcoss_dell_p3 | | RUN | fv3_ccpp_regional_c768 | standard | hera.intel | | RUN | fv3_ccpp_regional_c768 | standard | gaea.intel | | @@ -224,7 +213,6 @@ RUN | fv3_ccpp_regional_c768 COMPILE | REPRO=Y CCPP=Y STATIC=Y SUITES=FV3_GFS_2017_gfdlmp,FV3_GFS_2017_gfdlmp_noahmp | standard | wcoss_cray | | COMPILE | REPRO=Y CCPP=Y STATIC=Y SUITES=FV3_GFS_2017_gfdlmp,FV3_GFS_2017_gfdlmp_noahmp | standard | wcoss_dell_p3 | | COMPILE | REPRO=Y CCPP=Y STATIC=Y SUITES=FV3_GFS_2017_gfdlmp,FV3_GFS_2017_gfdlmp_noahmp | standard | hera.intel | | -COMPILE | REPRO=Y CCPP=Y STATIC=Y SUITES=FV3_GFS_2017_gfdlmp,FV3_GFS_2017_gfdlmp_noahmp | standard | cheyenne.intel | | COMPILE | REPRO=Y CCPP=Y STATIC=Y SUITES=FV3_GFS_2017_gfdlmp,FV3_GFS_2017_gfdlmp_noahmp | standard | gaea.intel | | COMPILE | REPRO=Y CCPP=Y STATIC=Y SUITES=FV3_GFS_2017_gfdlmp,FV3_GFS_2017_gfdlmp_noahmp | standard | jet.intel | | @@ -235,7 +223,6 @@ RUN | fv3_ccpp_gfdlmprad_noahmp COMPILE | REPRO=Y CCPP=Y STATIC=Y SUITES=FV3_GFS_2017_csawmgshoc,FV3_GFS_2017_csawmg,FV3_GFS_2017_satmedmf | standard | wcoss_cray | | COMPILE | REPRO=Y CCPP=Y STATIC=Y SUITES=FV3_GFS_2017_csawmgshoc,FV3_GFS_2017_csawmg,FV3_GFS_2017_satmedmf | standard | wcoss_dell_p3 | | COMPILE | REPRO=Y CCPP=Y STATIC=Y SUITES=FV3_GFS_2017_csawmgshoc,FV3_GFS_2017_csawmg,FV3_GFS_2017_satmedmf | standard | hera.intel | | -COMPILE | REPRO=Y CCPP=Y STATIC=Y SUITES=FV3_GFS_2017_csawmgshoc,FV3_GFS_2017_csawmg,FV3_GFS_2017_satmedmf | standard | cheyenne.intel | | COMPILE | REPRO=Y CCPP=Y STATIC=Y SUITES=FV3_GFS_2017_csawmgshoc,FV3_GFS_2017_csawmg,FV3_GFS_2017_satmedmf | standard | gaea.intel | | COMPILE | REPRO=Y CCPP=Y STATIC=Y SUITES=FV3_GFS_2017_csawmgshoc,FV3_GFS_2017_csawmg,FV3_GFS_2017_satmedmf | standard | jet.intel | | @@ -247,7 +234,6 @@ RUN | fv3_ccpp_satmedmf COMPILE | REPRO=Y CCPP=Y STATIC=Y SUITES=FV3_GFS_2017_gfdlmp,FV3_GFS_v15,FV3_GFS_v15plus,FV3_CPT_v0,FV3_GSD_v0 32BIT=Y | standard | wcoss_cray | fv3 | COMPILE | REPRO=Y CCPP=Y STATIC=Y SUITES=FV3_GFS_2017_gfdlmp,FV3_GFS_v15,FV3_GFS_v15plus,FV3_CPT_v0,FV3_GSD_v0 32BIT=Y | standard | wcoss_dell_p3 | fv3 | COMPILE | REPRO=Y CCPP=Y STATIC=Y SUITES=FV3_GFS_2017_gfdlmp,FV3_GFS_v15,FV3_GFS_v15plus,FV3_CPT_v0,FV3_GSD_v0 32BIT=Y | standard | hera.intel | fv3 | -COMPILE | REPRO=Y CCPP=Y STATIC=Y SUITES=FV3_GFS_2017_gfdlmp,FV3_GFS_v15,FV3_GFS_v15plus,FV3_CPT_v0,FV3_GSD_v0 32BIT=Y | standard | cheyenne.intel | fv3 | COMPILE | REPRO=Y CCPP=Y STATIC=Y SUITES=FV3_GFS_2017_gfdlmp,FV3_GFS_v15,FV3_GFS_v15plus,FV3_CPT_v0,FV3_GSD_v0 32BIT=Y | standard | gaea.intel | fv3 | COMPILE | REPRO=Y CCPP=Y STATIC=Y SUITES=FV3_GFS_2017_gfdlmp,FV3_GFS_v15,FV3_GFS_v15plus,FV3_CPT_v0,FV3_GSD_v0 32BIT=Y | standard | jet.intel | fv3 | @@ -267,7 +253,6 @@ RUN | fv3_ccpp_gsd COMPILE | CCPP=Y STATIC=Y SUITES=FV3_GFS_2017 | standard | wcoss_cray | fv3 | COMPILE | CCPP=Y STATIC=Y SUITES=FV3_GFS_2017 | standard | wcoss_dell_p3 | fv3 | COMPILE | CCPP=Y STATIC=Y SUITES=FV3_GFS_2017 | standard | hera.intel | fv3 | -COMPILE | CCPP=Y STATIC=Y SUITES=FV3_GFS_2017 | standard | cheyenne.intel | fv3 | COMPILE | CCPP=Y STATIC=Y SUITES=FV3_GFS_2017 | standard | gaea.intel | fv3 | COMPILE | CCPP=Y STATIC=Y SUITES=FV3_GFS_2017 | standard | jet.intel | fv3 | @@ -283,18 +268,19 @@ RUN | fv3_ccpp_wrtGauss_nemsio_c192 RUN | fv3_ccpp_stochy | standard | | fv3 | RUN | fv3_ccpp_iau | standard | | fv3 | -COMPILE | CCPP=Y STATIC=Y SUITES=FV3_GFS_2017 WW3=Y | standard | hera.intel | fv3 | -COMPILE | CCPP=Y STATIC=Y SUITES=FV3_GFS_2017 WW3=Y | standard | cheyenne.intel | fv3 | -COMPILE | CCPP=Y STATIC=Y SUITES=FV3_GFS_2017 WW3=Y | standard | wcoss_cray | fv3 | +COMPILE | CCPP=Y STATIC=Y SUITES=FV3_GFS_2017,FV3_GFS_2017_gfdlmp WW3=Y | standard | wcoss_cray | fv3 | +COMPILE | CCPP=Y STATIC=Y SUITES=FV3_GFS_2017,FV3_GFS_2017_gfdlmp WW3=Y | standard | wcoss_dell_p3 | fv3 | +COMPILE | CCPP=Y STATIC=Y SUITES=FV3_GFS_2017,FV3_GFS_2017_gfdlmp WW3=Y | standard | hera.intel | fv3 | +COMPILE | CCPP=Y STATIC=Y SUITES=FV3_GFS_2017,FV3_GFS_2017_gfdlmp WW3=Y | standard | gaea.intel | fv3 | +COMPILE | CCPP=Y STATIC=Y SUITES=FV3_GFS_2017,FV3_GFS_2017_gfdlmp WW3=Y | standard | jet.intel | fv3 | +RUN | fv3_ccpp_gfdlmprad | standard | | fv3 | RUN | fv3_ccpp_wrtGauss_nemsio_c768 | standard | hera.intel | fv3 | -RUN | fv3_ccpp_wrtGauss_nemsio_c768 | standard | cheyenne.intel | fv3 | RUN | fv3_ccpp_wrtGauss_nemsio_c768 | standard | wcoss_cray | fv3 | # Run one test using the NEMSAppBuilder, to ensure we don't break it: APPBUILD| CCPP | standard | wcoss_cray | | APPBUILD| CCPP | standard | wcoss_dell_p3 | | APPBUILD| CCPP | standard | hera.intel | | -APPBUILD| CCPP | standard | cheyenne.intel | | APPBUILD| CCPP | standard | gaea.intel | | APPBUILD| CCPP | standard | jet.intel | | RUN | fv3_ccpp_appbuild | standard | | | @@ -302,7 +288,6 @@ RUN | fv3_ccpp_appbuild COMPILE | CCPP=Y STATIC=Y SUITES=FV3_GFS_2017,FV3_GFS_2017_stretched 32BIT=Y | standard | wcoss_cray | fv3 | COMPILE | CCPP=Y STATIC=Y SUITES=FV3_GFS_2017,FV3_GFS_2017_stretched 32BIT=Y | standard | wcoss_dell_p3 | fv3 | COMPILE | CCPP=Y STATIC=Y SUITES=FV3_GFS_2017,FV3_GFS_2017_stretched 32BIT=Y | standard | hera.intel | fv3 | -COMPILE | CCPP=Y STATIC=Y SUITES=FV3_GFS_2017,FV3_GFS_2017_stretched 32BIT=Y | standard | cheyenne.intel | fv3 | COMPILE | CCPP=Y STATIC=Y SUITES=FV3_GFS_2017,FV3_GFS_2017_stretched 32BIT=Y | standard | gaea.intel | fv3 | COMPILE | CCPP=Y STATIC=Y SUITES=FV3_GFS_2017,FV3_GFS_2017_stretched 32BIT=Y | standard | jet.intel | fv3 | @@ -310,17 +295,15 @@ RUN | fv3_ccpp_control_32bit RUN | fv3_ccpp_stretched | standard | | fv3 | RUN | fv3_ccpp_stretched_nest | standard | | fv3 | +COMPILE | CCPP=Y STATIC=Y SUITES=FV3_GFS_2017_gfdlmp_regional,FV3_GFS_2017_gfdlmp_regional_c768 32BIT=Y | standard | wcoss_cray | fv3 | COMPILE | CCPP=Y STATIC=Y SUITES=FV3_GFS_2017_gfdlmp_regional,FV3_GFS_2017_gfdlmp_regional_c768 32BIT=Y | standard | wcoss_dell_p3 | fv3 | COMPILE | CCPP=Y STATIC=Y SUITES=FV3_GFS_2017_gfdlmp_regional,FV3_GFS_2017_gfdlmp_regional_c768 32BIT=Y | standard | hera.intel | fv3 | -COMPILE | CCPP=Y STATIC=Y SUITES=FV3_GFS_2017_gfdlmp_regional,FV3_GFS_2017_gfdlmp_regional_c768 32BIT=Y | standard | cheyenne.intel | fv3 | COMPILE | CCPP=Y STATIC=Y SUITES=FV3_GFS_2017_gfdlmp_regional,FV3_GFS_2017_gfdlmp_regional_c768 32BIT=Y | standard | gaea.intel | fv3 | COMPILE | CCPP=Y STATIC=Y SUITES=FV3_GFS_2017_gfdlmp_regional,FV3_GFS_2017_gfdlmp_regional_c768 32BIT=Y | standard | jet.intel | fv3 | RUN | fv3_ccpp_regional_control | standard | | fv3 | RUN | fv3_ccpp_regional_restart | standard | | fv3 | fv3_ccpp_regional_control RUN | fv3_ccpp_regional_quilt | standard | | fv3 | -# fv3_regional_c768 not working on Cheyenne, code aborts with invalid values -# for surface pressure, out of range warnings and all other sorts of errors RUN | fv3_ccpp_regional_c768 | standard | wcoss_dell_p3 | fv3 | RUN | fv3_ccpp_regional_c768 | standard | hera.intel | fv3 | RUN | fv3_ccpp_regional_c768 | standard | gaea.intel | fv3 | @@ -329,7 +312,6 @@ RUN | fv3_ccpp_regional_c768 COMPILE | CCPP=Y STATIC=Y SUITES=FV3_GFS_2017,FV3_GFS_2017_stretched 32BIT=Y DEBUG=Y | standard | wcoss_cray | fv3 | COMPILE | CCPP=Y STATIC=Y SUITES=FV3_GFS_2017,FV3_GFS_2017_stretched 32BIT=Y DEBUG=Y | standard | wcoss_dell_p3 | fv3 | COMPILE | CCPP=Y STATIC=Y SUITES=FV3_GFS_2017,FV3_GFS_2017_stretched 32BIT=Y DEBUG=Y | standard | hera.intel | fv3 | -COMPILE | CCPP=Y STATIC=Y SUITES=FV3_GFS_2017,FV3_GFS_2017_stretched 32BIT=Y DEBUG=Y | standard | cheyenne.intel | fv3 | COMPILE | CCPP=Y STATIC=Y SUITES=FV3_GFS_2017,FV3_GFS_2017_stretched 32BIT=Y DEBUG=Y | standard | gaea.intel | fv3 | COMPILE | CCPP=Y STATIC=Y SUITES=FV3_GFS_2017,FV3_GFS_2017_stretched 32BIT=Y DEBUG=Y | standard | jet.intel | fv3 | @@ -339,7 +321,6 @@ RUN | fv3_ccpp_stretched_nest_debug COMPILE | CCPP=Y STATIC=Y SUITES=FV3_GFS_2017_gfdlmp,FV3_GFS_2017_gfdlmp_noahmp | standard | wcoss_cray | fv3 | COMPILE | CCPP=Y STATIC=Y SUITES=FV3_GFS_2017_gfdlmp,FV3_GFS_2017_gfdlmp_noahmp | standard | wcoss_dell_p3 | fv3 | COMPILE | CCPP=Y STATIC=Y SUITES=FV3_GFS_2017_gfdlmp,FV3_GFS_2017_gfdlmp_noahmp | standard | hera.intel | fv3 | -COMPILE | CCPP=Y STATIC=Y SUITES=FV3_GFS_2017_gfdlmp,FV3_GFS_2017_gfdlmp_noahmp | standard | cheyenne.intel | fv3 | COMPILE | CCPP=Y STATIC=Y SUITES=FV3_GFS_2017_gfdlmp,FV3_GFS_2017_gfdlmp_noahmp | standard | gaea.intel | fv3 | COMPILE | CCPP=Y STATIC=Y SUITES=FV3_GFS_2017_gfdlmp,FV3_GFS_2017_gfdlmp_noahmp | standard | jet.intel | fv3 | @@ -350,7 +331,6 @@ RUN | fv3_ccpp_gfdlmprad_noahmp COMPILE | CCPP=Y STATIC=Y SUITES=FV3_GFS_2017_csawmgshoc,FV3_GFS_2017_csawmg,FV3_GFS_2017_satmedmf | standard | wcoss_cray | fv3 | COMPILE | CCPP=Y STATIC=Y SUITES=FV3_GFS_2017_csawmgshoc,FV3_GFS_2017_csawmg,FV3_GFS_2017_satmedmf | standard | wcoss_dell_p3 | fv3 | COMPILE | CCPP=Y STATIC=Y SUITES=FV3_GFS_2017_csawmgshoc,FV3_GFS_2017_csawmg,FV3_GFS_2017_satmedmf | standard | hera.intel | fv3 | -COMPILE | CCPP=Y STATIC=Y SUITES=FV3_GFS_2017_csawmgshoc,FV3_GFS_2017_csawmg,FV3_GFS_2017_satmedmf | standard | cheyenne.intel | fv3 | COMPILE | CCPP=Y STATIC=Y SUITES=FV3_GFS_2017_csawmgshoc,FV3_GFS_2017_csawmg,FV3_GFS_2017_satmedmf | standard | gaea.intel | fv3 | COMPILE | CCPP=Y STATIC=Y SUITES=FV3_GFS_2017_csawmgshoc,FV3_GFS_2017_csawmg,FV3_GFS_2017_satmedmf | standard | jet.intel | fv3 | @@ -362,7 +342,6 @@ RUN | fv3_ccpp_satmedmf COMPILE | CCPP=Y STATIC=Y SUITES=FV3_GFS_2017_gfdlmp,FV3_GFS_v15,FV3_GFS_v15plus,FV3_CPT_v0,FV3_GSD_v0 32BIT=Y | standard | wcoss_cray | fv3 | COMPILE | CCPP=Y STATIC=Y SUITES=FV3_GFS_2017_gfdlmp,FV3_GFS_v15,FV3_GFS_v15plus,FV3_CPT_v0,FV3_GSD_v0 32BIT=Y | standard | wcoss_dell_p3 | fv3 | COMPILE | CCPP=Y STATIC=Y SUITES=FV3_GFS_2017_gfdlmp,FV3_GFS_v15,FV3_GFS_v15plus,FV3_CPT_v0,FV3_GSD_v0 32BIT=Y | standard | hera.intel | fv3 | -COMPILE | CCPP=Y STATIC=Y SUITES=FV3_GFS_2017_gfdlmp,FV3_GFS_v15,FV3_GFS_v15plus,FV3_CPT_v0,FV3_GSD_v0 32BIT=Y | standard | cheyenne.intel | fv3 | COMPILE | CCPP=Y STATIC=Y SUITES=FV3_GFS_2017_gfdlmp,FV3_GFS_v15,FV3_GFS_v15plus,FV3_CPT_v0,FV3_GSD_v0 32BIT=Y | standard | gaea.intel | fv3 | COMPILE | CCPP=Y STATIC=Y SUITES=FV3_GFS_2017_gfdlmp,FV3_GFS_v15,FV3_GFS_v15plus,FV3_CPT_v0,FV3_GSD_v0 32BIT=Y | standard | jet.intel | fv3 | @@ -374,3 +353,21 @@ RUN | fv3_ccpp_gfs_v15 RUN | fv3_ccpp_gfs_v15plus | standard | | fv3 | RUN | fv3_ccpp_cpt | standard | | fv3 | RUN | fv3_ccpp_gsd | standard | | fv3 | + +####################################################################################################################################################################################### +# CCPP PROD tests # +####################################################################################################################################################################################### + +COMPILE | CCPP=Y STATIC=Y SUITES=FV3_GFS_v15p2,FV3_GFS_v16beta | standard | hera.intel | fv3 | + +RUN | fv3_ccpp_gfs_v15p2 | standard | hera.intel | fv3 | +RUN | fv3_ccpp_gfs_v16beta | standard | hera.intel | fv3 | + +####################################################################################################################################################################################### +# CCPP DEBUG tests # +####################################################################################################################################################################################### + +COMPILE | CCPP=Y STATIC=Y SUITES=FV3_GFS_v15p2,FV3_GFS_v16beta DEBUG=Y | standard | hera.intel | fv3 | + +RUN | fv3_ccpp_gfs_v15p2_debug | standard | hera.intel | fv3 | +RUN | fv3_ccpp_gfs_v16beta_debug | standard | hera.intel | fv3 | diff --git a/tests/rt.sh b/tests/rt.sh index 03ba7c07fc..929150839a 100755 --- a/tests/rt.sh +++ b/tests/rt.sh @@ -159,7 +159,7 @@ elif [[ $MACHINE_ID = gaea.* ]]; then ECFLOW_START= # DH* 20190717 temporary #DISKNM=/lustre/f2/pdata/ncep_shared/emc.nemspara/RT - DISKNM=/lustre/f2/pdata/esrl/gsd/gmtb/NEMSfv3gfs/RT + DISKNM=/lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT # *DH 20190717 QUEUE=debug # DO NOT SET AN ACCOUNT EVERYONE IS NOT A MEMBER OF @@ -321,8 +321,8 @@ ECFLOW=false KEEP_RUNDIR=false TESTS_FILE='rt.conf' -## Switch to special regression test config on wcoss_cray: -## don't run the IPD and CCPP tests in REPRO mode. +# Switch to special regression test config on wcoss_cray: +# don't run the IPD and CCPP tests in REPRO mode. if [[ $MACHINE_ID = wcoss_cray ]]; then TESTS_FILE='rt_wcoss_cray.conf' fi diff --git a/tests/rt_fv3.sh b/tests/rt_fv3.sh index cea2418caa..d56bf907eb 100755 --- a/tests/rt_fv3.sh +++ b/tests/rt_fv3.sh @@ -39,16 +39,8 @@ if [[ "Q${INPUT_NEST02_NML:-}" != Q ]] ; then atparse < ${PATHTR}/parm/${INPUT_NEST02_NML} > input_nest02.nml fi -# Allow fv3_run to proceed despite errors when setting up the run -# directory. With "set -e", a failure in 'source ./fv3_run; (e.g. -# if an input file to copy is not found) aborts rt_fv3.sh and the -# calling run_test.sh, and consequently rt.sh reports that the -# test ran successfully. Allowing fv3_run to proceed will in such -# cases lead to errors when the model is run (crash or different -# results), because a necessary input file would be missing. -set +e +# Set up the run directory source ./fv3_run -set -e if [[ $SCHEDULER = 'moab' ]]; then atparse < $PATHRT/fv3_conf/fv3_msub.IN > job_card diff --git a/tests/rt_gnu.conf b/tests/rt_gnu.conf deleted file mode 100644 index 6c9ff7d3cd..0000000000 --- a/tests/rt_gnu.conf +++ /dev/null @@ -1,45 +0,0 @@ -####################################################################################################################################################################################### -# IPD PROD tests # -####################################################################################################################################################################################### - -COMPILE | | standard | cheyenne.gnu | fv3 | -RUN | fv3_gfdlmp | standard | cheyenne.gnu | fv3 | - -COMPILE | 32BIT=Y DEBUG=Y | standard | cheyenne.gnu | fv3 | -RUN | fv3_control_debug | standard | cheyenne.gnu | fv3 | - -COMPILE | 32BIT=Y | standard | cheyenne.gnu | fv3 | -RUN | fv3_gfs_v15plus | standard | cheyenne.gnu | fv3 | - -####################################################################################################################################################################################### -# IPD REPRO tests # -####################################################################################################################################################################################### - -COMPILE | REPRO=Y | standard | cheyenne.gnu | fv3 | -RUN | fv3_gfdlmp | standard | cheyenne.gnu | fv3 | - -COMPILE | REPRO=Y 32BIT=Y | standard | cheyenne.gnu | fv3 | -RUN | fv3_gfs_v15plus | standard | cheyenne.gnu | fv3 | - -####################################################################################################################################################################################### -# CCPP REPRO tests # -####################################################################################################################################################################################### - -COMPILE | REPRO=Y CCPP=Y STATIC=Y SUITES=FV3_GFS_2017_gfdlmp | standard | cheyenne.gnu | | -RUN | fv3_ccpp_gfdlmp | standard | cheyenne.gnu | | - -COMPILE | REPRO=Y CCPP=Y STATIC=Y SUITES=FV3_GFS_v15plus 32BIT=Y | standard | cheyenne.gnu | | -RUN | fv3_ccpp_gfs_v15plus | standard | cheyenne.gnu | | - -####################################################################################################################################################################################### -# CCPP PROD tests # -####################################################################################################################################################################################### - -COMPILE | CCPP=Y STATIC=Y SUITES=FV3_GFS_2017_gfdlmp | standard | cheyenne.gnu | fv3 | -RUN | fv3_ccpp_gfdlmp | standard | cheyenne.gnu | fv3 | - -COMPILE | CCPP=Y STATIC=Y SUITES=FV3_GFS_2017 32BIT=Y DEBUG=Y | standard | cheyenne.gnu | fv3 | -RUN | fv3_ccpp_control_debug | standard | cheyenne.gnu | fv3 | - -COMPILE | CCPP=Y STATIC=Y SUITES=FV3_GFS_v15plus 32BIT=Y | standard | cheyenne.gnu | fv3 | -RUN | fv3_ccpp_gfs_v15plus | standard | cheyenne.gnu | fv3 | diff --git a/tests/run_test.sh b/tests/run_test.sh index 67e5e041c4..4eed84f7c8 100755 --- a/tests/run_test.sh +++ b/tests/run_test.sh @@ -36,8 +36,7 @@ export REGRESSIONTEST_LOG=${LOG_DIR}/rt_${TEST_NR}_${TEST_NAME}${RT_SUFFIX}.log # Submit the actual test run script echo "Test ${TEST_NR} ${TEST_NAME} ${TEST_DESCR}" trap 'echo "run_test.sh: Test ${TEST_NAME} killed"; kill $(jobs -p); wait; trap 0; exit' 1 2 3 4 5 6 7 8 10 12 13 15 -./${RUN_SCRIPT} > ${RUNDIR_ROOT}/${TEST_NAME}${RT_SUFFIX}.log 2>&1 & -wait +./${RUN_SCRIPT} > ${RUNDIR_ROOT}/${TEST_NAME}${RT_SUFFIX}.log 2>&1 elapsed=$SECONDS echo "Elapsed time $elapsed seconds. Test ${TEST_NAME}" diff --git a/tests/tests/fv3_ccpp_gf_thompson b/tests/tests/fv3_ccpp_gf_thompson index a369ac1ffc..33d651ee04 100644 --- a/tests/tests/fv3_ccpp_gf_thompson +++ b/tests/tests/fv3_ccpp_gf_thompson @@ -74,7 +74,7 @@ export LIST_FILES="atmos_4xdaily.tile1.nc \ export_fv3 export NODES=$(expr $TASKS / $TPN + 1) -export DT_ATMOS="1200" +export DT_ATMOS="600" export IMP_PHYSICS=8 export DNATS=0 export DO_SAT_ADJ=.F. diff --git a/tests/tests/fv3_ccpp_gfdlmprad b/tests/tests/fv3_ccpp_gfdlmprad index b77411386c..f2d81eed94 100644 --- a/tests/tests/fv3_ccpp_gfdlmprad +++ b/tests/tests/fv3_ccpp_gfdlmprad @@ -49,10 +49,13 @@ export LIST_FILES="atmos_4xdaily.tile1.nc \ RESTART/phy_data.tile3.nc \ RESTART/phy_data.tile4.nc \ RESTART/phy_data.tile5.nc \ - RESTART/phy_data.tile6.nc" + RESTART/phy_data.tile6.nc \ + out_grd.glo_30m" export_fv3 + +export TASKS=264 export NODES=$(expr $TASKS / $TPN + 1) DT_ATMOS="1200" @@ -64,6 +67,15 @@ export OUTPUT_FILE="'nemsio'" export WRITE_NEMSIOFLIP=.true. export WRITE_FSYNCFLAG=.true. +export CPL=.true. +export CPLWAV=.T. +export atm_model='fv3' +export atm_petlist_bounds="0 149" +export wav_model='ww3' +export wav_petlist_bounds="150 263" +export coupling_interval_sec=3600.0 #coupling time step, want it to be multiple of 1800 and FV3 time step +export NEMS_CONFIGURE="nems.configure.blocked_atm_wav.IN" + export CCPP_SUITE=FV3_GFS_2017_gfdlmp export CCPP_LIB_DIR=ccpp/lib export INPUT_NML=ccpp_gfdlmp.nml.IN diff --git a/tests/tests/fv3_ccpp_gfs_v15p2 b/tests/tests/fv3_ccpp_gfs_v15p2 new file mode 100644 index 0000000000..78ca1fa8bd --- /dev/null +++ b/tests/tests/fv3_ccpp_gfs_v15p2 @@ -0,0 +1,85 @@ +############################################################################### +# +# FV3 CCPP GFS v15.2 compiled with 32-bit dynamics test +# +############################################################################### + +export TEST_DESCR="Compare FV3 32bit CCPP GFS v15.2 results with previous trunk version" + +export CNTL_DIR=fv3_gfs_v15p2 + +export LIST_FILES="atmos_4xdaily.tile1.nc \ + atmos_4xdaily.tile2.nc \ + atmos_4xdaily.tile3.nc \ + atmos_4xdaily.tile4.nc \ + atmos_4xdaily.tile5.nc \ + atmos_4xdaily.tile6.nc \ + phyf000.tile1.nc \ + phyf000.tile2.nc \ + phyf000.tile3.nc \ + phyf000.tile4.nc \ + phyf000.tile5.nc \ + phyf000.tile6.nc \ + phyf024.tile1.nc \ + phyf024.tile2.nc \ + phyf024.tile3.nc \ + phyf024.tile4.nc \ + phyf024.tile5.nc \ + phyf024.tile6.nc \ + dynf000.tile1.nc \ + dynf000.tile2.nc \ + dynf000.tile3.nc \ + dynf000.tile4.nc \ + dynf000.tile5.nc \ + dynf000.tile6.nc \ + dynf024.tile1.nc \ + dynf024.tile2.nc \ + dynf024.tile3.nc \ + dynf024.tile4.nc \ + dynf024.tile5.nc \ + dynf024.tile6.nc \ + RESTART/coupler.res \ + RESTART/fv_core.res.nc \ + RESTART/fv_core.res.tile1.nc \ + RESTART/fv_core.res.tile2.nc \ + RESTART/fv_core.res.tile3.nc \ + RESTART/fv_core.res.tile4.nc \ + RESTART/fv_core.res.tile5.nc \ + RESTART/fv_core.res.tile6.nc \ + RESTART/fv_srf_wnd.res.tile1.nc \ + RESTART/fv_srf_wnd.res.tile2.nc \ + RESTART/fv_srf_wnd.res.tile3.nc \ + RESTART/fv_srf_wnd.res.tile4.nc \ + RESTART/fv_srf_wnd.res.tile5.nc \ + RESTART/fv_srf_wnd.res.tile6.nc \ + RESTART/fv_tracer.res.tile1.nc \ + RESTART/fv_tracer.res.tile2.nc \ + RESTART/fv_tracer.res.tile3.nc \ + RESTART/fv_tracer.res.tile4.nc \ + RESTART/fv_tracer.res.tile5.nc \ + RESTART/fv_tracer.res.tile6.nc \ + RESTART/sfc_data.tile1.nc \ + RESTART/sfc_data.tile2.nc \ + RESTART/sfc_data.tile3.nc \ + RESTART/sfc_data.tile4.nc \ + RESTART/sfc_data.tile5.nc \ + RESTART/sfc_data.tile6.nc \ + RESTART/phy_data.tile1.nc \ + RESTART/phy_data.tile2.nc \ + RESTART/phy_data.tile3.nc \ + RESTART/phy_data.tile4.nc \ + RESTART/phy_data.tile5.nc \ + RESTART/phy_data.tile6.nc" + + +export_fv3 +export NODES=$(expr $TASKS / $TPN + 1) + +DT_ATMOS="1200" + +export FV3_RUN=ccpp_gfs_v15_run.IN +export CCPP_SUITE=FV3_GFS_v15p2 +export CCPP_LIB_DIR=ccpp/lib +export INPUT_NML=ccpp_v15p2_c96.nml.IN + +RUN_SCRIPT=rt_fv3.sh diff --git a/tests/tests/fv3_ccpp_gfs_v15p2_debug b/tests/tests/fv3_ccpp_gfs_v15p2_debug new file mode 100644 index 0000000000..e1a0fac782 --- /dev/null +++ b/tests/tests/fv3_ccpp_gfs_v15p2_debug @@ -0,0 +1,24 @@ +############################################################################### +# +# FV3 CCPP GFS v15.2 compiled with 32-bit dynamics test in DEBUG mode +# +############################################################################### + +export TEST_DESCR="Run FV3 32bit CCPP GFS v15.2 in DEBUG mode" + +export CNTL_DIR=fv3_gfs_v15p2 + +export LIST_FILES="" + +export_fv3 +export NODES=$(expr $TASKS / $TPN + 1) + +export FHMAX="06" +DT_ATMOS="1200" + +export FV3_RUN=ccpp_gfs_v15_run.IN +export CCPP_SUITE=FV3_GFS_v15p2 +export CCPP_LIB_DIR=ccpp/lib +export INPUT_NML=ccpp_v15p2_c96.nml.IN + +RUN_SCRIPT=rt_fv3.sh diff --git a/tests/tests/fv3_ccpp_gfs_v16beta b/tests/tests/fv3_ccpp_gfs_v16beta new file mode 100644 index 0000000000..23b3c98806 --- /dev/null +++ b/tests/tests/fv3_ccpp_gfs_v16beta @@ -0,0 +1,85 @@ +############################################################################### +# +# FV3 CCPP GFS v16beta compiled with 32-bit dynamics test +# +############################################################################### + +export TEST_DESCR="Compare FV3 32bit CCPP GFS v16beta results with previous trunk version" + +export CNTL_DIR=fv3_gfs_v16beta + +export LIST_FILES="atmos_4xdaily.tile1.nc \ + atmos_4xdaily.tile2.nc \ + atmos_4xdaily.tile3.nc \ + atmos_4xdaily.tile4.nc \ + atmos_4xdaily.tile5.nc \ + atmos_4xdaily.tile6.nc \ + phyf000.tile1.nc \ + phyf000.tile2.nc \ + phyf000.tile3.nc \ + phyf000.tile4.nc \ + phyf000.tile5.nc \ + phyf000.tile6.nc \ + phyf024.tile1.nc \ + phyf024.tile2.nc \ + phyf024.tile3.nc \ + phyf024.tile4.nc \ + phyf024.tile5.nc \ + phyf024.tile6.nc \ + dynf000.tile1.nc \ + dynf000.tile2.nc \ + dynf000.tile3.nc \ + dynf000.tile4.nc \ + dynf000.tile5.nc \ + dynf000.tile6.nc \ + dynf024.tile1.nc \ + dynf024.tile2.nc \ + dynf024.tile3.nc \ + dynf024.tile4.nc \ + dynf024.tile5.nc \ + dynf024.tile6.nc \ + RESTART/coupler.res \ + RESTART/fv_core.res.nc \ + RESTART/fv_core.res.tile1.nc \ + RESTART/fv_core.res.tile2.nc \ + RESTART/fv_core.res.tile3.nc \ + RESTART/fv_core.res.tile4.nc \ + RESTART/fv_core.res.tile5.nc \ + RESTART/fv_core.res.tile6.nc \ + RESTART/fv_srf_wnd.res.tile1.nc \ + RESTART/fv_srf_wnd.res.tile2.nc \ + RESTART/fv_srf_wnd.res.tile3.nc \ + RESTART/fv_srf_wnd.res.tile4.nc \ + RESTART/fv_srf_wnd.res.tile5.nc \ + RESTART/fv_srf_wnd.res.tile6.nc \ + RESTART/fv_tracer.res.tile1.nc \ + RESTART/fv_tracer.res.tile2.nc \ + RESTART/fv_tracer.res.tile3.nc \ + RESTART/fv_tracer.res.tile4.nc \ + RESTART/fv_tracer.res.tile5.nc \ + RESTART/fv_tracer.res.tile6.nc \ + RESTART/sfc_data.tile1.nc \ + RESTART/sfc_data.tile2.nc \ + RESTART/sfc_data.tile3.nc \ + RESTART/sfc_data.tile4.nc \ + RESTART/sfc_data.tile5.nc \ + RESTART/sfc_data.tile6.nc \ + RESTART/phy_data.tile1.nc \ + RESTART/phy_data.tile2.nc \ + RESTART/phy_data.tile3.nc \ + RESTART/phy_data.tile4.nc \ + RESTART/phy_data.tile5.nc \ + RESTART/phy_data.tile6.nc" + + +export_fv3 +export NODES=$(expr $TASKS / $TPN + 1) + +DT_ATMOS="1200" + +export FV3_RUN=ccpp_gfs_v15_run.IN +export CCPP_SUITE=FV3_GFS_v16beta +export CCPP_LIB_DIR=ccpp/lib +export INPUT_NML=ccpp_v16beta_c96.nml.IN + +RUN_SCRIPT=rt_fv3.sh diff --git a/tests/tests/fv3_ccpp_gfs_v16beta_debug b/tests/tests/fv3_ccpp_gfs_v16beta_debug new file mode 100644 index 0000000000..546aa31808 --- /dev/null +++ b/tests/tests/fv3_ccpp_gfs_v16beta_debug @@ -0,0 +1,24 @@ +############################################################################### +# +# FV3 CCPP GFS v16beta compiled with 32-bit dynamics test in DEBUG mode +# +############################################################################### + +export TEST_DESCR="Run FV3 32bit CCPP GFS v16beta in DEBUG mode" + +export CNTL_DIR=fv3_gfs_v16beta + +export LIST_FILES="" + +export_fv3 +export NODES=$(expr $TASKS / $TPN + 1) + +export FHMAX="06" +DT_ATMOS="1200" + +export FV3_RUN=ccpp_gfs_v15_run.IN +export CCPP_SUITE=FV3_GFS_v16beta +export CCPP_LIB_DIR=ccpp/lib +export INPUT_NML=ccpp_v16beta_c96.nml.IN + +RUN_SCRIPT=rt_fv3.sh diff --git a/tests/tests/fv3_ccpp_gsd b/tests/tests/fv3_ccpp_gsd index 92c4fcdafd..e740578d94 100644 --- a/tests/tests/fv3_ccpp_gsd +++ b/tests/tests/fv3_ccpp_gsd @@ -101,7 +101,7 @@ export NODES=$(expr $TASKS / $TPN + 1) export FHMAX=48 export FDIAG=3 -export DT_ATMOS="1200" +export DT_ATMOS="600" export IMP_PHYSICS=8 export DNATS=0 export DO_SAT_ADJ=.F. diff --git a/tests/tests/fv3_ccpp_gsd_coldstart b/tests/tests/fv3_ccpp_gsd_coldstart index 4d15d49614..68d390f3c4 100644 --- a/tests/tests/fv3_ccpp_gsd_coldstart +++ b/tests/tests/fv3_ccpp_gsd_coldstart @@ -39,7 +39,7 @@ export NODES=$(expr $TASKS / $TPN + 1) export FHMAX=24 export FDIAG=3 -export DT_ATMOS="1200" +export DT_ATMOS="600" export IMP_PHYSICS=8 export DNATS=0 export DO_SAT_ADJ=.F. diff --git a/tests/tests/fv3_ccpp_gsd_debug b/tests/tests/fv3_ccpp_gsd_debug new file mode 100644 index 0000000000..995b35698b --- /dev/null +++ b/tests/tests/fv3_ccpp_gsd_debug @@ -0,0 +1,102 @@ +########################################################################################## +# +# FV3 CCPP GSD (GF CU + Thompson MP + MYNN PBL + RUC LSM) 24h test in DEBUG mode +# +########################################################################################## + +export TEST_DESCR="Compare FV3 CCPP GSD DEBUG results with previous trunk version" + +export CNTL_DIR=fv3_gsd_debug + +export LIST_FILES="atmos_4xdaily.tile1.nc \ + atmos_4xdaily.tile2.nc \ + atmos_4xdaily.tile3.nc \ + atmos_4xdaily.tile4.nc \ + atmos_4xdaily.tile5.nc \ + atmos_4xdaily.tile6.nc \ + phyf000.tile1.nc \ + phyf000.tile2.nc \ + phyf000.tile3.nc \ + phyf000.tile4.nc \ + phyf000.tile5.nc \ + phyf000.tile6.nc \ + phyf024.tile1.nc \ + phyf024.tile2.nc \ + phyf024.tile3.nc \ + phyf024.tile4.nc \ + phyf024.tile5.nc \ + phyf024.tile6.nc \ + dynf000.tile1.nc \ + dynf000.tile2.nc \ + dynf000.tile3.nc \ + dynf000.tile4.nc \ + dynf000.tile5.nc \ + dynf000.tile6.nc \ + dynf024.tile1.nc \ + dynf024.tile2.nc \ + dynf024.tile3.nc \ + dynf024.tile4.nc \ + dynf024.tile5.nc \ + dynf024.tile6.nc \ + RESTART/coupler.res \ + RESTART/fv_core.res.nc \ + RESTART/fv_core.res.tile1.nc \ + RESTART/fv_core.res.tile2.nc \ + RESTART/fv_core.res.tile3.nc \ + RESTART/fv_core.res.tile4.nc \ + RESTART/fv_core.res.tile5.nc \ + RESTART/fv_core.res.tile6.nc \ + RESTART/fv_srf_wnd.res.tile1.nc \ + RESTART/fv_srf_wnd.res.tile2.nc \ + RESTART/fv_srf_wnd.res.tile3.nc \ + RESTART/fv_srf_wnd.res.tile4.nc \ + RESTART/fv_srf_wnd.res.tile5.nc \ + RESTART/fv_srf_wnd.res.tile6.nc \ + RESTART/fv_tracer.res.tile1.nc \ + RESTART/fv_tracer.res.tile2.nc \ + RESTART/fv_tracer.res.tile3.nc \ + RESTART/fv_tracer.res.tile4.nc \ + RESTART/fv_tracer.res.tile5.nc \ + RESTART/fv_tracer.res.tile6.nc \ + RESTART/phy_data.tile1.nc \ + RESTART/phy_data.tile2.nc \ + RESTART/phy_data.tile3.nc \ + RESTART/phy_data.tile4.nc \ + RESTART/phy_data.tile5.nc \ + RESTART/phy_data.tile6.nc \ + RESTART/sfc_data.tile1.nc \ + RESTART/sfc_data.tile2.nc \ + RESTART/sfc_data.tile3.nc \ + RESTART/sfc_data.tile4.nc \ + RESTART/sfc_data.tile5.nc \ + RESTART/sfc_data.tile6.nc" + +export_fv3 +export NODES=$(expr $TASKS / $TPN + 1) + +export FHMAX=24 +export FDIAG=3 + +export DT_ATMOS="600" +export IMP_PHYSICS=8 +export DNATS=0 +export DO_SAT_ADJ=.F. +export LRADAR=.T. +export LTAEROSOL=.T. + +export FV3_RUN=ccpp_gsd_run.IN +export CCPP_SUITE=FV3_GSD_v0 +export CCPP_LIB_DIR=ccpp/lib +export INPUT_NML=ccpp_gsd.nml.IN + +export HYBEDMF=.F. +export DO_MYNNEDMF=.T. +export IMFSHALCNV=3 +export IMFDEEPCNV=3 +export FHCYC=0 +export LSM=3 +export LSOIL_LSM=9 + +RUN_SCRIPT=rt_fv3.sh + +export WLCLK=30 diff --git a/tests/tests/fv3_ccpp_gsd_drag_suite b/tests/tests/fv3_ccpp_gsd_drag_suite index 6311fc1bb9..4e35890245 100644 --- a/tests/tests/fv3_ccpp_gsd_drag_suite +++ b/tests/tests/fv3_ccpp_gsd_drag_suite @@ -77,7 +77,7 @@ export NODES=$(expr $TASKS / $TPN + 1) export FHMAX=24 export FDIAG=3 -export DT_ATMOS="1200" +export DT_ATMOS="600" export IMP_PHYSICS=8 export DNATS=0 export DO_SAT_ADJ=.F. diff --git a/tests/tests/fv3_ccpp_gsd_noah b/tests/tests/fv3_ccpp_gsd_noah index d03ee62c6b..2bbc90cfe2 100644 --- a/tests/tests/fv3_ccpp_gsd_noah +++ b/tests/tests/fv3_ccpp_gsd_noah @@ -101,7 +101,7 @@ export NODES=$(expr $TASKS / $TPN + 1) export FHMAX=48 export FDIAG=3 -export DT_ATMOS="1200" +export DT_ATMOS="600" export IMP_PHYSICS=8 export DNATS=0 export DO_SAT_ADJ=.F. diff --git a/tests/tests/fv3_ccpp_gsd_sar b/tests/tests/fv3_ccpp_gsd_sar new file mode 100644 index 0000000000..ec960857bb --- /dev/null +++ b/tests/tests/fv3_ccpp_gsd_sar @@ -0,0 +1,37 @@ +############################################################################### +# +# FV3 CCPP GSD SAR (GF CU + Thompson MP + MYNN PBL + RUC LSM) test +# +############################################################################### + +export TEST_DESCR="Compare FV3 CCPP GSD SAR results with previous trunk version" + +export CNTL_DIR=fv3_gsd_sar + +export LIST_FILES="atmos_4xdaily.nc \ + dynf000.nc \ + dynf003.nc \ + phyf000.nc \ + phyf003.nc \ + RESTART/coupler.res \ + RESTART/fv_core.res.nc \ + RESTART/fv_core.res.tile1.nc \ + RESTART/fv_srf_wnd.res.tile1.nc \ + RESTART/fv_tracer.res.tile1.nc \ + RESTART/phy_data.nc \ + RESTART/sfc_data.nc" + +export_fv3 +export TASKS=840 +export NODES=$(expr $TASKS / $TPN + 1) + +export MODEL_CONFIGURE=ccpp_gsd_sar-model_configure.IN +export FV3_RUN=ccpp_gsd_sar_run.IN +export CCPP_SUITE=FV3_GSD_SAR +export CCPP_LIB_DIR=ccpp/lib +export INPUT_NML=ccpp_gsd_sar.nml.IN + +RUN_SCRIPT=rt_fv3.sh + +export WLCLK=30 + diff --git a/tests/tests/fv3_ccpp_gsd_sar_25km_debug b/tests/tests/fv3_ccpp_gsd_sar_25km_debug new file mode 100644 index 0000000000..8edcdab4f8 --- /dev/null +++ b/tests/tests/fv3_ccpp_gsd_sar_25km_debug @@ -0,0 +1,36 @@ +###################################################################################### +# +# FV3 CCPP GSD SAR 25km (GF CU + Thompson MP + MYNN PBL + RUC LSM) test in DEBUG mode +# +###################################################################################### + +export TEST_DESCR="Compare FV3 CCPP GSD SAR results with previous trunk version" + +export CNTL_DIR=fv3_gsd_sar_25km_debug + +export LIST_FILES="dynf000.nc \ + dynf001.nc \ + phyf000.nc \ + phyf001.nc \ + RESTART/coupler.res \ + RESTART/fv_core.res.nc \ + RESTART/fv_core.res.tile1.nc \ + RESTART/fv_srf_wnd.res.tile1.nc \ + RESTART/fv_tracer.res.tile1.nc \ + RESTART/phy_data.nc \ + RESTART/sfc_data.nc" + +export_fv3 +export TASKS=24 +export NODES=$(expr $TASKS / $TPN + 1) + +export MODEL_CONFIGURE=ccpp_gsd_sar_25km-model_configure.IN +export FV3_RUN=ccpp_gsd_sar_25km_run.IN +export CCPP_SUITE=FV3_GSD_SAR +export CCPP_LIB_DIR=ccpp/lib +export INPUT_NML=ccpp_gsd_sar_25km.nml.IN + +RUN_SCRIPT=rt_fv3.sh + +export WLCLK=30 + diff --git a/tests/tests/fv3_ccpp_gsd_warmstart b/tests/tests/fv3_ccpp_gsd_warmstart index e105ca0201..04cfcf8bfa 100644 --- a/tests/tests/fv3_ccpp_gsd_warmstart +++ b/tests/tests/fv3_ccpp_gsd_warmstart @@ -79,7 +79,7 @@ export NSTF_NAME=2,0,1,0,5 export FHMAX=48 export FDIAG=3 -export DT_ATMOS="1200" +export DT_ATMOS="600" export IMP_PHYSICS=8 export DNATS=0 export DO_SAT_ADJ=.F. diff --git a/tests/tests/fv3_ccpp_regional_c768_FA_update_moist b/tests/tests/fv3_ccpp_regional_c768_FA_update_moist new file mode 100644 index 0000000000..55e31e207a --- /dev/null +++ b/tests/tests/fv3_ccpp_regional_c768_FA_update_moist @@ -0,0 +1,27 @@ +############################################################################### +# +# FV3 CCPP regional c768 test with Ferrier-Aligo MP scheme +# +############################################################################### + +export TEST_DESCR="Compare FV3 CCPP regional c768 with Ferrier-Aligo MP scheme results with previous trunk version" + +export CNTL_DIR=fv3_regional_c768 + +export LIST_FILES=" atmos_4xdaily.nc \ + fv3_history2d.nc \ + fv3_history.nc " + +export_fv3 + +export TASKS=480 +export WLCLK=30 + +export RUN_SCRIPT=rt_fv3.sh +export FV3_RUN=ccpp_regional_FA_run.IN + +export CCPP_SUITE=FV3_HAFS_ferhires_update_moist +export CCPP_LIB_DIR=ccpp/lib +export INPUT_NML=ccpp_regional_c768_FA.nml.IN +export LRADAR=.T. +export WRITE_DOPOST=.true. diff --git a/tests/tests/fv3_ccpp_sas b/tests/tests/fv3_ccpp_sas new file mode 100644 index 0000000000..039074bc45 --- /dev/null +++ b/tests/tests/fv3_ccpp_sas @@ -0,0 +1,71 @@ +############################################################################### +# +# FV3 CCPP SAS test +# +############################################################################### + +export TEST_DESCR="Compare FV3 CCPP SAS results with previous trunk version" + +export CNTL_DIR=fv3_sas + +export LIST_FILES="atmos_4xdaily.tile1.nc \ + atmos_4xdaily.tile2.nc \ + atmos_4xdaily.tile3.nc \ + atmos_4xdaily.tile4.nc \ + atmos_4xdaily.tile5.nc \ + atmos_4xdaily.tile6.nc \ + phyf000.nemsio \ + phyf024.nemsio \ + dynf000.nemsio \ + dynf024.nemsio \ + RESTART/coupler.res \ + RESTART/fv_core.res.nc \ + RESTART/fv_core.res.tile1.nc \ + RESTART/fv_core.res.tile2.nc \ + RESTART/fv_core.res.tile3.nc \ + RESTART/fv_core.res.tile4.nc \ + RESTART/fv_core.res.tile5.nc \ + RESTART/fv_core.res.tile6.nc \ + RESTART/fv_srf_wnd.res.tile1.nc \ + RESTART/fv_srf_wnd.res.tile2.nc \ + RESTART/fv_srf_wnd.res.tile3.nc \ + RESTART/fv_srf_wnd.res.tile4.nc \ + RESTART/fv_srf_wnd.res.tile5.nc \ + RESTART/fv_srf_wnd.res.tile6.nc \ + RESTART/fv_tracer.res.tile1.nc \ + RESTART/fv_tracer.res.tile2.nc \ + RESTART/fv_tracer.res.tile3.nc \ + RESTART/fv_tracer.res.tile4.nc \ + RESTART/fv_tracer.res.tile5.nc \ + RESTART/fv_tracer.res.tile6.nc \ + RESTART/sfc_data.tile1.nc \ + RESTART/sfc_data.tile2.nc \ + RESTART/sfc_data.tile3.nc \ + RESTART/sfc_data.tile4.nc \ + RESTART/sfc_data.tile5.nc \ + RESTART/sfc_data.tile6.nc \ + RESTART/phy_data.tile1.nc \ + RESTART/phy_data.tile2.nc \ + RESTART/phy_data.tile3.nc \ + RESTART/phy_data.tile4.nc \ + RESTART/phy_data.tile5.nc \ + RESTART/phy_data.tile6.nc" + + +export_fv3 +export NODES=$(expr $TASKS / $TPN + 1) + +DT_ATMOS="1200" +export IMFSHALCNV=1 +export IMFDEEPCNV=1 +export OUTPUT_GRID="'gaussian_grid'" +export OUTPUT_FILE="'nemsio'" +export WRITE_NEMSIOFLIP=.true. +export WRITE_FSYNCFLAG=.true. + +export FV3_RUN=ccpp_gfdlmp_run.IN +export CCPP_SUITE=FV3_GFS_2017_sas +export CCPP_LIB_DIR=ccpp/lib +export INPUT_NML=ccpp_gfdlmp.nml.IN + +RUN_SCRIPT=rt_fv3.sh diff --git a/tests/tests/fv3_ccpp_satmedmfq b/tests/tests/fv3_ccpp_satmedmfq new file mode 100644 index 0000000000..f49f57627b --- /dev/null +++ b/tests/tests/fv3_ccpp_satmedmfq @@ -0,0 +1,70 @@ +############################################################################### +# +# FV3 CCPP satmedmfq test +# +############################################################################### + +export TEST_DESCR="Compare FV3 CCPP control with satmedmfq on Gaussian grid nemsio output results with previous trunk version" + +export CNTL_DIR=fv3_satmedmfq + +export LIST_FILES="atmos_4xdaily.tile1.nc \ + atmos_4xdaily.tile2.nc \ + atmos_4xdaily.tile3.nc \ + atmos_4xdaily.tile4.nc \ + atmos_4xdaily.tile5.nc \ + atmos_4xdaily.tile6.nc \ + phyf000.nemsio \ + phyf024.nemsio \ + dynf000.nemsio \ + dynf024.nemsio \ + RESTART/coupler.res \ + RESTART/fv_core.res.nc \ + RESTART/fv_core.res.tile1.nc \ + RESTART/fv_core.res.tile2.nc \ + RESTART/fv_core.res.tile3.nc \ + RESTART/fv_core.res.tile4.nc \ + RESTART/fv_core.res.tile5.nc \ + RESTART/fv_core.res.tile6.nc \ + RESTART/fv_srf_wnd.res.tile1.nc \ + RESTART/fv_srf_wnd.res.tile2.nc \ + RESTART/fv_srf_wnd.res.tile3.nc \ + RESTART/fv_srf_wnd.res.tile4.nc \ + RESTART/fv_srf_wnd.res.tile5.nc \ + RESTART/fv_srf_wnd.res.tile6.nc \ + RESTART/fv_tracer.res.tile1.nc \ + RESTART/fv_tracer.res.tile2.nc \ + RESTART/fv_tracer.res.tile3.nc \ + RESTART/fv_tracer.res.tile4.nc \ + RESTART/fv_tracer.res.tile5.nc \ + RESTART/fv_tracer.res.tile6.nc \ + RESTART/phy_data.tile1.nc \ + RESTART/phy_data.tile2.nc \ + RESTART/phy_data.tile3.nc \ + RESTART/phy_data.tile4.nc \ + RESTART/phy_data.tile5.nc \ + RESTART/phy_data.tile6.nc \ + RESTART/sfc_data.tile1.nc \ + RESTART/sfc_data.tile2.nc \ + RESTART/sfc_data.tile3.nc \ + RESTART/sfc_data.tile4.nc \ + RESTART/sfc_data.tile5.nc \ + RESTART/sfc_data.tile6.nc" + + +export_fv3 +export NODES=$(expr $TASKS / $TPN + 1) + +export SATMEDMF=.T. +export ISATMEDMF=1 +export HYBEDMF=.F. +export OUTPUT_GRID="'gaussian_grid'" +export OUTPUT_FILE="'nemsio'" +export WRITE_NEMSIOFLIP=.true. +export WRITE_FSYNCFLAG=.true. +export FV3_RUN=ccpp_satmedmf_run.IN +export CCPP_SUITE=FV3_GFS_2017_satmedmfq +export CCPP_LIB_DIR=ccpp/lib +export INPUT_NML=ccpp_control.nml.IN + +RUN_SCRIPT=rt_fv3.sh diff --git a/tests/tests/fv3_ccpp_shinhong b/tests/tests/fv3_ccpp_shinhong index 4b5c6c58fe..69111a642c 100644 --- a/tests/tests/fv3_ccpp_shinhong +++ b/tests/tests/fv3_ccpp_shinhong @@ -80,7 +80,7 @@ DT_ATMOS="1200" export FV3_RUN=ccpp_gfdlmp_run.IN export CCPP_SUITE=FV3_GFS_2017_shinhong export CCPP_LIB_DIR=ccpp/lib -export INPUT_NML=ccpp_gfdlmp.IN +export INPUT_NML=ccpp_gfdlmp.nml.IN RUN_SCRIPT=rt_fv3.sh diff --git a/tests/tests/fv3_ccpp_thompson b/tests/tests/fv3_ccpp_thompson index 2ba02a67cb..30da3f31c0 100644 --- a/tests/tests/fv3_ccpp_thompson +++ b/tests/tests/fv3_ccpp_thompson @@ -74,7 +74,7 @@ export LIST_FILES="atmos_4xdaily.tile1.nc \ export_fv3 export NODES=$(expr $TASKS / $TPN + 1) -export DT_ATMOS="1200" +export DT_ATMOS="600" export IMP_PHYSICS=8 export DNATS=0 export DO_SAT_ADJ=.F. diff --git a/tests/tests/fv3_ccpp_thompson_mynn b/tests/tests/fv3_ccpp_thompson_mynn index 7e8d0e5ff7..c0bb083b25 100644 --- a/tests/tests/fv3_ccpp_thompson_mynn +++ b/tests/tests/fv3_ccpp_thompson_mynn @@ -74,7 +74,7 @@ export LIST_FILES="atmos_4xdaily.tile1.nc \ export_fv3 export NODES=$(expr $TASKS / $TPN + 1) -export DT_ATMOS="1200" +export DT_ATMOS="600" export IMP_PHYSICS=8 export DNATS=0 export DO_SAT_ADJ=.F. diff --git a/tests/tests/fv3_ccpp_wrtGauss_nemsio_c768 b/tests/tests/fv3_ccpp_wrtGauss_nemsio_c768 index 4278a00600..92885dddf6 100644 --- a/tests/tests/fv3_ccpp_wrtGauss_nemsio_c768 +++ b/tests/tests/fv3_ccpp_wrtGauss_nemsio_c768 @@ -47,16 +47,22 @@ export LIST_FILES="atmos_4xdaily.tile1.nc \ RESTART/sfc_data.tile3.nc \ RESTART/sfc_data.tile4.nc \ RESTART/sfc_data.tile5.nc \ - RESTART/sfc_data.tile6.nc" + RESTART/sfc_data.tile6.nc \ + out_grd.glo_30m" export_fv3 -export TASKS=1728 + +export TASKS=1752 if [[ $MACHINE_ID = cheyenne.* ]]; then export TPN=36 +elif [[ $MACHINE_ID = hera.* ]]; then + export TPN=30 else export TPN=12 fi +export NODES=$(expr $TASKS / $TPN + 1) + export INPES=16 export JNPES=16 export NPX=769 @@ -83,7 +89,15 @@ export FNVETC="'global_vegtype.igbp.t1534.3072.1536.rg.grb'," export FNSOTC="'global_soiltype.statsgo.t1534.3072.1536.rg.grb'," export FNSMCC="'global_soilmgldas.t1534.3072.1536.grb'," export FNABSC="'global_mxsnoalb.uariz.t1534.3072.1536.rg.grb'," -export NODES=$(expr $TASKS / $TPN + 1) + +export CPL=.true. +export CPLWAV=.T. +export atm_model='fv3' +export atm_petlist_bounds="0 1727" +export wav_model='ww3' +export wav_petlist_bounds="1728 1751" +export coupling_interval_sec=1800.0 #coupling time step, want it to be multiple of 1800 and FV3 time step +export NEMS_CONFIGURE="nems.configure.blocked_atm_wav.IN" export FV3_RUN=ccpp_control_run.IN export CCPP_SUITE=FV3_GFS_2017 diff --git a/tests/tests/fv3_ccpp_ysu b/tests/tests/fv3_ccpp_ysu index 2769ed573a..4255d61a8e 100644 --- a/tests/tests/fv3_ccpp_ysu +++ b/tests/tests/fv3_ccpp_ysu @@ -80,7 +80,7 @@ DT_ATMOS="600" export FV3_RUN=ccpp_gfdlmp_run.IN export CCPP_SUITE=FV3_GFS_2017_ysu export CCPP_LIB_DIR=ccpp/lib -export INPUT_NML=ccpp_gfdlmp.IN +export INPUT_NML=ccpp_gfdlmp.nml.IN RUN_SCRIPT=rt_fv3.sh diff --git a/tests/tests/fv3_sas b/tests/tests/fv3_sas new file mode 100644 index 0000000000..02615f3f40 --- /dev/null +++ b/tests/tests/fv3_sas @@ -0,0 +1,69 @@ +############################################################################### +# +# FV3 SAS test +# +############################################################################### + +export TEST_DESCR="Compare FV3 SAS results with previous trunk version" + +export CNTL_DIR=fv3_sas + +export LIST_FILES="atmos_4xdaily.tile1.nc \ + atmos_4xdaily.tile2.nc \ + atmos_4xdaily.tile3.nc \ + atmos_4xdaily.tile4.nc \ + atmos_4xdaily.tile5.nc \ + atmos_4xdaily.tile6.nc \ + phyf000.nemsio \ + phyf024.nemsio \ + dynf000.nemsio \ + dynf024.nemsio \ + RESTART/coupler.res \ + RESTART/fv_core.res.nc \ + RESTART/fv_core.res.tile1.nc \ + RESTART/fv_core.res.tile2.nc \ + RESTART/fv_core.res.tile3.nc \ + RESTART/fv_core.res.tile4.nc \ + RESTART/fv_core.res.tile5.nc \ + RESTART/fv_core.res.tile6.nc \ + RESTART/fv_srf_wnd.res.tile1.nc \ + RESTART/fv_srf_wnd.res.tile2.nc \ + RESTART/fv_srf_wnd.res.tile3.nc \ + RESTART/fv_srf_wnd.res.tile4.nc \ + RESTART/fv_srf_wnd.res.tile5.nc \ + RESTART/fv_srf_wnd.res.tile6.nc \ + RESTART/fv_tracer.res.tile1.nc \ + RESTART/fv_tracer.res.tile2.nc \ + RESTART/fv_tracer.res.tile3.nc \ + RESTART/fv_tracer.res.tile4.nc \ + RESTART/fv_tracer.res.tile5.nc \ + RESTART/fv_tracer.res.tile6.nc \ + RESTART/sfc_data.tile1.nc \ + RESTART/sfc_data.tile2.nc \ + RESTART/sfc_data.tile3.nc \ + RESTART/sfc_data.tile4.nc \ + RESTART/sfc_data.tile5.nc \ + RESTART/sfc_data.tile6.nc \ + RESTART/phy_data.tile1.nc \ + RESTART/phy_data.tile2.nc \ + RESTART/phy_data.tile3.nc \ + RESTART/phy_data.tile4.nc \ + RESTART/phy_data.tile5.nc \ + RESTART/phy_data.tile6.nc" + + +export_fv3 +export NODES=$(expr $TASKS / $TPN + 1) + +DT_ATMOS="1200" +export IMFSHALCNV=1 +export IMFDEEPCNV=1 +export OUTPUT_GRID="'gaussian_grid'" +export OUTPUT_FILE="'nemsio'" +export WRITE_NEMSIOFLIP=.true. +export WRITE_FSYNCFLAG=.true. + +export INPUT_NML=gfdlmp.nml.IN +export FV3_RUN=gfdlmp_run.IN + +RUN_SCRIPT=rt_fv3.sh diff --git a/tests/tests/fv3_satmedmfq b/tests/tests/fv3_satmedmfq new file mode 100644 index 0000000000..dc636e0c77 --- /dev/null +++ b/tests/tests/fv3_satmedmfq @@ -0,0 +1,67 @@ +############################################################################### +# +# FV3 satmedmfq test +# +############################################################################### + +export TEST_DESCR="Compare FV3 control with satmedmfq on Gaussian grid nemsio output results with previous trunk version" + +export CNTL_DIR=fv3_satmedmfq + +export LIST_FILES="atmos_4xdaily.tile1.nc \ + atmos_4xdaily.tile2.nc \ + atmos_4xdaily.tile3.nc \ + atmos_4xdaily.tile4.nc \ + atmos_4xdaily.tile5.nc \ + atmos_4xdaily.tile6.nc \ + phyf000.nemsio \ + phyf024.nemsio \ + dynf000.nemsio \ + dynf024.nemsio \ + RESTART/coupler.res \ + RESTART/fv_core.res.nc \ + RESTART/fv_core.res.tile1.nc \ + RESTART/fv_core.res.tile2.nc \ + RESTART/fv_core.res.tile3.nc \ + RESTART/fv_core.res.tile4.nc \ + RESTART/fv_core.res.tile5.nc \ + RESTART/fv_core.res.tile6.nc \ + RESTART/fv_srf_wnd.res.tile1.nc \ + RESTART/fv_srf_wnd.res.tile2.nc \ + RESTART/fv_srf_wnd.res.tile3.nc \ + RESTART/fv_srf_wnd.res.tile4.nc \ + RESTART/fv_srf_wnd.res.tile5.nc \ + RESTART/fv_srf_wnd.res.tile6.nc \ + RESTART/fv_tracer.res.tile1.nc \ + RESTART/fv_tracer.res.tile2.nc \ + RESTART/fv_tracer.res.tile3.nc \ + RESTART/fv_tracer.res.tile4.nc \ + RESTART/fv_tracer.res.tile5.nc \ + RESTART/fv_tracer.res.tile6.nc \ + RESTART/phy_data.tile1.nc \ + RESTART/phy_data.tile2.nc \ + RESTART/phy_data.tile3.nc \ + RESTART/phy_data.tile4.nc \ + RESTART/phy_data.tile5.nc \ + RESTART/phy_data.tile6.nc \ + RESTART/sfc_data.tile1.nc \ + RESTART/sfc_data.tile2.nc \ + RESTART/sfc_data.tile3.nc \ + RESTART/sfc_data.tile4.nc \ + RESTART/sfc_data.tile5.nc \ + RESTART/sfc_data.tile6.nc" + + +export_fv3 +export NODES=$(expr $TASKS / $TPN + 1) + +export SATMEDMF=.T. +export ISATMEDMF=1 +export HYBEDMF=.F. +export OUTPUT_GRID="'gaussian_grid'" +export OUTPUT_FILE="'nemsio'" +export WRITE_NEMSIOFLIP=.true. +export WRITE_FSYNCFLAG=.true. +export FV3_RUN=satmedmf_run.IN + +RUN_SCRIPT=rt_fv3.sh