Skip to content

Commit

Permalink
updates in inline post and restart files and bug fix in ugwd (#16)
Browse files Browse the repository at this point in the history 
* add fh00 post control file, add restart output at specified forecast hours, ugwd bug fixes
* update module files to use g2tmpl v1.6.0 and post v8.0.1
* add fh00 post control file in fv3.input for inline post
* update in runduration in atmos
* update RT baseline directory on hera and wcoss
* comment out fv3_wrtGauss_nemsio_c768 on dell
* update grib2 table for g2tmpl 1.6.0
* update post
* comment out print line in FV3
  • Loading branch information
@junwang-noaa @DusanJovic-NOAA
junwang-noaa authored and DusanJovic-NOAA committed Dec 27, 2019
1 parent b7cbde7 commit d311672
Show file tree
Hide file tree
Showing 49 changed files with 134,593 additions and 72,707 deletions.
2 changes: 1 addition & 1 deletion FV3
Submodule FV3 updated 12 files
+1 −1 atmos_cubed_sphere
+28 −6 atmos_model.F90
+12 −6 fv3_cap.F90
+1 −1 gfsphysics/GFS_layer/GFS_driver.F90
+6 −2 gfsphysics/GFS_layer/GFS_physics_driver.F90
+30 −8 gfsphysics/GFS_layer/GFS_radiation_driver.F90
+1 −0 gfsphysics/physics/sflx.f
+3 −1 gfsphysics/physics/ugwp_driver_v0.f
+2 −2 io/FV3GFS_io.F90
+67 −14 io/post_gfs.F90
+74 −35 module_fcst_grid_comp.F90
+4 −3 module_fv3_config.F90
2 changes: 1 addition & 1 deletion compsets/all.input
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ run fv3_wrtGauss_netcdf_esmf @ fv3, standard, baseline
run fv3_wrtGauss_netcdf @ fv3, standard, baseline
run fv3_wrtGauss_nemsio @ fv3, standard, baseline

run fv3_wrtGauss_nemsio_c768 @ fv3, baseline, ww3, plat==hera.intel, plat==wcoss.cray, plat==wcoss_dell_p3
run fv3_wrtGauss_nemsio_c768 @ fv3, baseline, ww3, plat==hera.intel, plat==wcoss.cray
run fv3_wrtGauss_nemsio_c192 @ fv3, standard, baseline
run fv3_stochy @ fv3, standard, baseline
run fv3_iau @ fv3, standard, baseline
Expand Down
3 changes: 3 additions & 0 deletions compsets/fv3.input
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2003,6 +2003,7 @@ test fv3_gfdlmprad_32bit_post: fv3_32bit.exe {
'model_configure' <=atparse= "@[PARMnems]/model_configure.IN"
'itag' <=atparse= "@[PARMnems]/post_itag"
'postxconfig-NT.txt' <=atparse= "@[PARMnems]/postxconfig-NT.txt"
'postxconfig-NT_FH00.txt' <=atparse= "@[PARMnems]/postxconfig-NT_FH00.txt"
'params_grib2_tbl_new' <=atparse= "@[PARMnems]/params_grib2_tbl_new"
'aerosol.dat' <=copyfrom= "@[FV3_input_data]/INPUT"
'co2historicaldata_201*.txt' <=copyfrom= "@[FV3_input_data]/INPUT"
Expand Down Expand Up @@ -2030,7 +2031,9 @@ test fv3_gfdlmprad_32bit_post: fv3_32bit.exe {
'phyf024.nemsio' .bitcmp. "@[CNTL]"
'dynf000.nemsio' .bitcmp. "@[CNTL]"
'dynf024.nemsio' .bitcmp. "@[CNTL]"
'GFSFLX.GrbF00' .bitcmp. "@[CNTL]"
'GFSPRS.GrbF00' .bitcmp. "@[CNTL]"
'GFSFLX.GrbF24' .bitcmp. "@[CNTL]"
'GFSPRS.GrbF24' .bitcmp. "@[CNTL]"
'RESTART/coupler.res' .bitcmp. "@[CNTL]/RESTART/"
'RESTART/fv_core.res.nc' .bitcmp. "@[CNTL]/RESTART/"
Expand Down
4 changes: 2 additions & 2 deletions compsets/hera.input
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,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/trunk-20191127"
BASELINE_TEMPLATE="/scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/trunk-20191127"
BASELINE="/scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20191217"
BASELINE_TEMPLATE="/scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20191217"
INPUTS="@[BASELINE]"

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

default_resources={
TASKS=156
Expand Down Expand Up @@ -121,8 +121,8 @@ platform wcoss.phase1 {
cores_per_node=16
cpus_per_core=2
MACHINE_ID='wcoss.phase1'
BASELINE="/nems/noscrub/emc.nemspara/RT/NEMSfv3gfs/trunk-20191127"
BASELINE_TEMPLATE="/nems/noscrub/emc.nemspara/RT/NEMSfv3gfs/trunk-20191127"
BASELINE="/nems/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20191217"
BASELINE_TEMPLATE="/nems/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20191217"

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

BASELINE="/gpfs/dell2/emc/modeling/noscrub/emc.nemspara/RT/NEMSfv3gfs/trunk-20191127"
BASELINE_TEMPLATE="/gpfs/dell2/emc/modeling/noscrub/emc.nemspara/RT/NEMSfv3gfs/trunk-20191127"
BASELINE="/gpfs/dell2/emc/modeling/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20191217"
BASELINE_TEMPLATE="/gpfs/dell2/emc/modeling/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20191217"

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

BASELINE="/gpfs/hps3/emc/nems/noscrub/emc.nemspara/RT/NEMSfv3gfs/trunk-20191127"
BASELINE_TEMPLATE="/gpfs/hps3/emc/nems/noscrub/emc.nemspara/RT/NEMSfv3gfs/trunk-20191127"
BASELINE="/gpfs/hps3/emc/nems/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20191217"
BASELINE_TEMPLATE="/gpfs/hps3/emc/nems/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20191217"

execution_time_modules=[[[
module load alps
Expand Down
2 changes: 1 addition & 1 deletion conf/configure.fv3.wcoss_phase1
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ CFLAGS := $(INCLUDE)
FFLAGS := $(INCLUDE) -fno-alias -auto -safe-cray-ptr -ftz -assume byterecl -nowarn -sox -align array64byte

CPPDEFS += -Duse_libMPI -Duse_netCDF -DSPMD -DUSE_LOG_DIAG_FIELD_INFO -Duse_LARGEFILE -DUSE_GFSL63 -DGFS_PHYS -Duse_WRTCOMP
CPPDEFS += -DNEW_TAUCTMAX -DINTERNAL_FILE_NML
CPPDEFS += -DNEW_TAUCTMAX -DINTERNAL_FILE_NML -DNO_INLINE_POST

ifeq ($(HYDRO),Y)
CPPDEFS +=
Expand Down
2 changes: 1 addition & 1 deletion conf/configure.fv3.wcoss_phase2
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ CFLAGS := $(INCLUDE)
FFLAGS := $(INCLUDE) -fno-alias -auto -safe-cray-ptr -ftz -assume byterecl -nowarn -sox -align array64byte

CPPDEFS += -Duse_libMPI -Duse_netCDF -DSPMD -DUSE_LOG_DIAG_FIELD_INFO -Duse_LARGEFILE -DUSE_GFSL63 -DGFS_PHYS -Duse_WRTCOMP
CPPDEFS += -DNEW_TAUCTMAX -DINTERNAL_FILE_NML
CPPDEFS += -DNEW_TAUCTMAX -DINTERNAL_FILE_NML -DNO_INLINE_POST

ifeq ($(HYDRO),Y)
CPPDEFS +=
Expand Down
Loading

0 comments on commit d311672

Please sign in to comment.