Merge branch 'oksanaguba/homme/bench-nl-theta' (PR #2693)

NEw namelists are created for theta-l hydro and nonhydro versions for NGGPS and V1 benchmarks for both Euler and SL transport. There will also be namelists for ne1024 (3km).

Note that all new namelists will use lim9.

namelists only, skipping integration testing

[BFB]

components/homme/test/benchmarks/v1/diff-namelist

@@ -0,0 +1,32 @@
+
+file1=v1-ne120-sl.nl
+file2=v1-ne120.nl
+#file2=v1-ne120-thetal-h-sl.nl
+
+
+echo "Comparing namelists ${file1}, ${file2}"
+
+diff <( sed 's/=/ = /' ${file1} | awk '/^[ \t]*[[:alnum:]]/ { print $1, $3 }' | sort ) <(sed 's/=/ = /' ${file2} | awk '/^[ \t]*[[:alnum:]]/ { print $1, $3 }' | sort )
+
+echo " "
+
+echo "Finding redeclared vars in ${file1}..."
+sed 's/=/ = /' ${file1} | awk '/^[ \t]*[[:alnum:]]/ { print $1 }' | sort | uniq -d && echo "Above are redeclared variables if any."
+
+echo " "
+
+echo "Finding redeclared vars in ${file2}..."
+sed 's/=/ = /' ${file2} | awk '/^[ \t]*[[:alnum:]]/ { print $1 }' | sort | uniq -d && echo "Above are redeclared variables if any."
+
+
+echo " "
+
+echo "Now look for doubles in each file"
+for file in ./*.nl
+do
+  echo "in file ${file}"
+  sed 's/=/ = /' ${file} | awk '/^[ \t]*[[:alnum:]]/ { print $1 }' | sort | uniq -d && echo "Above are redeclared variables if any."
+done
+
+
+

components/homme/test/benchmarks/v1/v1-ne120-sl.nl

@@ -7,30 +7,29 @@ u_perturb = 1
 rotate_grid = 0
 ne=120
 qsize = 40
-!ndays=1
-nmax=96
-statefreq=1
+ndays=1
+statefreq=360
 disable_diagnostics = .true.
 restartfreq   = 43200
 restartfile   = "./R0001"
 runtype       = 0
 mesh_file='/dev/null'
 tstep=75      ! ne30: 300  ne120: 75
 rsplit=1       ! ne30: 3   ne120:  2
-qsplit = 1
+qsplit = 6
 tstep_type = 5
 integration   = "explicit"
-!transport_alg = 12
-!transport_alg = 0
-!semi_lagrange_cdr_alg = 20
-theta_hydrostatic_mode=.false.
+transport_alg = 12
+semi_lagrange_cdr_alg = 20
+theta_hydrostatic_mode=.true.
+semi_lagrange_nearest_point_lev=100
 nu=1e13
 nu_div=2.5e13
 nu_p=1e13
-nu_q=1e13
+nu_q=0
 nu_s=1e13
 nu_top = 2.5e5
-se_ftype     = 0
+se_ftype     = 4
 limiter_option = 9
 vert_remap_q_alg = 1
 hypervis_scaling=0

components/homme/test/benchmarks/v1/v1-ne120-thetal-nh-euler.nl

@@ -0,0 +1,65 @@
+&ctl_nl
+!-------------------------------------EULER
+rsplit=2                             !NOTE THAT RSPLIT HAS TO DIVIDE # OF TSTEPS/NMAX
+qsplit=1                             !NOTE THAT QSPLIT HAS TO DIVIDE # OF TSTEPS/NMAX
+se_ftype=0
+!-------------------------------------HYDRO/NON
+!theta_hydrostatic_mode=.true.      
+!tstep_type    = 5                   
+theta_hydrostatic_mode = .false.   
+tstep_type    = 7                  
+!-------------------------------------RES,RUN,OUTPUT
+ne=120
+qsize = 40
+ndays=1
+statefreq=999999999
+disable_diagnostics = .true.
+tstep=75      ! ne30: 300  ne120: 75
+!-------------------------------------HV
+nu=1e13
+nu_div=2.5e13
+nu_p=1e13
+nu_q=1e13
+nu_s=1e13
+nu_top = 2.5e5
+hypervis_scaling=0
+hypervis_order = 2
+hypervis_subcycle=4
+!-------------------------------------UNLIKELY TO CHANGE
+NThreads=-1
+partmethod    = 4
+topology      = "cube"
+test_case     = "jw_baroclinic"
+u_perturb = 1
+rotate_grid = 0
+restartfreq   = 999999999
+restartfile   = "./R0001"
+runtype       = 0
+mesh_file='/dev/null'
+integration   = "explicit"
+limiter_option = 9 ! this is diff from what's for preqx
+vert_remap_q_alg = 1
+/
+&vert_nl
+vform         = "ccm"
+vfile_mid = './acme-72m.ascii'
+vfile_int = './acme-72i.ascii'
+/
+
+&prof_inparm
+profile_outpe_num = 100
+profile_single_file		= .true.
+/
+
+&analysis_nl
+! disabled
+ output_timeunits=1,1
+ output_frequency=0,0
+ output_start_time=0,0
+ output_end_time=30000,30000
+ output_varnames1='ps','zeta','T','geo'
+ output_varnames2='Q','Q2','Q3','Q4','Q5'
+ io_stride=8
+ output_type = 'netcdf' 
+/
+

components/homme/test/benchmarks/v1/v1-ne120-thetal-nh-sl.nl

@@ -0,0 +1,68 @@
+&ctl_nl
+!-------------------------------------SL
+transport_alg=12
+semi_lagrange_cdr_alg=20
+rsplit=1                             !NOTE THAT RSPLIT HAS TO DIVIDE # OF TSTEPS/NMAX
+qsplit=6                             !NOTE THAT QSPLIT HAS TO DIVIDE # OF TSTEPS/NMAX
+se_ftype=4
+nu_q=0
+semi_lagrange_nearest_point_lev = 100
+!-------------------------------------HYDRO/NON
+!theta_hydrostatic_mode=.true.      
+!tstep_type    = 5                   
+theta_hydrostatic_mode = .false.   
+tstep_type    = 7                  
+!-------------------------------------RES,RUN,OUTPUT
+ne=120
+qsize = 40
+ndays=1
+statefreq=999999999
+disable_diagnostics = .true.
+tstep=75      ! ne30: 300  ne120: 75
+!-------------------------------------HV
+nu=1e13
+nu_div=2.5e13
+nu_p=1e13
+nu_s=1e13
+nu_top = 2.5e5
+hypervis_scaling=0
+hypervis_order = 2
+hypervis_subcycle=4
+!-------------------------------------UNLIKELY TO CHANGE
+NThreads=-1
+partmethod    = 4
+topology      = "cube"
+test_case     = "jw_baroclinic"
+u_perturb = 1
+rotate_grid = 0
+restartfreq   = 999999999
+restartfile   = "./R0001"
+runtype       = 0
+mesh_file='/dev/null'
+integration   = "explicit"
+limiter_option = 9 ! this is diff from what's for preqx
+vert_remap_q_alg = 1
+/
+&vert_nl
+vform         = "ccm"
+vfile_mid = './acme-72m.ascii'
+vfile_int = './acme-72i.ascii'
+/
+
+&prof_inparm
+profile_outpe_num = 100
+profile_single_file		= .true.
+/
+
+&analysis_nl
+! disabled
+ output_timeunits=1,1
+ output_frequency=0,0
+ output_start_time=0,0
+ output_end_time=30000,30000
+ output_varnames1='ps','zeta','T','geo'
+ output_varnames2='Q','Q2','Q3','Q4','Q5'
+ io_stride=8
+ output_type = 'netcdf' 
+/
+

components/homme/test/benchmarks/v1/v1-ne120.nl

@@ -19,15 +19,15 @@ rsplit=2       ! ne30: 3   ne120:  2
 qsplit = 1
 tstep_type = 5
 integration   = "explicit"
-theta_hydrostatic_mode=.false.
+theta_hydrostatic_mode=.true.
 nu=1e13
 nu_div=2.5e13
 nu_p=1e13
 nu_q=1e13
 nu_s=1e13
 nu_top = 2.5e5
 se_ftype     = 0
-limiter_option = 8
+limiter_option = 9
 vert_remap_q_alg = 1
 hypervis_scaling=0
 hypervis_order = 2