Commit 964f9e88 authored by Veit Lüschow's avatar Veit Lüschow

added changes to dwbc01

parent 6e2cc096
...@@ -72,7 +72,8 @@ def momentum(vs): ...@@ -72,7 +72,8 @@ def momentum(vs):
vs.dv[:, :, :, vs.tau] += vs.dv_adv vs.dv[:, :, :, vs.tau] += vs.dv_adv
if vs.dwbc2: if vs.dwbc2:
utilities.set_obc_momentum(vs) utilities.set_obc_momentum(vs)
""" """
add momentum restoring that is computed in set_forcing add momentum restoring that is computed in set_forcing
......
...@@ -55,14 +55,17 @@ def obc_boundaries(vs,arr): ...@@ -55,14 +55,17 @@ def obc_boundaries(vs,arr):
@veros_method @veros_method
def set_obc_temp_salt(vs): def set_obc_temp_salt(vs):
print('do phase speed stuff') print('do phase speed stuff')
# temp(:,j,:,taup1) = temp(:,j,:,taup1) + dt_tracer*maskT(:,j,:)*obc_tscl*(temp_wall_north - temp(:,j,:,tau) )
vs.temp[:,2,:,vs.taup1] = vs.temp[:,2,:,vs.taup1] + vs.dt_tracer \ vs.temp[:,2,:,vs.taup1] = vs.temp[:,2,:,vs.taup1] + vs.dt_tracer \
* vs.tscl_tr * ( vs.temp_ini[:,5,:] - vs.temp[:,2,:,vs.tau] ) * vs.tscl_tr * ( vs.temp_ini[:,5,:] - vs.temp[:,2,:,vs.tau] )
vs.temp[:,-4,:,vs.taup1] = vs.temp[:,-4,:,vs.taup1] + vs.dt_tracer \ vs.temp[:,-4,:,vs.taup1] = vs.temp[:,-4,:,vs.taup1] + vs.dt_tracer \
* vs.tscl_tr * ( vs.temp_ini[:,-5,:] - vs.temp[:,-4,:,vs.tau] ) * vs.tscl_tr * ( vs.temp_ini[:,-5,:] - vs.temp[:,-4,:,vs.tau] )
# vs.temp[:,2,:,vs.taup1] = vs.temp_ini[:,5,:].copy()
# vs.temp[:,-4,:,vs.taup1] = vs.temp_ini[:,-5,:].copy() # vs.temp[:,2,:,vs.taup1] = vs.temp_ini[:,5,:].copy() # WORKS!
# vs.temp[:,-4,:,vs.taup1] = vs.temp_ini[:,-5,:].copy() # WORKS!
print('restore temp and salt') print('restore temp and salt')
@veros_method @veros_method
......
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