Merge remote-tracking branch 'upstream/master' into nc-grdchk+prof

IvanaEscobar · Nov 19, 2024 · 63b9663 · 63b9663
2 parents b537cbe + 0e6a446
commit 63b9663
Show file tree

Hide file tree

Showing 10 changed files with 19 additions and 18 deletions.
diff --git a/doc/tag-index b/doc/tag-index
@@ -1,6 +1,8 @@
     Notes on tags used in MITgcmUV
     ==============================
 
+o model,pkg:
+  - minor spell checking and formatting updates.
 o pkg/bling:
   - size-dependent phytoplankton growth code cleaned up and related parameters
     can now be specified in data.bling;

diff --git a/model/src/seawater.F b/model/src/seawater.F
@@ -29,8 +29,8 @@ _RL FUNCTION SW_PTMP  (S,T,P,PR)
 C     ==================================================================
 C     S  :: salinity    [         (PSS-78) ]
 C     T  :: temperature [degree C (IPTS-68)]
-C     P  :: pressure    [db]
-C     PR :: Reference pressure  [db]
+C     P  :: pressure    [dbar]
+C     PR :: Reference pressure  [dbar]
 C     \ev
 
 C     !USES:

diff --git a/pkg/cost/g_cost.h b/pkg/cost/g_cost.h
@@ -2,7 +2,7 @@ c     ==================================================================
 c     HEADER G_COST
 c     ==================================================================
 c
-c     o Header for model-data comparison; adjoint part.
+c     o Header for model-data comparison; tangent linear part.
 c
 c     started: Christian Eckert eckert@mit.edu  06-Apr-2000
 c     changed: Christian Eckert eckert@mit.edu
@@ -19,17 +19,15 @@ c     ==================================================================
 #ifdef ALLOW_COST_STATE_FINAL
       common /g_cost_state_final_r/
      &                g_objf_state_final
-cph      _RL  g_objf_state_final (snx,sny,nsx,nsy)
-      _RL  g_objf_state_final (snx,sny,nsx,nsy,4*Nr+1)
+      _RL  g_objf_state_final (sNx,sNy,nSx,nSy,4*Nr+1)
 #endif
 
 #ifdef ALLOW_COST_VECTOR
       common /g_cost_vector_r/
      &                  g_objf_vector
-      _RL  g_objf_vector(snx,nsx,nsy)
+      _RL  g_objf_vector(sNx,nSx,nSy)
 #endif
 
 c     ==================================================================
 c     END OF HEADER G_COST
 c     ==================================================================
-
diff --git a/pkg/ctrl/ctrl_summary.F b/pkg/ctrl/ctrl_summary.F
@@ -53,7 +53,7 @@ subroutine ctrl_Summary( myThid )
       integer nwetsouth
       integer nwetwest
 
-      character*(max_len_mbuf) msgbuf
+      character*(MAX_LEN_MBUF) msgbuf
 
 #if (defined (ALLOW_GENARR2D_CONTROL) \
       || defined (ALLOW_GENARR3D_CONTROL) \
@@ -128,7 +128,7 @@ subroutine ctrl_Summary( myThid )
       enddo
 
       do ivar = 1, maxcvars
-C     only print active variables for which ncvarindex has be set
+C     only print active variables for which ncvarindex has been set
 C     (default = -1)
        if ( ncvarindex(ivar) .GE. 0 ) then
 

diff --git a/pkg/mdsio/mdsio_pass_r4torl.F b/pkg/mdsio/mdsio_pass_r4torl.F
@@ -15,8 +15,8 @@ SUBROUTINE MDS_PASS_R4toRL(
      I                            biArg, bjArg, copyTo, myThid )
 
 C !DESCRIPTION:
-C     Transfert 3-D real*4 buffer to 3-D RL model array, or the reverse,
-C      depending on "copyTo" value. Apply transfert to tile biArg,bjArg
+C     Transfer 3-D real*4 buffer to 3-D RL model array, or the reverse,
+C      depending on "copyTo" value. Apply transfer to tile biArg,bjArg
 C      only or to all myThid tiles if called with biArg=bjArg=0.
 
 C     !USES:

diff --git a/pkg/mdsio/mdsio_pass_r4tors.F b/pkg/mdsio/mdsio_pass_r4tors.F
@@ -15,8 +15,8 @@ SUBROUTINE MDS_PASS_R4toRS(
      I                            biArg, bjArg, copyTo, myThid )
 
 C !DESCRIPTION:
-C     Transfert 3-D real*4 buffer to 3-D RS model array, or the reverse,
-C      depending on "copyTo" value. Apply transfert to tile biArg,bjArg
+C     Transfer 3-D real*4 buffer to 3-D RS model array, or the reverse,
+C      depending on "copyTo" value. Apply transfer to tile biArg,bjArg
 C      only or to all myThid tiles if called with biArg=bjArg=0.
 
 C     !USES:

diff --git a/pkg/mdsio/mdsio_pass_r8torl.F b/pkg/mdsio/mdsio_pass_r8torl.F
@@ -15,8 +15,8 @@ SUBROUTINE MDS_PASS_R8toRL(
      I                            biArg, bjArg, copyTo, myThid )
 
 C !DESCRIPTION:
-C     Transfert 3-D real*8 buffer to 3-D RL model array, or the reverse,
-C      depending on "copyTo" value. Apply transfert to tile biArg,bjArg
+C     Transfer 3-D real*8 buffer to 3-D RL model array, or the reverse,
+C      depending on "copyTo" value. Apply transfer to tile biArg,bjArg
 C      only or to all myThid tiles if called with biArg=bjArg=0.
 
 C     !USES:

diff --git a/pkg/mdsio/mdsio_pass_r8tors.F b/pkg/mdsio/mdsio_pass_r8tors.F
@@ -15,8 +15,8 @@ SUBROUTINE MDS_PASS_R8toRS(
      I                            biArg, bjArg, copyTo, myThid )
 
 C !DESCRIPTION:
-C     Transfert 3-D real*8 buffer to 3-D RS model array, or the reverse,
-C      depending on "copyTo" value. Apply transfert to tile biArg,bjArg
+C     Transfer 3-D real*8 buffer to 3-D RS model array, or the reverse,
+C      depending on "copyTo" value. Apply transfer to tile biArg,bjArg
 C      only or to all myThid tiles if called with biArg=bjArg=0.
 
 C     !USES:

diff --git a/pkg/profiles/cost_profiles.F b/pkg/profiles/cost_profiles.F
@@ -343,9 +343,9 @@ SUBROUTINE COST_PROFILES( myIter, myTime, myThid )
       ENDDO !DO iavgbin
 
       IF (myProcId.EQ.0) THEN
-
         DO num_var = 1, NVARMAX
           iL = ILNBLNK( prof_names(1,num_var) )
+
           WRITE(cfile,'(2A)') prof_names(1,num_var)(1:iL),
      &     '_data_mean.data'
           CALL MDSFINDUNIT( cunit, myThid )

diff --git a/pkg/profiles/profiles_init_fixed.F b/pkg/profiles/profiles_init_fixed.F
@@ -127,6 +127,7 @@ SUBROUTINE PROFILES_INIT_FIXED( myThid )
       ELSE
         WRITE(msgBuf,'(2A)') '  profilesDir ','./'
       ENDIF
+
       CALL PRINT_MESSAGE( msgBuf,
      &     standardMessageUnit, SQUEEZE_RIGHT, myThid )
       WRITE(msgBuf,'(A,L5)') '  profilesDoGenGrid  ',