Add scavenging diagnostic

# Conflicts: # pkg/darwin/darwin_cons.F # Conflicts: # pkg/darwin/darwin_cons.F # Conflicts: # pkg/darwin/darwin_cons.F
darwinproject · Jan 4, 2023 · aac6786 · aac6786
1 parent 527f59c
commit aac6786
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 3 deletions.
diff --git a/pkg/darwin/darwin_diagnostics_init.F b/pkg/darwin/darwin_diagnostics_init.F
@@ -534,6 +534,13 @@ SUBROUTINE DARWIN_DIAGNOSTICS_INIT( myThid )
       CALL DIAGNOSTICS_ADDTOLIST( diagNum,
      I           diagName, diagCode, diagUnits, diagTitle, 0, myThid )
 
+      WRITE(diagName,'(A)')'scvLosFe'
+      WRITE(diagTitle,'(A)')'Iron loss from scavenging'
+      diagUnits = 'mmol Fe/m3/s    '
+      diagCode  = 'SMRP    MR      '
+      CALL DIAGNOSTICS_ADDTOLIST( diagNum,
+     I           diagName, diagCode, diagUnits, diagTitle, 0, myThid )
+
       WRITE(diagName,'(A)')'sedFe'
       WRITE(diagTitle,'(A)')'Iron input from sediment'
       diagUnits = 'mmol Fe/m3/s    '

diff --git a/pkg/darwin/darwin_forcing.F b/pkg/darwin/darwin_forcing.F
@@ -93,6 +93,7 @@ SUBROUTINE DARWIN_FORCING( Ptrdummy,
       _RL freeFe(1-OLx:sNx+OLx, 1-OLy:sNy+OLy, Nr)
       _RL sedFlxFe(1-OLx:sNx+OLx, 1-OLy:sNy+OLy)
       _RL tmp3d(1-OLx:sNx+OLx, 1-OLy:sNy+OLy, Nr)
+      _RL scavLoss(1-OLx:sNx+OLx, 1-OLy:sNy+OLy, Nr)
       _RL scv,scav_pom
       _RL flx, POCl
       _RL ptr(nDarwin), gtr(nDarwin), PARl(nlam)
@@ -390,11 +391,11 @@ SUBROUTINE DARWIN_FORCING( Ptrdummy,
 #else
         scv = scav
 #endif
-        gPtr(i,j,k,iFeT) = gPtr(i,j,k,iFeT) -
-     &                     scv*MAX(0 _d 0, freefe(i,j,k))
+        scavLoss(i,j,k) = scv*MAX(0 _d 0, freefe(i,j,k))
+        gPtr(i,j,k,iFeT) = gPtr(i,j,k,iFeT) - scavLoss(i,j,k)
 #ifdef DARWIN_ALLOW_CONS
         DARWIN_partScav(i,j,k,bi,bj) = DARWIN_partScav(i,j,k,bi,bj)
-     &                    + dTsub(k)*scv*MAX(0 _d 0, freefe(i,j,k))
+     &                               + dTsub(k)*scavLoss(i,j,k)
 #endif
       ENDDO
       ENDDO
@@ -894,6 +895,7 @@ SUBROUTINE DARWIN_FORCING( Ptrdummy,
        ENDDO
 #endif
 #endif
+       CALL DIAGNOSTICS_FILL(scavLoss,'scvLosFe',0,Nr,2,bi,bj,myThid)
        CALL DIAGNOSTICS_FILL(sedFe,   'sedFe   ',0,Nr,1,bi,bj,myThid)
        CALL DIAGNOSTICS_FILL(sedFlxFe,'sedFlxFe',0,1,2,bi,bj,myThid)
        IF (DIAGNOSTICS_IS_ON('sfcSolFe', myThid)) THEN