Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Chsp latlon post #108

Merged
merged 26 commits into from
Apr 28, 2020
Merged

Chsp latlon post #108

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
6432600
point to fv3 chsp_latlon_post branch
junwang-noaa Apr 17, 2020
c6bed12
update post lib to 8.0.6
junwang-noaa Apr 17, 2020
a54068e
Add chsp to gfsphysics and ccpp-physics
junwang-noaa Apr 18, 2020
29f466a
Bugfix for Intel 18 on wcoss_cray, remove Intel 16 options for gaea
junwang-noaa Apr 18, 2020
569fdc3
fix syntax error in fv3
junwang-noaa Apr 20, 2020
0edfedc
fix syntax error
junwang-noaa Apr 20, 2020
b79d099
fix syntax error in ccpp/physics
junwang-noaa Apr 20, 2020
6d690df
update sflx.f in ccpp physics
junwang-noaa Apr 21, 2020
ec73bb2
add global latlon grid test
junwang-noaa Apr 21, 2020
e9d081e
add fv3_ccpp_wrtGlatlon_netcdf
junwang-noaa Apr 21, 2020
226431f
Add regression tests for lheatstrg to IPD REPRO, CCPP REPRO, CCPP PRO…
climbfuji Apr 21, 2020
d759d44
Merge pull request #2 from climbfuji/chsp_latlon_post_dom_ccpp_mods
junwang-noaa Apr 22, 2020
8db02dc
merge fv3 and nems to the latest repoes
junwang-noaa Apr 24, 2020
f6e4704
merge with latest ufs-weather-model repo
junwang-noaa Apr 24, 2020
a5ccc8a
add global lat lon test to rt.conf
junwang-noaa Apr 24, 2020
876a49e
add cmeps integration changes
junwang-noaa Apr 24, 2020
f81e6df
fix timestr string in fv3
junwang-noaa Apr 25, 2020
93b102a
fix syntax error in FV3
junwang-noaa Apr 25, 2020
235c994
udpate update wcoss cray/dell log files
junwang-noaa Apr 26, 2020
84867da
update hera log files
junwang-noaa Apr 27, 2020
ee5c221
update orion log files
Apr 27, 2020
a5a3243
merge with latest NEMS
junwang-noaa Apr 27, 2020
d32d182
update rt log files from orion
Apr 27, 2020
d42f6bc
update RT log files on dell/cray and hera
junwang-noaa Apr 28, 2020
a194552
update fv3
junwang-noaa Apr 28, 2020
f095bc9
point fv3 and nems back to EMC develop branch
junwang-noaa Apr 28, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion FV3
Open in desktop
Submodule FV3 updated 20 files
+2 −2 atmos_model.F90
+3 −9 ccpp/build_ccpp.sh
+1 −1 ccpp/physics
+27 −20 cpl/module_cap_cpl.F90
+2 −2 cpl/module_cplfields.F90
+14 −3 fv3_cap.F90
+79 −43 gfsphysics/GFS_layer/GFS_physics_driver.F90
+48 −17 gfsphysics/GFS_layer/GFS_typedefs.F90
+42 −0 gfsphysics/GFS_layer/GFS_typedefs.meta
+25 −50 gfsphysics/physics/module_sf_noahmplsm.f90
+2 −2 gfsphysics/physics/satmedmfvdifq.f
+17 −8 gfsphysics/physics/sfc_diff.f
+8 −24 gfsphysics/physics/sfc_noahmp_drv.f
+68 −61 gfsphysics/physics/sflx.f
+15 −12 gfsphysics/physics/ugwp_driver_v0.f
+42 −26 io/FV3GFS_io.F90
+3 −0 io/module_write_netcdf.F90
+7 −2 io/module_write_netcdf_parallel.F90
+106 −30 io/module_wrt_grid_comp.F90
+5 −5 module_fcst_grid_comp.F90
2 changes: 1 addition & 1 deletion NEMS
Open in desktop
Submodule NEMS updated 4 files
+7 −0 GNUmakefile
+9 −0 src/incmake/relist_components.mk
+57 −49 src/module_EARTH_GRID_COMP.F90
+7 −7 src/module_MEDIATOR.F90
14 changes: 14 additions & 0 deletions compsets/fv3.input
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1422,6 +1422,19 @@ test fv3_wrtGauss_netcdf: fv3.exe {
}
}

test fv3_wrtGlatlon_netcdf: fv3.exe {
use fv3_wrtGauss_netcdf

TEST_DESCR="Compare FV3 global latlon grid netcdf output results with previous trunk version"
CNTL_NAME="fv3_wrtGlatlon_netcdf"

OUTPUT_GRID="'global_latlon'"

COM="@[plat%COMrt]/@[TEST_NAME]" # Test result area
RUNDIR="@[plat%TMPrt]/@[TEST_NAME]" # Test work area
CNTL="@[plat%BASELINE]/@[CNTL_NAME]" # Control baseline area
}

########################################################################

test fv3_satmedmf: fv3.exe {
Expand All @@ -1432,6 +1445,7 @@ test fv3_satmedmf: fv3.exe {

SATMEDMF='.true.'
HYBEDMF='.false.'
DT_ATMOS=1200
OUTPUT_GRID="'gaussian_grid'"
OUTPUT_FILE="'nemsio'"
WRITE_NEMSIOFLIP='.true.'
Expand Down
4 changes: 2 additions & 2 deletions compsets/hera.input
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@ platform hera.intel {
# INPUTS is the input directory, which should contain fix and parm
# files, plus any restarts or other inputs.

BASELINE="/scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20200422/INTEL"
BASELINE_TEMPLATE="/scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20200422/INTEL"
BASELINE="/scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20200424/INTEL"
BASELINE_TEMPLATE="/scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20200424/INTEL"
INPUTS="@[BASELINE]"

default_resources={
Expand Down
16 changes: 8 additions & 8 deletions compsets/wcoss.input
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@ platform wcoss.phase2 {
LONG_TEST_QUEUE='&LONGQ;'
BUILD_QUEUE='&BUILDQ;'
MACHINE_ID='wcoss.phase2'
BASELINE="/nems/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20200422"
BASELINE_TEMPLATE="/nems/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20200422"
BASELINE="/nems/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20200424"
BASELINE_TEMPLATE="/nems/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20200424"

default_resources={
TASKS=156
Expand Down Expand Up @@ -126,8 +126,8 @@ platform wcoss.phase1 {
C768_THRD=4

MACHINE_ID='wcoss.phase1'
BASELINE="/nems/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20200422"
BASELINE_TEMPLATE="/nems/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20200422"
BASELINE="/nems/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20200424"
BASELINE_TEMPLATE="/nems/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20200424"

# WCOSS Phase 2 has been slow of late.
DEFAULT_TEST_WALLTIME=2700
Expand Down Expand Up @@ -213,8 +213,8 @@ platform wcoss_dell_p3 {
LONG_TEST_QUEUE='&LONGQ;'
BUILD_QUEUE='&BUILDQ;'

BASELINE="/gpfs/dell2/emc/modeling/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20200422/"
BASELINE_TEMPLATE="/gpfs/dell2/emc/modeling/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20200422/"
BASELINE="/gpfs/dell2/emc/modeling/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20200424/"
BASELINE_TEMPLATE="/gpfs/dell2/emc/modeling/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20200424/"

default_resources={
TASKS=156
Expand Down Expand Up @@ -314,8 +314,8 @@ platform wcoss.cray {
BUILD_WALLTIME="3600"
DEFAULT_TEST_WALLTIME=1800

BASELINE="/gpfs/hps3/emc/nems/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20200422"
BASELINE_TEMPLATE="/gpfs/hps3/emc/nems/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20200422"
BASELINE="/gpfs/hps3/emc/nems/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20200424"
BASELINE_TEMPLATE="/gpfs/hps3/emc/nems/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20200424"

execution_time_modules=[[[
module load alps
Expand Down
7 changes: 0 additions & 7 deletions conf/before_components.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,6 @@

CHOSEN_MODULE=$(BUILD_TARGET)/fv3

ifneq (,$(findstring INTEL16=Y,$(FV3_MAKEOPT)))
ifeq ($(CHOSEN_MODULE),gaea.intel/fv3)
override CHOSEN_MODULE=$(BUILD_TARGET)/fv3.intel-16.0.3.210
$(warning Overriding CHOSEN_MODULE with $(CHOSEN_MODULE) as requested per MAKEOPT)
endif
endif

CONFIGURE_NEMS_FILE=configure.fv3.$(BUILD_TARGET)

# ----------------------------------------------------------------------
Expand Down
5 changes: 0 additions & 5 deletions conf/configure.fv3.gaea.intel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@ OPENMP = Y
AVX2 = Y
HYDRO = N
CCPP = N
INTEL16 = N

include $(ESMFMKFILE)
ESMF_INC = $(ESMF_F90COMPILEPATHS)
Expand Down Expand Up @@ -98,11 +97,7 @@ CPPDEFS += -DMULTI_GASES
endif

FFLAGS_OPT = -O2 -debug minimal -fp-model source -qoverride-limits -qopt-prefetch=3
ifeq ($(INTEL16),Y)
FFLAGS_REPRO = -O2 -debug minimal -fp-model strict -qoverride-limits -g -traceback
else
FFLAGS_REPRO = -O2 -debug minimal -fp-model consistent -qoverride-limits -g -traceback
endif
FFLAGS_DEBUG = -g -O0 -check all -check noarg_temp_created -check nopointer -warn -warn noerrors -fp-stack-check -fstack-protector-all -fpe0 -debug -traceback -ftrapuv

TRANSCENDENTALS := -fast-transcendentals
Expand Down
2 changes: 1 addition & 1 deletion conf/configure.fv3.wcoss_cray
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ CPPDEFS += -DMULTI_GASES
endif

FFLAGS_OPT = -O2 -debug minimal -fp-model source -qoverride-limits -qopt-prefetch=3
FFLAGS_REPRO = -O2 -debug minimal -fp-model strict -qoverride-limits -g -traceback
FFLAGS_REPRO = -O2 -debug minimal -fp-model consistent -qoverride-limits -g -traceback
FFLAGS_DEBUG = -g -O0 -check -check noarg_temp_created -check nopointer -warn -warn noerrors -fp-stack-check -fstack-protector-all -fpe0 -debug -traceback -ftrapuv

TRANSCENDENTALS := -fast-transcendentals
Expand Down
Loading