Skip to content

Commit

Permalink
Merge remote-tracking branch 'JunWang/global_testfix' into feature/cp…
Browse files Browse the repository at this point in the history 
…ld_v16
  • Loading branch information
@DeniseWorthen
DeniseWorthen committed Sep 30, 2021
2 parents 56eed72 + 925a1ed commit 3d2b0a6
Show file tree
Hide file tree
Showing 63 changed files with 43 additions and 731 deletions.
6 changes: 3 additions & 3 deletions tests/default_vars.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -627,10 +627,10 @@ export NPY=97
export NPZ=64
export NPZP=65
export NSTF_NAME=2,1,1,0,5
export OUTPUT_FH="0 1 2 3 4 5 6 7 8 9 10 11 12 15 18 21 24 27 30 33 36 39 42 45 48"
export NFHOUT=3
export OUTPUT_FH="12 -1"
export NFHOUT=12
export NFHMAX_HF=12
export NFHOUT_HF=1
export NFHOUT_HF=6
export IAU_OFFSET=0
export FHZERO=6
export FNALBC="'global_snowfree_albedo.bosu.t126.384.190.rg.grb'"
Expand Down
4 changes: 1 addition & 3 deletions tests/parm/esg_HAFS_v0_hwrf-model_configure.IN
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,5 @@ lat1: 22.41403305
dx: 3000.0
dy: 3000.0

nfhout: 3
nfhmax_hf: 12
nfhout_hf: 1
output_fh: 0 1 12
nsout: -1
3 changes: 0 additions & 3 deletions tests/parm/model_configure_regional.IN
View file
Original file line number Diff line number Diff line change
Expand Up @@ -61,8 +61,5 @@ kchunk3d: -1
# dx: 10000.0 # x-direction grid length
# dy: 10000.0 # y-direction grid length

nfhout: 3
nfhmax_hf: 12
nfhout_hf: 1
output_fh: @[OUTPUT_FH]
nsout: -1
32 changes: 0 additions & 32 deletions tests/rt.conf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,12 +42,7 @@ RUN | control_c384
RUN | control_c384gdas | - wcoss_cray | fv3 |
RUN | control_stochy | | fv3 |
RUN | control_stochy_restart | | | control_stochy
RUN | control_ca | | fv3 |
RUN | control_ca_restart | | | control_ca
RUN | control_lndp | | fv3 |
RUN | control_lheatstrg | | fv3 |
RUN | control_lseaspray | | fv3 |
RUN | control_merra2 | | fv3 |

RUN | control_p7 | | fv3 |
RUN | control_restart_p7 | | | control_p7
Expand Down Expand Up @@ -76,12 +71,10 @@ RUN | control_rrtmgp
RUN | control_csawmg | - gaea.intel | fv3 |
RUN | control_csawmgt | | fv3 |
RUN | control_flake | | fv3 |
RUN | control_ugwpv1 | | fv3 |
RUN | control_ras | | fv3 |
# post results do not reproduce on cray
RUN | control_thompson | - wcoss_cray | fv3 |
RUN | control_thompson_no_aero | - wcoss_cray | fv3 |
RUN | control_noahmp | | fv3 |

RUN | fv3_HAFS_v0_hwrf_thompson | | fv3 |
#RUN | fv3_HAFS_v0_hwrf | | fv3 |
Expand All @@ -108,16 +101,11 @@ RUN | control_2threads_debug
RUN | control_CubedSphereGrid_debug | | fv3 |
RUN | control_wrtGauss_netcdf_parallel_debug | | fv3 |
RUN | control_stochy_debug | | fv3 |
RUN | control_ca_debug | | fv3 |
RUN | control_lndp_debug | | fv3 |
RUN | control_lheatstrg_debug | | fv3 |
RUN | control_merra2_debug | | fv3 |
RUN | control_rrtmgp_debug | | fv3 |
RUN | control_csawmg_debug | | fv3 |
RUN | control_csawmgt_debug | | fv3 |
RUN | control_ugwpv1_debug | | fv3 |
RUN | control_ras_debug | | fv3 |
RUN | control_noahmp_debug | | fv3 |
RUN | control_diag_debug | | fv3 |
RUN | control_debug_p7 | | fv3 |

Expand All @@ -134,7 +122,6 @@ RUN | fv3_rrfs_v1alpha_debug

COMPILE | -DAPP=ATM -DCCPP_SUITES=FV3_HAFS_v0_hwrf_thompson,FV3_HAFS_v0_hwrf -DDEBUG=ON | | fv3 |
RUN | fv3_HAFS_v0_hwrf_thompson_debug | | fv3 |
#RUN | fv3_HAFS_v0_hwrf_debug | | fv3 |
RUN | fv3_esg_HAFS_v0_hwrf_thompson_debug | | fv3 |

#COMPILE | -DAPP=ATM -DCCPP_SUITES=FV3_GFS_2017_fv3wam -D32BIT=ON -DMULTI_GASES=ON -DDEBUG=ON | | fv3 |
Expand All @@ -153,25 +140,6 @@ RUN | hafs_regional_docn
RUN | hafs_regional_docn_oisst | - wcoss_cray wcoss2 | fv3 |
RUN | hafs_regional_datm_cdeps | - wcoss_cray wcoss2 | fv3 |

###################################################################################################################################################################################
# NEMS Data Atmosphere tests #
###################################################################################################################################################################################

COMPILE | -DAPP=NG-GODAS-NEMSDATM | - wcoss_cray | fv3 |
RUN | datm_control_cfsr | - wcoss_cray | fv3 |
RUN | datm_restart_cfsr | - wcoss_cray | | datm_control_cfsr
RUN | datm_control_gefs | - wcoss_cray | fv3 |
RUN | datm_control_iau_gefs | - wcoss_cray | fv3 |

RUN | datm_bulk_cfsr | - wcoss_cray | fv3 |
RUN | datm_bulk_gefs | - wcoss_cray | fv3 |

RUN | datm_mx025_cfsr | - wcoss_cray gaea.intel | fv3 |
RUN | datm_mx025_gefs | - wcoss_cray | fv3 |

COMPILE | -DAPP=NG-GODAS-NEMSDATM -DDEBUG=ON | - wcoss_cray | fv3 |
RUN | datm_debug_cfsr | - wcoss_cray | fv3 |

###################################################################################################################################################################################
# CDEPS Data Atmosphere tests #
###################################################################################################################################################################################
Expand Down
1 change: 1 addition & 0 deletions tests/tests/control
View file
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,7 @@ export OUTPUT_GRID='gaussian_grid'
export NSTF_NAME='2,0,0,0,0'
export WRITE_DOPOST=.true.
export IAER=5111
export OUTPUT_FH='0 21 24'


export FV3_RUN=control_run.IN
Expand Down
1 change: 1 addition & 0 deletions tests/tests/control_2threads_debug
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ export OUTPUT_GRID='gaussian_grid'
export NSTF_NAME='2,0,0,0,0'
export IAER=5111
export FHMAX=01
export OUTPUT_FH="0 1"

export THRD=2
export TASKS=$TASKS_thrd
Expand Down
1 change: 1 addition & 0 deletions tests/tests/control_CubedSphereGrid_debug
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@ export FHMAX=1
export OUTPUT_GRID='cubed_sphere_grid'
export NSTF_NAME='2,0,0,0,0'
export IAER=5111
export OUTPUT_FH="0 1"

export FV3_RUN=control_run.IN
export CCPP_SUITE=FV3_GFS_v16
Expand Down
2 changes: 1 addition & 1 deletion tests/tests/control_c192
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ export SYEAR=2021
export SMONTH=03
export SDAY=22
export SHOUR=06
export RESTART_INTERVAL=0
export RESTART_INTERVAL=48
export CDMBWD=${CDMBWD_c192}
export OUTPUT_GRID='gaussian_grid'
export NSTF_NAME='2,0,0,0,0'
Expand Down
1 change: 1 addition & 0 deletions tests/tests/control_c384
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ export WRITE_DOPOST=.true.
export IAER=5111
export IMO=1536
export JMO=768
export OUTPUT_FH="6 -1"

export FNALBC="'global_snowfree_albedo.bosu.t766.1536.768.rg.grb',"
export FNVETC="'global_vegtype.igbp.t766.1536.768.rg.grb',"
Expand Down
2 changes: 1 addition & 1 deletion tests/tests/control_c384gdas_wav
View file
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ export SMONTH=03
export SDAY=21
export SHOUR=18
export FHROT=3
export FDIAG=3
export OUTPUT_FH="3 -1"
export NFHMAX_HF=0
export IAU_OFFSET=6
export CDMBWD=${CDMBWD_c384}
Expand Down
52 changes: 0 additions & 52 deletions tests/tests/control_ca
View file

This file was deleted.

46 changes: 0 additions & 46 deletions tests/tests/control_ca_debug
View file

This file was deleted.

1 change: 1 addition & 0 deletions tests/tests/control_csawmg_debug
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ export SHOUR=06
export OUTPUT_GRID='gaussian_grid'
export NSTF_NAME='2,0,0,0,0'
export FHMAX=01
export OUTPUT_FH="0 1"

export DT_ATMOS=600
export IAER=1011
Expand Down
1 change: 1 addition & 0 deletions tests/tests/control_csawmgt_debug
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ export SHOUR=06
export OUTPUT_GRID='gaussian_grid'
export NSTF_NAME='2,0,0,0,0'
export FHMAX=01
export OUTPUT_FH="0 1"

export DT_ATMOS=450
export IAER=111
Expand Down
1 change: 1 addition & 0 deletions tests/tests/control_debug
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ export OUTPUT_GRID='gaussian_grid'
export NSTF_NAME='2,0,0,0,0'
export IAER=5111
export FHMAX=1
export OUTPUT_FH="0 1"
#export WRITE_DOPOST=.true.


Expand Down
1 change: 1 addition & 0 deletions tests/tests/control_diag_debug
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ export OUTPUT_GRID='gaussian_grid'
export NSTF_NAME='2,0,0,0,0'
export IAER=5111
export FHMAX=1
export OUTPUT_FH="0 1"

export FV3_RUN=control_run.IN
export CCPP_SUITE=FV3_GFS_v16
Expand Down
1 change: 1 addition & 0 deletions tests/tests/control_fhzero
View file
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,7 @@ export NSTF_NAME='2,0,0,0,0'
export WRITE_DOPOST=.true.
export IAER=5111
export FHZERO=3
export OUTPUT_FH='0 21'


export FV3_RUN=control_run.IN
Expand Down
37 changes: 0 additions & 37 deletions tests/tests/control_lheatstrg
View file

This file was deleted.

33 changes: 0 additions & 33 deletions tests/tests/control_lheatstrg_debug
View file

This file was deleted.

1 change: 1 addition & 0 deletions tests/tests/control_lndp_debug
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ export FHMAX=1
export OUTPUT_GRID='gaussian_grid'
export NSTF_NAME='2,0,0,0,0'
export IAER=5111
export OUTPUT_FH="0 1"

export FV3_RUN=control_run.IN
export CCPP_SUITE=FV3_GFS_v16
Expand Down
Loading

0 comments on commit 3d2b0a6

Please sign in to comment.