-
Notifications
You must be signed in to change notification settings - Fork 374
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge remote-tracking branch 'mt5555/lorenz3' (PR #2600)
updates to DCMIP2016 test cases for NH theta model bug fixes in forcing functions (use dry mixing ratios, convesion between theta and temperature) moisture was ignored for some initial conditions heating term was buggy - disabled for now switch default namelists from Kessler physics to R&J physics so we can run with large remap timesteps update all namelists to run with recommended timesteps [BFB] except for some HOMME subtests
- Loading branch information
Showing
105 changed files
with
4,499 additions
and
1,325 deletions.
There are no files selected for viewing
File renamed without changes.
6 changes: 6 additions & 0 deletions
6
components/homme/dcmip_tests/dcmip2012_test2.0_steady_state_with_orography/theta-l/build.sh
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,6 @@ | ||
| #!/bin/bash | ||
| cwd=`pwd` | ||
| cd ../../.. | ||
| echo "make -j4 theta-l-nlev30" | ||
| make -j4 theta-l-nlev30 | ||
| cd $cwd |
51 changes: 51 additions & 0 deletions
51
.../homme/dcmip_tests/dcmip2012_test2.0_steady_state_with_orography/theta-l/jobscript-snl.sh
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,51 @@ | ||
| #!/bin/tcsh | ||
| # | ||
| # hydrostatic: 4 nodes: 3min | ||
| # NH: 10 nodes ? | ||
| # | ||
| #SBATCH -p ec | ||
| #SBATCH --job-name d20-theta | ||
| #SBATCH --account=FY150001 | ||
| #SBATCH -N 25 | ||
| #SBATCH --time=3:00:00 | ||
| #XXSBATCH -N 4 | ||
| #XXSBATCH --time=0:10:00 | ||
| #PBS -q acme | ||
| #PBS -l walltime=0:30:00 | ||
| #PBS -l nodes=20 | ||
|
|
||
|
|
||
| set OMP_NUM_THREADS = 1 | ||
| set NCPU = 40 | ||
| if ( ${?PBS_ENVIRONMENT} ) then # anvil | ||
| set NCPU = $PBS_NNODES | ||
| if ( $PBS_ENVIRONMENT == PBS_BATCH ) cd $PBS_O_WORKDIR | ||
| endif | ||
| if ( ${?SLURM_NNODES} ) then | ||
| set NCPU = $SLURM_NNODES | ||
| @ NCPU *= 16 | ||
| @ NCPU /= $OMP_NUM_THREADS | ||
| endif | ||
|
|
||
| set EXEC = ../../../test_execs/theta-l-nlev30/theta-l-nlev30 | ||
|
|
||
| # hydrostatic theta | ||
| set namelist = namelist-h.nl | ||
| \cp -f $namelist input.nl | ||
| mpirun -np $NCPU $EXEC < input.nl | ||
| ncl plot_z_lon.ncl | ||
| ncl test200-range.ncl | ||
| \mv -f dcmip2012_test2_0_u_t6.00.pdf hydro_test2_0_u_z.pdf | ||
| \mv -f movies/dcmip2012_test2_01.nc.pdf hydro_test2_0_u.pdf | ||
| \mv -f movies/dcmip2012_test2_01.nc movies/hydro_dcmip2012_test2_01.nc | ||
|
|
||
| # nonhydrostatic theta | ||
| set namelist = namelist-nh.nl | ||
| \cp -f $namelist input.nl | ||
| mpirun -np $NCPU $EXEC < input.nl | ||
| ncl plot_z_lon.ncl | ||
| ncl test200-range.ncl | ||
| \mv -f dcmip2012_test2_0_u_t6.00.pdf nonhydro_test2_0_u_t6.00.pdf | ||
| \mv -f movies/dcmip2012_test2_01.nc.pdf nonhydro_test2_0_u.pdf | ||
| \mv -f movies/dcmip2012_test2_01.nc movies/nonhydro_dcmip2012_test2_01.nc | ||
|
|
File renamed without changes.
46 changes: 22 additions & 24 deletions
46
..._test3_supercell/preqx/namelist-lowres.nl → ...th_orography/theta-l/namelist-h-lowres.nl
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
47 changes: 47 additions & 0 deletions
47
...nts/homme/dcmip_tests/dcmip2012_test2.0_steady_state_with_orography/theta-l/namelist-h.nl
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,47 @@ | ||
| ! | ||
| ! namelist for dcmip2012 test2-0: steady-state atmosphere with orography | ||
| !_______________________________________________________________________ | ||
| &ctl_nl | ||
| nthreads = 1 | ||
| partmethod = 4 ! mesh parition method: 4 = space filling curve | ||
| topology = "cube" ! mesh type: cubed sphere | ||
| test_case = "dcmip2012_test2_0" ! test identifier | ||
| theta_hydrostatic_mode = .true. | ||
| ne = 30 ! number of elements per cube face | ||
| qsize = 0 ! num tracer fields | ||
| ndays = 6 ! num simulation days: 0 = use nmax steps | ||
| statefreq = 144 ! number of steps between screen dumps | ||
| restartfreq = -1 ! don't write restart files if < 0 | ||
| runtype = 0 ! 0 = new run | ||
| tstep = 300 ! largest timestep in seconds | ||
| rsplit = 6 | ||
| integration = 'explicit' ! explicit time integration | ||
| tstep_type = 5 ! 1 => default method | ||
| nu = 1e15 ! hyperviscosity | ||
| nu_s = 1e15 | ||
| nu_p = 1e15 | ||
| hypervis_order = 2 ! 2 = hyperviscosity | ||
| hypervis_subcycle = 1 ! 1 = no hyperviz subcycling | ||
| omega = 0.0 ! earth angular speed = 0.0 | ||
| / | ||
| &vert_nl | ||
| vform = "ccm" ! vertical coordinate type "ccm"=hybrid pressure/terrain | ||
| vanalytic = 1 ! set vcoords in initialization routine | ||
| vtop = 2.05e-1 ! vertical coordinate at top of atm (z=12000m) | ||
| / | ||
| &analysis_nl | ||
| output_dir = "./movies/" ! destination dir for netcdf file | ||
| output_timeunits = 2, ! 1=days, 2=hours, 0=timesteps | ||
| output_frequency = 12, ! output every 12 hours | ||
| output_varnames1 ='T','ps','u','v','omega','geo' ! variables to write to file | ||
| interp_type = 0 ! 0=native grid, 1=bilinear | ||
| output_type ='netcdf' ! netcdf or pnetcdf | ||
| num_io_procs = 16 | ||
| interp_nlat = 91 | ||
| interp_nlon = 360 | ||
| interp_gridtype = 1 | ||
| / | ||
| &prof_inparm | ||
| profile_outpe_num = 100 | ||
| profile_single_file = .true. | ||
| / |
47 changes: 47 additions & 0 deletions
47
...ts/homme/dcmip_tests/dcmip2012_test2.0_steady_state_with_orography/theta-l/namelist-nh.nl
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,47 @@ | ||
| ! | ||
| ! namelist for dcmip2012 test2-0: steady-state atmosphere with orography | ||
| !_______________________________________________________________________ | ||
| &ctl_nl | ||
| nthreads = 1 | ||
| partmethod = 4 ! mesh parition method: 4 = space filling curve | ||
| topology = "cube" ! mesh type: cubed sphere | ||
| test_case = "dcmip2012_test2_0" ! test identifier | ||
| theta_hydrostatic_mode = .false. | ||
| ne = 30 ! number of elements per cube face | ||
| qsize = 0 ! num tracer fields | ||
| ndays = 6 ! num simulation days: 0 = use nmax steps | ||
| statefreq = 144 ! number of steps between screen dumps | ||
| restartfreq = -1 ! don't write restart files if < 0 | ||
| runtype = 0 ! 0 = new run | ||
| tstep = 300.0 ! largest timestep in seconds | ||
| rsplit = 6 ! unstable with desired rsplit=6 - why? | ||
| integration = 'explicit' ! explicit time integration | ||
| tstep_type = 7 ! | ||
| nu = 1e15 ! hyperviscosity | ||
| nu_s = 1e15 | ||
| nu_p = 1e15 | ||
| hypervis_order = 2 ! 2 = hyperviscosity | ||
| hypervis_subcycle = 1 ! 1 = no hyperviz subcycling | ||
| omega = 0.0 ! earth angular speed = 0.0 | ||
| / | ||
| &vert_nl | ||
| vform = "ccm" ! vertical coordinate type "ccm"=hybrid pressure/terrain | ||
| vanalytic = 1 ! set vcoords in initialization routine | ||
| vtop = 2.05e-1 ! vertical coordinate at top of atm (z=12000m) | ||
| / | ||
| &analysis_nl | ||
| output_dir = "./movies/" ! destination dir for netcdf file | ||
| output_timeunits = 2, ! 1=days, 2=hours, 0=timesteps | ||
| output_frequency = 12, ! output every 12 hours | ||
| output_varnames1 ='T','ps','u','v','omega','geo' ! variables to write to file | ||
| interp_type = 0 ! 0=native grid, 1=bilinear | ||
| output_type ='netcdf' ! netcdf or pnetcdf | ||
| num_io_procs = 16 | ||
| interp_nlat = 91 | ||
| interp_nlon = 360 | ||
| interp_gridtype = 1 | ||
| / | ||
| &prof_inparm | ||
| profile_outpe_num = 100 | ||
| profile_single_file = .true. | ||
| / |
Oops, something went wrong.