Commit fbc1ae0a authored by Knut's avatar Knut
Browse files

renaming of nml parameter: bdyramp_2d => bdy2d_ramp

parent ec583e41
...@@ -2,6 +2,7 @@ ...@@ -2,6 +2,7 @@
<converter source="getm-2.2" target="getm-2.3"> <converter source="getm-2.2" target="getm-2.3">
<links> <links>
<link source="/getm/meteo/spinup" target="/getm/meteo/meteo_ramp"/> <link source="/getm/meteo/spinup" target="/getm/meteo/meteo_ramp"/>
<link source="/getm/m2d/bdyramp_2d" target="/getm/m2d/bdy2d_ramp"/>
<link source="/getm/m2d/vel_depth_method" target="/getm/domain/vel_depth_method"/> <link source="/getm/m2d/vel_depth_method" target="/getm/domain/vel_depth_method"/>
</links> </links>
<custom> <custom>
......
...@@ -231,9 +231,9 @@ ...@@ -231,9 +231,9 @@
<bdyfmt_2d> <bdyfmt_2d>
2 2
</bdyfmt_2d> </bdyfmt_2d>
<bdyramp_2d> <bdy2d_ramp>
-1 -1
</bdyramp_2d> </bdy2d_ramp>
<bdyfile_2d> <bdyfile_2d>
bdy_2d.nc bdy_2d.nc
</bdyfile_2d> </bdyfile_2d>
......
...@@ -295,7 +295,7 @@ ...@@ -295,7 +295,7 @@
<option value="2" label="NetCDF"/> <option value="2" label="NetCDF"/>
</options> </options>
</element> </element>
<element name="bdyramp_2d" type="int" label="number of time steps for elevation boundary spin-up"> <element name="bdy2d_ramp" type="int" label="number of time steps for elevation boundary spin-up">
<condition type="eq" variable="./bdy2d" value="True"/> <condition type="eq" variable="./bdy2d" value="True"/>
</element> </element>
<element name="bdyfile_2d" type="string" label="name of file with boundary data"> <element name="bdyfile_2d" type="string" label="name of file with boundary data">
......
...@@ -79,7 +79,7 @@ ...@@ -79,7 +79,7 @@
integer :: MM=1,residual=-1 integer :: MM=1,residual=-1
integer :: sealevel_check=0 integer :: sealevel_check=0
logical :: bdy2d=.false. logical :: bdy2d=.false.
integer :: bdyfmt_2d,bdytype,bdyramp_2d=-1 integer :: bdyfmt_2d,bdytype,bdy2d_ramp=-1
character(len=PATH_MAX) :: bdyfile_2d character(len=PATH_MAX) :: bdyfile_2d
REAL_4B :: bdy_data(1500) REAL_4B :: bdy_data(1500)
REAL_4B :: bdy_data_u(1500) REAL_4B :: bdy_data_u(1500)
...@@ -135,7 +135,7 @@ ...@@ -135,7 +135,7 @@
elev_method,elev_const,elev_file, & elev_method,elev_const,elev_file, &
MM,vel2d_adv_split,vel2d_adv_hor, & MM,vel2d_adv_split,vel2d_adv_hor, &
Am,An_method,An_const,An_file,residual, & Am,An_method,An_const,An_file,residual, &
sealevel_check,bdy2d,bdyfmt_2d,bdyramp_2d,bdyfile_2d sealevel_check,bdy2d,bdyfmt_2d,bdy2d_ramp,bdyfile_2d
!EOP !EOP
!------------------------------------------------------------------------- !-------------------------------------------------------------------------
!BOC !BOC
...@@ -279,8 +279,8 @@ ...@@ -279,8 +279,8 @@
if (.not. openbdy) bdy2d=.false. if (.not. openbdy) bdy2d=.false.
LEVEL2 'Open boundary=',bdy2d LEVEL2 'Open boundary=',bdy2d
if (bdy2d) then if (bdy2d) then
if (hotstart .and. bdyramp_2d .gt. 0) then if (hotstart .and. bdy2d_ramp .gt. 0) then
LEVEL2 'WARNING: hotstart is .true. AND bdyramp_2d .gt. 0' LEVEL2 'WARNING: hotstart is .true. AND bdy2d_ramp .gt. 0'
LEVEL2 'WARNING: .. be sure you know what you are doing ..' LEVEL2 'WARNING: .. be sure you know what you are doing ..'
end if end if
LEVEL2 TRIM(bdyfile_2d) LEVEL2 TRIM(bdyfile_2d)
...@@ -470,7 +470,7 @@ ...@@ -470,7 +470,7 @@
Vint=Vint+V Vint=Vint+V
call toc(TIM_INTEGR2D) call toc(TIM_INTEGR2D)
end if end if
if (have_boundaries) call update_2d_bdy(loop,bdyramp_2d) if (have_boundaries) call update_2d_bdy(loop,bdy2d_ramp)
call sealevel() call sealevel()
call depth_update() call depth_update()
......
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