From f4dff397fde3881f3e88d84fccd00ca45ac474fa Mon Sep 17 00:00:00 2001 From: "Anthony M. Sciola" Date: Tue, 18 Nov 2025 11:36:21 -0800 Subject: [PATCH] Changing potential gradients to always be output --- src/base/types/raijuTypes.F90 | 2 -- src/raiju/raijuIO.F90 | 22 +++++----------------- src/raiju/raijuStarter.F90 | 1 - 3 files changed, 5 insertions(+), 20 deletions(-) diff --git a/src/base/types/raijuTypes.F90 b/src/base/types/raijuTypes.F90 index 1f576138..358c0cc9 100644 --- a/src/base/types/raijuTypes.F90 +++ b/src/base/types/raijuTypes.F90 @@ -230,8 +230,6 @@ module raijutypes !! Whether or not we smooth variables (bvol and electric potential) before taking gradients logical :: doClockConsoleOut !! If we are driving, output clock info - logical :: doOutput_potGrads - !! Output extra 3D arrays logical :: doOutput_debug !! Dump lots of otherwise unnecessary stuff logical :: doOutput_3DLoss diff --git a/src/raiju/raijuIO.F90 b/src/raiju/raijuIO.F90 index c954e02e..6bdb7177 100644 --- a/src/raiju/raijuIO.F90 +++ b/src/raiju/raijuIO.F90 @@ -89,7 +89,6 @@ module raijuIO ! Ready for output ! Some model setting info call ClearIO(IOVars) - call AddOutVar(IOVars,"doFatOutput" ,Model%doOutput_potGrads) ! Attr call AddOutVar(IOVars,"doDebugOutput" ,Model%doOutput_debug ) ! Attr call AddOutVar(IOVars,"doWriteGhosts" ,Model%writeGhosts ) ! Attr call AddOutVar(IOVars,"doGeoCorot" ,Model%doGeoCorot ) ! Attr @@ -343,22 +342,11 @@ module raijuIO endif endif - if (Model%doOutput_potGrads) then - ! (Ni, Nj, 2) - call AddOutVar(IOVars, "gradPotE" , State%gradPotE (is:ie+1,js:je+1,:), uStr="V/m") - call AddOutVar(IOVars, "gradPotCorot" , State%gradPotCorot(is:ie+1,js:je+1,:), uStr="V/m") - call AddOutVar(IOVars, "gradVM" , State%gradVM (is:ie+1,js:je+1,:), uStr="V/m/lambda") - call AddOutVar(IOVars, "gradPotE_cc" , State%gradPotE_cc (is:ie,js:je,:) , uStr="V/m") - call AddOutVar(IOVars, "gradPotCorot_cc", State%gradPotCorot_cc(is:ie,js:je,:) , uStr="V/m") - call AddOutVar(IOVars, "gradVM_cc" , State%gradVM_cc (is:ie,js:je,:) , uStr="V/m/lambda") - - ! Calc pEffective based on current state - ! Make full ghost size since that's what the subroutine expects - allocate(outTmp3D(Grid%shGrid%isg:Grid%shGrid%ieg+1,Grid%shGrid%jsg:Grid%shGrid%jeg+1,Grid%Nk)) - call calcEffectivePotential(Model, Grid, State, outTmp3D) - call AddOutVar(IOVars, "pEffective", outTmp3D(is:ie+1,js:je+1,:)*1e-3, uStr="kV") - deallocate(outTmp3D) - endif + + ! (Ni, Nj, 2) + call AddOutVar(IOVars, "gradPotE_cc" , State%gradPotE_cc (is:ie,js:je,:) , uStr="V/m") + call AddOutVar(IOVars, "gradPotCorot_cc", State%gradPotCorot_cc(is:ie,js:je,:) , uStr="V/m") + call AddOutVar(IOVars, "gradVM_cc" , State%gradVM_cc (is:ie,js:je,:) , uStr="V/m/lambda") if (Model%doOutput_debug) then ! New members, being tucked away into debug only diff --git a/src/raiju/raijuStarter.F90 b/src/raiju/raijuStarter.F90 index 54f9d5fe..5cdfe30c 100644 --- a/src/raiju/raijuStarter.F90 +++ b/src/raiju/raijuStarter.F90 @@ -245,7 +245,6 @@ module raijustarter !--- Output ---! call iXML%Set_Val(Model%isLoud , "output/loudConsole",.false.) call iXML%Set_Val(Model%writeGhosts , "output/writeGhosts",.false.) - call iXML%Set_Val(Model%doOutput_potGrads, "output/doFat" ,.false.) call iXML%Set_Val(Model%doOutput_3DLoss , "output/doLossExtras" ,.false.) ! Several (Ni,Nj,Nk) arrays call iXML%Set_Val(Model%doOutput_debug , "output/doDebug" ,.false.)