From 926a5fea6af55c0be9dc95c6bafd85cac44ad519 Mon Sep 17 00:00:00 2001 From: David Sagan Date: Mon, 15 Jul 2024 21:04:15 -0400 Subject: [PATCH] Better bookkeeping of Tao parameter s%global%derivative_recalc. (#1065) --- tao/code/tao_dmerit_mod.f90 | 2 +- tao/version/tao_version_mod.f90 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tao/code/tao_dmerit_mod.f90 b/tao/code/tao_dmerit_mod.f90 index 5d29808a02..464bd78c48 100644 --- a/tao/code/tao_dmerit_mod.f90 +++ b/tao/code/tao_dmerit_mod.f90 @@ -100,7 +100,7 @@ subroutine tao_dmodel_dvar_calc (force_calc, err_flag) s%var(j)%ix_dVar = nv enddo -if (.not. reinit) then +if (.not. reinit .or. .not. s%global%derivative_recalc) then return endif diff --git a/tao/version/tao_version_mod.f90 b/tao/version/tao_version_mod.f90 index ee545a8639..a4b329ee34 100644 --- a/tao/version/tao_version_mod.f90 +++ b/tao/version/tao_version_mod.f90 @@ -6,5 +6,5 @@ !- module tao_version_mod -character(*), parameter :: tao_version_date = "2024/07/12 01:07:22" +character(*), parameter :: tao_version_date = "2024/07/15 13:46:54" end module