Merge branch 'MITgcm:master' into genmake2_hybrid

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;

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:

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     ==================================================================
-

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
 

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:

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:

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:

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:

pkg/profiles/cost_profiles.F

@@ -137,11 +137,11 @@ SUBROUTINE cost_profiles( myIter, myTime, myThid )
            iG=bi+(myXGlobalLo-1)/sNx ! Kludge until unstructered tiles
            jG=bj+(myYGlobalLo-1)/sNy ! Kludge until unstructered tiles
            IL  = ILNBLNK( profilesfiles(num_file) )
-           write(profilesfile,'(1a)')
+           write(profilesfile,'(a)')
      &     profilesfiles(num_file)(1:IL)
            IL  = ILNBLNK( profilesfile )
            JL  = ILNBLNK( profilesDir )
-           write(fnameequinc,'(3a,i3.3,a,i3.3,a)')
+           write(fnameequinc,'(3a,2(i3.3,a))')
      &     profilesDir(1:JL),profilesfile(1:IL),'.',iG,'.',jG,'.equi.nc'
 c
            err = NF_OPEN(fnameequinc,NF_NOWRITE,
@@ -330,7 +330,6 @@ SUBROUTINE cost_profiles( myIter, myTime, myThid )
         ENDDO
        ENDDO
 
-C     _BEGIN_MASTER( myThid )
        IF ( myProcId .eq. 0 ) THEN
 
         DO num_var=1,NVARMAX
@@ -398,8 +397,6 @@ SUBROUTINE cost_profiles( myIter, myTime, myThid )
          close ( cunit )
         ENDDO ! DO num_var=1,NVARMAX
        ENDIF ! IF ( myProcId .eq. 0 ) THEN
-C      _END_MASTER( myThid )
-       _BARRIER
 #endif
 
        DO bj=1,nSy
@@ -416,11 +413,11 @@ SUBROUTINE cost_profiles( myIter, myTime, myThid )
            iG=bi+(myXGlobalLo-1)/sNx ! Kludge until unstructered tiles
            jG=bj+(myYGlobalLo-1)/sNy ! Kludge until unstructered tiles
            IL  = ILNBLNK( profilesfiles(num_file) )
-           write(profilesfile,'(1a)')
+           write(profilesfile,'(a)')
      &     profilesfiles(num_file)(1:IL)
            IL  = ILNBLNK( profilesfile )
            JL  = ILNBLNK( profilesDir )
-           write(fnameequinc,'(3a,i3.3,a,i3.3,a)')
+           write(fnameequinc,'(3a,2(i3.3,a))')
      &     profilesDir(1:JL),profilesfile(1:IL),'.',iG,'.',jG,'.equi.nc'
 c
            err = NF_OPEN(fnameequinc,NF_NOWRITE,
@@ -522,7 +519,7 @@ SUBROUTINE cost_profiles( myIter, myTime, myThid )
      &      ProfNo(num_file,bi,bj),num_var
            call print_message(
      &      msgbuf, standardMessageUnit, SQUEEZE_RIGHT , myThid)
-           write(msgbuf,'(a,D22.15,D22.15)')
+           write(msgbuf,'(a,2D22.15)')
      &      prof_names(num_file,num_var),
      &      objf_profiles(num_file,num_var,bi,bj),
      &      num_profiles(num_file,num_var,bi,bj)
@@ -592,7 +589,7 @@ SUBROUTINE cost_profiles( myIter, myTime, myThid )
            call print_message(
      &      msgbuf, standardMessageUnit, SQUEEZE_RIGHT , myThid)
 
-           write(msgbuf,'(a,a5,D22.15,D22.15)') prof_names(1,num_var),
+           write(msgbuf,'(a,a5,2D22.15)') prof_names(1,num_var),
      &      '_mean',
      &      objf_profiles_mean(num_var,bi,bj),
      &      num_profiles_mean(num_var,bi,bj)
@@ -629,7 +626,7 @@ SUBROUTINE cost_profiles( myIter, myTime, myThid )
       CALL GLOBAL_SUM_TILE_RL( objf_prof_tile, objf_prof_glo, myThid )
       CALL GLOBAL_SUM_TILE_RL( num_prof_tile, num_prof_glo, myThid )
 c
-      write(msgbuf,'(a,I2,a,I2,a,2D12.5)')
+      write(msgbuf,'(2(a,I2),a,2D12.5)')
      &  ' cost_profiles(',num_file,',',num_var,')= ',
      &  objf_prof_glo,num_prof_glo
 

pkg/profiles/profiles_init_fixed.F

@@ -115,9 +115,9 @@ SUBROUTINE profiles_init_fixed( myThid )
       WRITE(msgBuf,'(a)') 'general packages parameters :'
       JL  = ILNBLNK( profilesDir )
       IF (JL.NE.0) THEN
-        WRITE(msgBuf,'(a,a)') '  profilesDir ',profilesDir(1:JL)
+        WRITE(msgBuf,'(2a)') '  profilesDir ',profilesDir(1:JL)
       ELSE
-        WRITE(msgBuf,'(a,a)') '  profilesDir ','./'
+        WRITE(msgBuf,'(2a)') '  profilesDir ','./'
       ENDIF
       CALL PRINT_MESSAGE( msgBuf, standardMessageUnit,
      &                    SQUEEZE_RIGHT, myThid )
@@ -158,12 +158,12 @@ SUBROUTINE profiles_init_fixed( myThid )
       profilesfile=' '
       IL  = ILNBLNK( profilesfiles(num_file) )
       IF (IL.NE.0) THEN
-        WRITE(profilesfile,'(1a)')
+        WRITE(profilesfile,'(a)')
      &     profilesfiles(num_file)(1:IL)
         WRITE(msgBuf,'(a)') ' '
         CALL PRINT_MESSAGE( msgBuf, standardMessageUnit,
      &                      SQUEEZE_RIGHT, myThid )
-        WRITE(msgBuf,'(a,i3,a,a)')
+        WRITE(msgBuf,'(a,i3,2a)')
      &     'profiles file #',num_file,' is ', profilesfile(1:IL)
         CALL PRINT_MESSAGE( msgBuf, standardMessageUnit,
      &                      SQUEEZE_RIGHT, myThid )
@@ -195,7 +195,7 @@ SUBROUTINE profiles_init_fixed( myThid )
         iINTERP=NUM_INTERP_POINTS
       ENDIF
 
-      WRITE(msgBuf,'(a,i4,a,i4)')
+      WRITE(msgBuf,'(2(a,i4))')
      &   '  current tile is bi,bj                      =',
      &   bi,',',bj
       CALL PRINT_MESSAGE( msgBuf, standardMessageUnit,
@@ -611,7 +611,7 @@ SUBROUTINE profiles_init_fixed( myThid )
       CALL PRINT_MESSAGE( msgBuf, standardMessageUnit,
      &                    SQUEEZE_RIGHT, myThid )
 
-c6) available variablesin the data set
+c6) available variables in the data set
 
       DO k=1,NVARMAX
         prof_num_var_cur(num_file,k,bi,bj)=0
@@ -664,12 +664,12 @@ SUBROUTINE profiles_init_fixed( myThid )
 
       IF (profilesDoNcOutput) THEN
 
-      WRITE(fnameequinc,'(3a,i3.3,a,i3.3,a)')
+      WRITE(fnameequinc,'(3a,2(i3.3,a))')
      & profilesDir(1:JL),profilesfile(1:IL),'.',iG,'.',jG,'.equi.nc'
-      WRITE(adfnameequinc,'(4a,i3.3,a,i3.3,a)')
+      WRITE(adfnameequinc,'(4a,2(i3.3,a))')
      & profilesDir(1:JL),'ad',
      & profilesfile(1:IL),'.',iG,'.',jG,'.equi.nc'
-      WRITE(tlfnameequinc,'(4a,i3.3,a,i3.3,a)')
+      WRITE(tlfnameequinc,'(4a,2(i3.3,a))')
      & profilesDir(1:JL),'tl',
      & profilesfile(1:IL),'.',iG,'.',jG,'.equi.nc'
 
@@ -707,12 +707,12 @@ SUBROUTINE profiles_init_fixed( myThid )
 #endif
       ELSE
 
-      WRITE(fnameequinc,'(3a,i3.3,a,i3.3,a)')
+      WRITE(fnameequinc,'(3a,2(i3.3,a))')
      & profilesDir(1:JL),profilesfile(1:IL),'.',iG,'.',jG,'.equi.data'
-      WRITE(adfnameequinc,'(4a,i3.3,a,i3.3,a)')
+      WRITE(adfnameequinc,'(4a,2(i3.3,a))')
      & profilesDir(1:JL),'ad',
      & profilesfile(1:IL),'.',iG,'.',jG,'.equi.data'
-      WRITE(tlfnameequinc,'(4a,i3.3,a,i3.3,a)')
+      WRITE(tlfnameequinc,'(4a,2(i3.3,a))')
      & profilesDir(1:JL),'tl',
      & profilesfile(1:IL),'.',iG,'.',jG,'.equi.data'
 
@@ -903,7 +903,7 @@ SUBROUTINE profiles_init_fixed( myThid )
          jG=bj+(myYGlobalLo-1)/sNy ! Kludge until unstructered tiles
 cgf XC grid
        CALL MDSFINDUNIT( fid , myThid )
-       WRITE(fnameequinc,'(a,i3.3,a,i3.3,a,i4.4,a,i4.4,a)')
+       WRITE(fnameequinc,'(a,2(i3.3,a),2(i4.4,a))')
      & 'profilesXCincl1PointOverlap.',iG,'.',jG,'.',sNx,'.',sNy,'.data'
          k=MDS_RECLEN(64,(sNx+2)*(sNy+2),myThid)
             WRITE(standardMessageUnit,'(A,/,2A)')
@@ -923,7 +923,7 @@ SUBROUTINE profiles_init_fixed( myThid )
        close(fid)
 cgf YC grid
        CALL MDSFINDUNIT( fid , myThid )
-       WRITE(fnameequinc,'(a,i3.3,a,i3.3,a,i4.4,a,i4.4,a)')
+       WRITE(fnameequinc,'(a,2(i3.3,a),2(i4.4,a))')
      & 'profilesYCincl1PointOverlap.',iG,'.',jG,'.',sNx,'.',sNy,'.data'
          k=MDS_RECLEN(64,(sNx+2)*(sNy+2),myThid)
             WRITE(standardMessageUnit,'(A,/,A)')