Commit 7bea26b6 authored by Hans Burchard's avatar Hans Burchard

changed *_mix_analysis to *_numerical_analyses

parent a152cee0
......@@ -2,3 +2,9 @@
<!-- this converter is currently an empty placeholder, but it is needed to tell xmlstore that direct conversion between 2.0 and 2.1 is permitted. -->
<converter source="getm-2.0" target="getm-2.1"/>
<links>
<link source="/getm/io_spec/save_mix_analysis"
target="/getm/io_spec/save_numerical_analyses"/>
</links>
......@@ -493,9 +493,9 @@
<save_taub>
False
</save_taub>
<save_mix_analysis>
<save_numerical_analyses>
False
</save_mix_analysis>
</save_numerical_analyses>
<first_2d>
0
</first_2d>
......
......@@ -610,7 +610,7 @@
<element name="save_nuh" type="bool" label="save turbulent diffusivity of heat"/>
<element name="save_ss_nn" type="bool" label="save shear stress and Brunt-Vaisala frequency"/>
<element name="save_taub" type="bool" label="save bottom friction velocity"/>
<element name="save_mix_analysis" type="bool" label="calculate/save mixing analysis"/>
<element name="save_numerical_analyses" type="bool" label="calculate/save numerical analyses" description="presently numerical mixing and dissipation analyses"/>
<element name="first_2d" type="int" label="first time step to save 2D fields" unit="micro time steps" minInclusive="0"/>
<element name="step_2d" type="int" label="interval between saves of 2D fields" unit="micro time steps" minInclusive="1"/>
<element name="first_3d" type="int" label="first time step to save 3D fields" unit="micro time steps" minInclusive="0"/>
......
......@@ -377,7 +377,7 @@ salt_field_no=1
#endif
use parameters, only: avmols
use getm_timers, only: tic, toc, TIM_SALT, TIM_MIXANALYSIS
use variables_3d, only: do_mixing_analysis
use variables_3d, only: do_numerical_analyses
use variables_3d, only: nummix3d_S,nummix2d_S
use variables_3d, only: phymix3d_S,phymix2d_S
!$ use omp_lib
......@@ -434,7 +434,7 @@ salt_field_no=1
area_inv=ard1
#endif
if (do_mixing_analysis) then
if (do_numerical_analyses) then
call toc(TIM_SALT)
call tic(TIM_MIXANALYSIS)
! OMP-note: The following array-based line could be implemented
......@@ -453,7 +453,7 @@ salt_field_no=1
delxu,delxv,delyu,delyv,area_inv,az,au,av, &
salt_hor_adv,salt_ver_adv,salt_adv_split,salt_AH)
if (do_mixing_analysis) then
if (do_numerical_analyses) then
call toc(TIM_SALT)
call tic(TIM_MIXANALYSIS)
call numerical_mixing(S2,S,nummix3d_S,nummix2d_S)
......
......@@ -372,7 +372,7 @@ temp_field_no=1
#endif
use parameters, only: avmolt
use getm_timers, only: tic, toc, TIM_TEMP, TIM_MIXANALYSIS
use variables_3d, only: do_mixing_analysis
use variables_3d, only: do_numerical_analyses
use variables_3d, only: nummix3d_T,nummix2d_T
use variables_3d, only: phymix3d_T,phymix2d_T
!$ use omp_lib
......@@ -424,7 +424,7 @@ temp_field_no=1
area_inv=ard1
#endif
if (do_mixing_analysis) then
if (do_numerical_analyses) then
call toc(TIM_TEMP)
call tic(TIM_MIXANALYSIS)
! OMP-note: The following array-based line could be implemented
......@@ -443,7 +443,7 @@ temp_field_no=1
delxu,delxv,delyu,delyv,area_inv,az,au,av, &
temp_hor_adv,temp_ver_adv,temp_adv_split,temp_AH)
if (do_mixing_analysis) then
if (do_numerical_analyses) then
call toc(TIM_TEMP)
call tic(TIM_MIXANALYSIS)
call numerical_mixing(T2,T,nummix3d_T,nummix2d_T)
......
......@@ -271,7 +271,7 @@
use advection_3d, only: do_advection_3d
use halo_zones, only: update_3d_halo,wait_halo,U_TAG,V_TAG
use getm_timers, only: tic, toc, TIM_UVADV3D, TIM_UVADV3DH
use variables_3d, only: do_mixing_analysis
use variables_3d, only: do_numerical_analyses
use variables_3d, only: numdis3d,numdis2d
!$ use omp_lib
......@@ -382,7 +382,7 @@
call wait_halo(U_TAG)
call toc(TIM_UVADV3DH)
if (do_mixing_analysis) then
if (do_numerical_analyses) then
do k=1,kmax ! calculate square of u-velocity before advection step
do j=jmin,jmax
do i=imin,imax
......@@ -397,7 +397,7 @@
dxuadv,dxvadv,dyuadv,dyvadv,area_inv, &
azadv,auadv,avadv,hor_adv,ver_adv,adv_split,AH)
if (do_mixing_analysis) then
if (do_numerical_analyses) then
call do_advection_3d(dt,vel2,uadv,vadv,wadv,huadv,hvadv,hoadv,hnadv,&
dxuadv,dxvadv,dyuadv,dyvadv,area_inv, &
azadv,auadv,avadv,hor_adv,ver_adv,adv_split,AH)
......@@ -493,7 +493,7 @@
call wait_halo(V_TAG)
call toc(TIM_UVADV3DH)
if (do_mixing_analysis) then
if (do_numerical_analyses) then
do k=1,kmax ! calculate square of v-velocity before advection step
do j=jmin,jmax
do i=imin,imax
......@@ -508,7 +508,7 @@
dxuadv,dxvadv,dyuadv,dyvadv,area_inv, &
azadv,auadv,avadv,hor_adv,ver_adv,adv_split,AH)
if (do_mixing_analysis) then
if (do_numerical_analyses) then
call do_advection_3d(dt,vel2,uadv,vadv,wadv,huadv,hvadv,hoadv,hnadv,&
dxuadv,dxvadv,dyuadv,dyvadv,area_inv, &
azadv,auadv,avadv,hor_adv,ver_adv,adv_split,AH)
......
......@@ -118,7 +118,7 @@
REALTYPE :: dt,cnpar=0.9
REALTYPE :: avmback=_ZERO_,avhback=_ZERO_
character(len=64) :: adv_schemes(7)
logical :: do_mixing_analysis=.false.
logical :: do_numerical_analyses=.false.
!
#ifdef STATIC
#include "static_3d.h"
......
......@@ -329,7 +329,7 @@
end if
#ifndef NO_BAROCLINIC
if (save_mix_analysis) then
if (save_numerical_analyses) then
fv = nummix_missing
mv = nummix_missing
vr(1) = -100.0
......
......@@ -165,7 +165,7 @@
FillValue=fv,missing_value=mv,valid_range=vr)
end if
if (save_mix_analysis) then
if (save_numerical_analyses) then
fv = nummix_missing
mv = nummix_missing
vr(1) = -100.0
......
......@@ -314,7 +314,7 @@
end if ! save_ss_nn
#ifndef NO_BAROCLINIC
if (save_mix_analysis) then
if (save_numerical_analyses) then
call cnv_3d(imin,jmin,imax,jmax,kmin,kmax,az,numdis3d,nummix_missing, &
imin,imax,jmin,jmax,0,kmax,ws)
err = nf90_put_var(ncid,nm3d_id,ws(_3D_W_),start,edges)
......@@ -343,7 +343,7 @@
err = nf90_put_var(ncid,pm3dT_id,ws(_3D_W_),start,edges)
if (err .NE. NF90_NOERR) go to 10
end if
end if ! save_mix_analysis
end if ! save_numerical_analyses
#endif
#ifdef SPM
......
......@@ -132,7 +132,7 @@
if (err .NE. NF90_NOERR) go to 10
end if
if (save_mix_analysis) then
if (save_numerical_analyses) then
call cnv_3d(imin,jmin,imax,jmax,kmin,kmax,az, &
numdis3d_mean,nummix_missing, &
imin,imax,jmin,jmax,0,kmax,ws3d)
......
......@@ -14,7 +14,7 @@
use domain, only: az,au,av
use meteo, only: swr
use m3d, only: M,calc_temp,calc_salt
use variables_3d, only: do_mixing_analysis
use variables_3d, only: do_numerical_analyses
use variables_3d, only: hn,uu,hun,vv,hvn,ww,taub
#ifndef NO_BAROCLINIC
use variables_3d, only: S,T
......@@ -89,7 +89,7 @@
if (rc /= 0) &
stop 'calc_mean_fields.F90: Error allocating memory (Smean)'
if (do_mixing_analysis) then
if (do_numerical_analyses) then
allocate(numdis3d_mean(I3DFIELD),stat=rc)
if (rc /= 0) &
stop 'calc_mean_fields.F90: Error allocating memory (numdis3d_mean)'
......@@ -139,7 +139,7 @@
humean=_ZERO_; hvmean=_ZERO_; hmean=_ZERO_
#ifndef NO_BAROCLINIC
Tmean=_ZERO_; Smean=_ZERO_
if (do_mixing_analysis) then
if (do_numerical_analyses) then
numdis3d_mean=_ZERO_; numdis2d_mean=_ZERO_
if (calc_temp) then
nummix3d_T_mean=_ZERO_; nummix2d_T_mean=_ZERO_
......@@ -187,7 +187,7 @@
#ifndef NO_BAROCLINIC
Tmean = Tmean + T
Smean = Smean + S
if (do_mixing_analysis) then
if (do_numerical_analyses) then
numdis3d_mean = numdis3d_mean + numdis3d
numdis2d_mean = numdis2d_mean + numdis2d
if (calc_temp) then
......@@ -225,7 +225,7 @@
#ifndef NO_BAROCLINIC
Tmean = Tmean / step
Smean = Smean / step
if (do_mixing_analysis) then
if (do_numerical_analyses) then
numdis3d_mean = numdis3d_mean / step
numdis2d_mean = numdis2d_mean / step
if (calc_temp) then
......
......@@ -13,7 +13,7 @@
use time, only: write_time_string,timestep,timestr
use ascii_out
#ifndef NO_3D
use variables_3d, only: do_mixing_analysis
use variables_3d, only: do_numerical_analyses
#endif
#ifdef TEST_NESTING
use nesting
......@@ -57,7 +57,7 @@
integer :: step_3d=1
integer :: hotout(3)=-1
integer :: meanout=-1
logical :: save_mix_analysis=.false.
logical :: save_numerical_analyses=.false.
!
! !REVISION HISTORY:
......@@ -97,7 +97,7 @@
save_turb,save_tke,save_eps,save_num,save_nuh, &
save_ss_nn,save_taub, &
first_2d,step_2d,first_3d,step_3d,hotout,meanout, &
save_meteo, save_mix_analysis
save_meteo, save_numerical_analyses
! logical :: nesting=.true.
!EOP
!-------------------------------------------------------------------------
......@@ -201,9 +201,9 @@
#endif
#ifndef NO_3D
if (save_mix_analysis) then
if (save_numerical_analyses) then
LEVEL2 "calculate and save mixing analysis"
do_mixing_analysis=.true.
do_numerical_analyses=.true.
end if
#endif
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment