Skip to content

Commit

Permalink
Feature/refc updates for release/public-v1 (#451)
Browse files Browse the repository at this point in the history
* Update environment and shapefile paths to match documentation

* remove refl_10cm from diag_table.FV3_GFS_v15p2. Remove an erroneous file.

* Set fdiag=1 for all SDFs to ensure hourly output

* Cleaned up spaces - sorry
  • Loading branch information
jwolff-ncar authored Mar 3, 2021
1 parent 5cce4c0 commit 938d9cb
Show file tree
Hide file tree
Showing 5 changed files with 14 additions and 372 deletions.
9 changes: 4 additions & 5 deletions ush/Python/sq_job.sh
Original file line number Diff line number Diff line change
Expand Up @@ -35,19 +35,18 @@ conda activate pygraf
############
# Python environment for Gaea
############
#module use -a /apps/contrib/miniconda3-noaa-gsl/modulefiles
#module load miniconda3
#conda activate pygraf
#module use /lustre/f2/pdata/esrl/gsd/contrib/modulefiles
#module load miniconda3/4.8.3-regional-workflow

############
# Path to shape files
############
#Hera:
SHAPE_FILES=/scratch2/NCEPDEV/fv3-cam/Chan-hoo.Jeon/tools/NaturalEarth
SHAPE_FILES=/scratch2/BMC/det/UFS_SRW_app/v1p0/fix_files/NaturalEarth
#Jet:
#SHAPE_FILES=/lfs4/BMC/wrfruc/FV3-LAM/NaturalEarth
#Orion:
#SHAPE_FILES=/home/chjeon/tools/NaturalEarth
#SHAPE_FILES=/work/noaa/gsd-fv3-dev/UFS_SRW_App/v1p0/fix_files/NaturalEarth
#Gaea:
#SHAPE_FILES=/lustre/f2/pdata/esrl/gsd/ufs/NaturalEarth

Expand Down
10 changes: 5 additions & 5 deletions ush/Python/sq_job_diff.sh
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ module load hpss

############
# Python environment for Jet and Hera
############
module use -a /contrib/miniconda3/modulefiles
module load miniconda3
conda activate pygraf
Expand All @@ -36,19 +37,18 @@ conda activate pygraf
############
# Python environment for Gaea
############
#module use -a /apps/contrib/miniconda3-noaa-gsl/modulefiles
#module load miniconda3
#conda activate pygraf
#module use /lustre/f2/pdata/esrl/gsd/contrib/modulefiles
#module load miniconda3/4.8.3-regional-workflow

############
# Path to shape files
############
#Hera:
SHAPE_FILES=/scratch2/NCEPDEV/fv3-cam/Chan-hoo.Jeon/tools/NaturalEarth
SHAPE_FILES=/scratch2/BMC/det/UFS_SRW_app/v1p0/fix_files/NaturalEarth
#Jet:
#SHAPE_FILES=/lfs4/BMC/wrfruc/FV3-LAM/NaturalEarth
#Orion:
#SHAPE_FILES=/home/chjeon/tools/NaturalEarth
#SHAPE_FILES=/work/noaa/gsd-fv3-dev/UFS_SRW_App/v1p0/fix_files/NaturalEarth
#Gaea:
#SHAPE_FILES=/lustre/f2/pdata/esrl/gsd/ufs/NaturalEarth

Expand Down
10 changes: 5 additions & 5 deletions ush/templates/FV3.input.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ FV3_RRFS_v1alpha:
lsm: 2
lsoil_lsm: 4
atmos_model_nml:
fdiag: 3
fdiag: 1

FV3_RRFS_v1beta:
gfs_physics_nml:
Expand All @@ -52,7 +52,7 @@ FV3_RRFS_v1beta:
lsm: 2
lsoil_lsm: 4
atmos_model_nml:
fdiag: 3
fdiag: 1

FV3_GFS_2017_gfdlmp:
atmos_model_nml:
Expand Down Expand Up @@ -187,7 +187,7 @@ FV3_GFS_2017_gfdlmp_regional:

FV3_GFS_v15p2:
atmos_model_nml:
fdiag: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 15, 18, 21, 24]
fdiag: 1
fms_nml:
domains_stack_size: 1800200
fv_core_nml: &gfs_v15_fv_core
Expand Down Expand Up @@ -272,7 +272,7 @@ FV3_GFS_v15p2:

FV3_GFS_v16beta:
atmos_model_nml:
fdiag: 3
fdiag: 1
fhmax: 240
fhmaxhf: 0
fhout: 3
Expand Down Expand Up @@ -343,7 +343,7 @@ FV3_GFS_v16beta:

FV3_CPT_v0:
atmos_model_nml:
fdiag: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 15, 18, 21, 24]
fdiag: 1
fms_nml:
domains_stack_size: 1800200
fv_core_nml:
Expand Down
2 changes: 0 additions & 2 deletions ush/templates/diag_table.FV3_GFS_v15p2
Original file line number Diff line number Diff line change
Expand Up @@ -138,8 +138,6 @@
"gfs_dyn", "maxvort02", "maxvort02", "fv3_history", "all", .false., "none", 2
"gfs_dyn", "maxvorthy1", "maxvorthy1", "fv3_history", "all", .false., "none", 2
#
"gfs_phys", "refl_10cm", "refl_10cm", "fv3_history", "all", .false., "none", 2
#
"gfs_phys", "ALBDO_ave", "albdo_ave", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "cnvprcp_ave", "cprat_ave", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "cnvprcpb_ave", "cpratb_ave", "fv3_history2d", "all", .false., "none", 2
Expand Down
Loading

0 comments on commit 938d9cb

Please sign in to comment.