Merge pull request #68 from sintefmath/dev

Fixes to parameter optimization

Project.toml

@@ -1,7 +1,7 @@
 name = "Jutul"
 uuid = "2b460a1a-8a2b-45b2-b125-b5c536396eb9"
 authors = ["Olav Møyner <[email protected]>"]
-version = "0.2.30"
+version = "0.2.31"
 
 [deps]
 AlgebraicMultigrid = "2169fc97-5a83-5252-b627-83903c6c433c"

src/ad/gradients.jl

@@ -424,7 +424,7 @@ function next_lagrange_multiplier!(adjoint_storage, i, G, state, state0, state_n
         dt = dt,
         extra_out = true
     )
-    if !converged && il >= 0
+    if !converged && il > 0
         jutul_message("Warning", "Simulation was not converged to default tolerances for step $i in adjoint solve", color = :yellow)
         if il > 1.5
             get_convergence_table(errors, il, 1, config)

src/conservation/conservation.jl

@@ -303,29 +303,31 @@ function fill_conservation_eq!(nz, r, cell, acc, cell_flux, conn_pos, ::Val{Np},
     # Fluxes
     start = @inbounds conn_pos[cell]
     stop = @inbounds conn_pos[cell + 1] - 1
-    for i = start:stop
-        for e in 1:Ne
-            v = acc_r[e] + get_entry_val(cell_flux, i, e)
-            acc_r = setindex(acc_r, v, e)
-        end
-        fpos_outer = get_jacobian_pos(cell_flux, i, 1, 1)
-        is_inner = fpos_outer > 0
-        if is_inner
-            @simd for p in 1:Np
-                @inbounds for e in 1:Ne
-                    ∂ = get_entry(cell_flux, i, e, p)
-                    f_v = acc_partials[e, p] + ∂
-                    acc_partials = setindex(acc_partials, f_v, e, p)
-                    fpos = get_jacobian_pos(cell_flux, i, e, p)
-                    update_jacobian_inner!(nz, fpos, -∂)
-                end
+    if Np > 0
+        for i = start:stop
+            for e in 1:Ne
+                v = acc_r[e] + get_entry_val(cell_flux, i, e)
+                acc_r = setindex(acc_r, v, e)
             end
-        else
-            @simd for p in 1:Np
-                @inbounds for e in 1:Ne
-                    ∂ = get_entry(cell_flux, i, e, p)
-                    f_v = acc_partials[e, p] + ∂
-                    acc_partials = setindex(acc_partials, f_v, e, p)
+            fpos_outer = get_jacobian_pos(cell_flux, i, 1, 1)
+            is_inner = fpos_outer > 0
+            if is_inner
+                @simd for p in 1:Np
+                    @inbounds for e in 1:Ne
+                        ∂ = get_entry(cell_flux, i, e, p)
+                        f_v = acc_partials[e, p] + ∂
+                        acc_partials = setindex(acc_partials, f_v, e, p)
+                        fpos = get_jacobian_pos(cell_flux, i, e, p)
+                        update_jacobian_inner!(nz, fpos, -∂)
+                    end
+                end
+            else
+                @simd for p in 1:Np
+                    @inbounds for e in 1:Ne
+                        ∂ = get_entry(cell_flux, i, e, p)
+                        f_v = acc_partials[e, p] + ∂
+                        acc_partials = setindex(acc_partials, f_v, e, p)
+                    end
                 end
             end
         end

src/simulator/optimization.jl

@@ -65,6 +65,7 @@ function setup_parameter_optimization(case::JutulCase, G, opt_cfg = optimization
     else
         @assert grad_type == :adjoint
     end
+    sort_variables!(model, :parameters)
     mapper, = variable_mapper(model, :parameters, targets = targets, config = opt_cfg)
     lims = optimization_limits(opt_cfg, mapper, parameters, model)
     if verbose