overload the set! function

Author: simone-silvestri

experiments/veros_forced_simulation.jl

@@ -23,8 +23,8 @@ VerosModule.remove_outputs(:global_4deg)
 
 ocean = VerosModule.VerosOceanSimulation("global_4deg", :GlobalFourDegreeSetup)
 
-VerosModule.veros_settings_set!(ocean, "dt_tracer", 1800.0)
-VerosModule.veros_settings_set!(ocean, "dt_mom",    1800.0)
+set!(ocean.setup.settings, "dt_tracer", 1800.0)
+set!(ocean.setup.settings, "dt_mom",    1800.0)
 
 ##### 
 ##### A Prescribed Atmosphere (JRA55)

ext/ClimaOceanPythonCallExt/clima_ocean_copernicus.jl renamed to ext/ClimaOceanPythonCallExt/copernicus.jl

@@ -133,30 +133,15 @@ function surface_grid(ocean::VerosOceanSimulation)
 end
 
 """
-    veros_set!(ocean, v, x)
+    set!(class::Py, v, x)
 
-Set the `v` variable in the `ocean` model to the value of `x`.
+Set the `s` property of a Python `class` to the value of `x`.
 """
-function veros_set!(ocean::VerosOceanSimulation, v, x)
-    setup = ocean.setup
+function set!(class::Py, s, x)
     pyexec("""
-       with setup.state.variables.unlock():
-           setup.state.variables.__setattr__(y, t)
-       """, Main, (y=v, t=x, setup=setup))
-end
-
-
-"""
-    veros_settings_set!(ocean, v, x)
-
-Set the `s` setting in the `ocean` model to the value of `x`.
-"""
-function veros_settings_set!(ocean::VerosOceanSimulation, s, x)
-    setup = ocean.setup
-    pyexec("""
-       with setup.state.settings.unlock():
-           setup.state.settings.__setattr__(y, t)
-       """, Main, (y=s, t=x, setup=setup))
+       with class.unlock():
+           class.__setattr__(y, t)
+       """, Main, (y=s, t=x, class=class))
 end
 
 function OceanSeaIceModel(ocean::VerosOceanSimulation, sea_ice=nothing;

ext/ClimaOceanPythonCallExt/veros_ocean_simulation.jl

@@ -13,7 +13,7 @@ import ClimaOcean.OceanSeaIceModels.InterfaceComputations:
     get_ocean_state,
     ocean_surface_fluxes,
     get_radiative_forcing,
-    fill_up_net_fluxes!
+    fill_net_fluxes!
 
 mutable struct VerosStateExchanger{G, OST, AST, AEX}
     exchange_grid :: G
@@ -97,8 +97,8 @@ function fill_net_fluxes!(ocean::VerosOceanSimulation, net_ocean_fluxes)
         tb[:, :, t] .= t2
     end
 
-    veros_set!(ocean, "taux", ta)
-    veros_set!(ocean, "tauy", tb)
+    set!(ocean.state.variables, "taux", ta)
+    set!(ocean.state.variables, "tauy", tb)
 
     # TODO: Add heat flux and salinity flux when they
     # fix veros to be able to force with prescribed boundary
@@ -107,8 +107,8 @@ function fill_net_fluxes!(ocean::VerosOceanSimulation, net_ocean_fluxes)
     # t1 = view(parent(net_ocean_fluxes.T), 1:nx, 2:ny+1, 1)
     # t2 = view(parent(net_ocean_fluxes.S), 1:nx, 2:ny+1, 1)
 
-    # veros_set!(ocean, "temp_flux", t1)
-    # veros_set!(ocean, "salt_flux", t2)
+    # set!(ocean, "temp_flux", t1)
+    # set!(ocean, "salt_flux", t2)
 
     return nothing
 end