NCAR · jedwards4b · Jan 9, 2023 · Jan 8, 2023
diff --git a/.github/workflows/autotools.yml b/.github/workflows/autotools.yml
@@ -2,9 +2,9 @@ name: autotools ubuntu openmpi latest with Wall
 
 on:
   push:
-    branches: [ master ]
+    branches: [ main ]
   pull_request:
-    branches: [ master ]
+    branches: [ main ]
 
 jobs:
   build:

diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml
@@ -3,9 +3,9 @@ name: cmake ubuntu openmpi latest
 
 on:
   push:
-    branches: [ master ]
+    branches: [ main ]
   pull_request:
-    branches: [ master ]
+    branches: [ main ]
 
 jobs:
   build:

diff --git a/.github/workflows/cmake_ubuntu_latest.yml b/.github/workflows/cmake_ubuntu_latest.yml
@@ -4,10 +4,10 @@ name: cmake_ubuntu-latest
 on:
   push:
     branches:
-      - masternot
+      - mainnot
   pull_request:
     branches:
-      - masternot
+      - mainnot
 
 jobs:
   build:

diff --git a/.github/workflows/intel.yml b/.github/workflows/intel.yml
@@ -2,9 +2,9 @@ name: Intel OneAPI
 # Tests ParallelIO using Intel Compiler and IMPI library.
 on:
   push:
-    branches: [ master ]
+    branches: [ main ]
   pull_request:
-    branches: [ master ]
+    branches: [ main ]
 
 jobs:
   build:

diff --git a/.github/workflows/netcdf_hdf5_no_pnetcdf_ncint_mpich.yml b/.github/workflows/netcdf_hdf5_no_pnetcdf_ncint_mpich.yml
@@ -1,9 +1,9 @@
 name: netcdf_hdf5_no_pnetcdf_ncint_mpich
 on:
   push:
-    branches: [ master ]
+    branches: [ main ]
   pull_request:
-    branches: [ master ]
+    branches: [ main ]
 
 jobs:
   build:

diff --git a/.github/workflows/netcdf_hdf5_pnetcdf_ncint_mpich_asan.yml b/.github/workflows/netcdf_hdf5_pnetcdf_ncint_mpich_asan.yml
@@ -1,9 +1,9 @@
 name: netcdf_hdf5_pnetcdf_ncint_mpich_asan
 on:
   push:
-    branches: [ mastertodo ]
+    branches: [ maintodo ]
   pull_request:
-    branches: [ mastertodo ]
+    branches: [ maintodo ]
 
 jobs:
   build:

diff --git a/.github/workflows/netcdf_pnetcdf_openmpi.yml b/.github/workflows/netcdf_pnetcdf_openmpi.yml
@@ -2,9 +2,9 @@ name: netcdf_pnetcdf_openmpi
 
 on:
   push:
-    branches: [ mastertodo ]
+    branches: [ maintodo ]
   pull_request:
-    branches: [ mastertodo ]
+    branches: [ maintodo ]
 
 jobs:
   build:

diff --git a/.github/workflows/strict_autotools_ubuntu_latest.yml b/.github/workflows/strict_autotools_ubuntu_latest.yml
@@ -2,9 +2,9 @@ name: strict_autotools_ubuntu_latest
 
 on:
   push:
-    branches: [ mastertodo ]
+    branches: [ maintodo ]
   pull_request:
-    branches: [ mastertodo ]
+    branches: [ maintodo ]
 
 jobs:
   build:

diff --git a/.github/workflows/withspack.yml b/.github/workflows/withspack.yml
@@ -2,9 +2,9 @@ name: Build with Spack
 # Tests ParallelIO using spack tools
 on:
   push:
-    branches: [ master ]
+    branches: [ main ]
   pull_request:
-    branches: [ master ]
+    branches: [ main ]
 
 jobs:
   build:

diff --git a/ctest/runcdash-nwscla-gnu.sh b/ctest/runcdash-nwscla-gnu.sh
@@ -31,7 +31,7 @@ if [ ! -d src ]; then
   git clone https://github.com/PARALLELIO/ParallelIO src
 fi
 cd src
-git checkout master
-git pull origin master
+git checkout main
+git pull origin main
 
 ctest -S CTestScript.cmake,${model} -VV
diff --git a/ctest/runcdash-nwscla-intel.sh b/ctest/runcdash-nwscla-intel.sh
@@ -34,7 +34,7 @@ if [ ! -d src ]; then
   git clone https://github.com/PARALLELIO/ParallelIO src
 fi
 cd src
-git checkout master
-git pull origin master
+git checkout main
+git pull origin main
 
 ctest -S CTestScript.cmake,${model} -VV
diff --git a/ctest/runcdash-nwscla-pgi.sh b/ctest/runcdash-nwscla-pgi.sh
@@ -31,7 +31,7 @@ if [ ! -d src ]; then
   git clone  https://github.com/PARALLELIO/ParallelIO src
 fi
 cd src
-git checkout master
-git pull origin master
+git checkout main
+git pull origin main
 
 ctest -S CTestScript.cmake,${model} -VV
diff --git a/doc/source/contributing_code.txt b/doc/source/contributing_code.txt
@@ -118,18 +118,18 @@ all issues have been resolved.
 <ul>
 
 <li>Programmers begin work on a feature or fix by branching from
-master.
+main.
 
 <li>When a branch is ready, it is submitted to code review via pull
 request. A number of Github tests will be run automatically. 
 
 <li>When code review is complete, and the changes are approved, the PR
-is merged into the master branch.
+is merged into the main branch.
 
-<li>The master branch is tested periodically by CDash (every ~6
-hours). Any test failures and the merge to master may be rolled back.
+<li>The main branch is tested periodically by CDash (every ~6
+hours). Any test failures and the merge to main may be rolled back.
 
-<li>The branch is then deleted by whomever merged it to master.
+<li>The branch is then deleted by whomever merged it to main.
 
 </ul>
 

diff --git a/examples/basic/gdecomp_mod.F90 b/examples/basic/gdecomp_mod.F90
@@ -34,7 +34,7 @@ module gdecomp_mod
    end type
 
    character(len=*),parameter :: modname = 'gdecomp_mod'
-   integer(i4),parameter :: master_task = 0
+   integer(i4),parameter :: main_task = 0
 
 !==================================================================
 contains
@@ -171,7 +171,7 @@ subroutine gdecomp_set(gdecomp,nxg,nyg,nzg,gdx,gdy,gdz,bdx,bdy,bdz, &
    endif
 
    if (present(my_task)) then
-      if (my_task == master_task) call gdecomp_print(gdecomp)
+      if (my_task == main_task) call gdecomp_print(gdecomp)
    endif
 
    end subroutine gdecomp_set
@@ -260,7 +260,7 @@ subroutine gdecomp_read_nml(gdecomp,nml_file,nml_var,my_task,ntasks,gdims)
    gdecomp%bdz = bdz
 
    if (present(my_task)) then
-      if (my_task == master_task) call gdecomp_print(gdecomp)
+      if (my_task == main_task) call gdecomp_print(gdecomp)
    endif
 
    end subroutine gdecomp_read_nml
@@ -422,15 +422,15 @@ subroutine gdecomp_DOF(gdecomp,my_task,DOF,start,count,write_decomp,test)
             write(6,*) trim(subname),' ERROR: contval must be > 0 ',nbor
             call piodie(__FILE__,__LINE__)
          endif
-         if (my_task == master_task) &
+         if (my_task == main_task) &
             write(6,*) trim(subname),' blkdecomp1 = ',trim(gdecomp%blkdecomp1),' contval = ',contval
       case ('cont1dm')
          call pad_div(contval,nblks,gnpes)
          if (contval <= 0) then
             write(6,*) trim(subname),' ERROR: contval must be > 0 ',nbor
             call piodie(__FILE__,__LINE__)
          endif
-         if (my_task == master_task) &
+         if (my_task == main_task) &
             write(6,*) trim(subname),' blkdecomp1 = ',trim(gdecomp%blkdecomp1),' contval = ',contval
       case default
          call calcdecomp(gdecomp%blkdecomp1,gnpes,nblk,nbor,ierr)
@@ -658,18 +658,18 @@ subroutine gdecomp_DOF(gdecomp,my_task,DOF,start,count,write_decomp,test)
          start(1:3) = pstart(1:3,my_task)
          count(1:3) = pend(1:3,my_task) - pstart(1:3,my_task) + 1
       endif
-      if (my_task == master_task) &
+      if (my_task == main_task) &
          write(6,*) trim(subname),' start and count were computed ',my_task,start,count
    else
       start = 1
       count = 0
-      if (my_task == master_task) &
+      if (my_task == main_task) &
          write(6,*) trim(subname),' start and count could NOT be computed '
    endif
 
-!------- MASTER TASK WRITE ------------------------------------- 
+!------- main TASK WRITE ------------------------------------- 
 
-   if (my_task == master_task) then
+   if (my_task == main_task) then
 
    ! --- write testdof ---
 
@@ -738,7 +738,7 @@ subroutine gdecomp_DOF(gdecomp,my_task,DOF,start,count,write_decomp,test)
 
    endif   ! testonly
 
-!------- END MASTER TASK WRITE --------------------------------- 
+!------- END main TASK WRITE --------------------------------- 
 
    if(wdecomp) then 
      deallocate(blkid,tskid)

diff --git a/examples/basic/testpio.F90 b/examples/basic/testpio.F90
@@ -110,8 +110,8 @@ program testpio
   integer(i4), parameter ::  nml_in = 10
   character(len=*), parameter :: nml_filename = 'testpio_in'
 
-  integer(i4)  :: master_task
-  logical      :: log_master_task
+  integer(i4)  :: main_task
+  logical      :: log_main_task
   integer(i4)  :: nml_error
   integer(kind=pio_offset_kind)  :: sdof,sdof_sum,sdof_min,sdof_max
 
@@ -157,11 +157,11 @@ program testpio
   call CheckMPIReturn('Call to MPI_COMM_RANK()',ierr,__FILE__,__LINE__)
   call MPI_COMM_SIZE(MPI_COMM_WORLD,nprocs,ierr)
   call CheckMPIReturn('Call to MPI_COMM_SIZE()',ierr,__FILE__,__LINE__)
-  master_task = 0
-  if (my_task == master_task) then
-     log_master_task = .true.
+  main_task = 0
+  if (my_task == main_task) then
+     log_main_task = .true.
   else
-     log_master_task = .false.
+     log_main_task = .false.
   endif
 
   if(Debug)    print *,'testpio: before call to t_initf'
@@ -171,7 +171,7 @@ program testpio
   !---------------------------------------------------------------
   if(Debug)    print *,'testpio: point #1'
   call t_initf(nml_filename, logprint=.false., logunit=6, &
-       mpicom=MPI_COMM_WORLD, MasterTask=log_master_task)
+       mpicom=MPI_COMM_WORLD, mainTask=log_main_task)
   if(Debug)    print *,'testpio: point #2'
   call t_startf('testpio_total')
 
@@ -193,7 +193,7 @@ program testpio
   if (mrss1 - mrss0 > 0) then
      mb_blk = (8.0_r8)/((mrss1-mrss0)*1.0_r8)
   endif
-  if (my_task == master_task) then
+  if (my_task == main_task) then
      write(*,*) myname,' 8 MB memory   alloc in MB is ',(mrss1-mrss0)*mb_blk
      write(*,*) myname,' 8 MB memory dealloc in MB is ',(mrss1-mrss2)*mb_blk
      write(*,*) myname,' Memory block size conversion in bytes is ',mb_blk*1024_r8*1024.0_r8
@@ -212,12 +212,12 @@ program testpio
   !----------------------------------------------------------------
 
   if(Debug)    print *,'testpio: before call to readTestPIO_Namelist'
-  if(my_task == master_task) then 
+  if(my_task == main_task) then 
      call ReadTestPIO_Namelist(nml_in, nprocs, nml_filename, myname, nml_error)
   endif
   if(Debug) print *,'testpio: before call to broadcast_namelist'
   call MPI_barrier(MPI_COMM_WORLD,ierr)
-  call Broadcast_Namelist(myname, my_task, master_task, MPI_COMM_WORLD, ierr)
+  call Broadcast_Namelist(myname, my_task, main_task, MPI_COMM_WORLD, ierr)
   if(Debug) print *,'testpio: after call to broadcast_namelist'
 
   !-------------------------------------
@@ -436,17 +436,17 @@ program testpio
 #endif
 
   sdof = sum(compDOF)
-  call MPI_REDUCE(sdof,sdof_sum,1,MPI_INTEGER8,MPI_SUM,master_task,MPI_COMM_COMPUTE,ierr)
+  call MPI_REDUCE(sdof,sdof_sum,1,MPI_INTEGER8,MPI_SUM,main_task,MPI_COMM_COMPUTE,ierr)
   call CheckMPIReturn('Call to MPI_REDUCE SUM',ierr,__FILE__,__LINE__)
 
   sdof = minval(compDOF)
-  call MPI_REDUCE(sdof,sdof_min,1,MPI_INTEGER8,MPI_MIN,master_task,MPI_COMM_COMPUTE,ierr)
+  call MPI_REDUCE(sdof,sdof_min,1,MPI_INTEGER8,MPI_MIN,main_task,MPI_COMM_COMPUTE,ierr)
   call CheckMPIReturn('Call to MPI_REDUCE MIN',ierr,__FILE__,__LINE__)
 
   sdof = maxval(compDOF)
-  call MPI_REDUCE(sdof,sdof_max,1,MPI_INTEGER8,MPI_MAX,master_task,MPI_COMM_COMPUTE,ierr)
+  call MPI_REDUCE(sdof,sdof_max,1,MPI_INTEGER8,MPI_MAX,main_task,MPI_COMM_COMPUTE,ierr)
   call CheckMPIReturn('Call to MPI_REDUCE MAX',ierr,__FILE__,__LINE__)
-  if (my_task == master_task) then
+  if (my_task == main_task) then
      write(6,*) trim(myname),' total nprocs = ',nprocs
      write(6,*) trim(myname),' compDOF sum/min/max = ',sdof_sum,sdof_min,sdof_max
   endif
@@ -621,7 +621,7 @@ program testpio
 	   readPhase = .true.
         endif
      endif
-     if(log_master_task) print *,'{write,read}Phase:  ',writePhase,readPhase
+     if(log_main_task) print *,'{write,read}Phase:  ',writePhase,readPhase
 
 
      do it=1,maxiter
@@ -1343,7 +1343,7 @@ program testpio
   lmem(2) = mrss
   call mpi_gather(lmem,2,MPI_INTEGER,gmem,2,MPI_INTEGER,0,MPI_COMM_COMPUTE,ierr)
   call CheckMPIReturn('Call to mpi_gather',ierr,__FILE__,__LINE__)
-  if (my_task == master_task) then
+  if (my_task == main_task) then
      do n = 0,nprocs-1
         write(*,'(2a,i8,a,2f10.2)') myname,' my_task=',n,' : (hw, usage) memory (MB) = ',gmem(1,n)*mb_blk,gmem(2,n)*mb_blk
      enddo
@@ -1356,8 +1356,8 @@ program testpio
 
   call MPI_Barrier(MPI_COMM_COMPUTE,ierr)
 
-!  print *,my_task, master_task
-  if (my_task == master_task) then
+!  print *,my_task, main_task
+  if (my_task == main_task) then
      print *,' '
      print *,'testpio completed successfully'
      print *,' '

diff --git a/src/clib/parallel_sort.c b/src/clib/parallel_sort.c
@@ -1,5 +1,5 @@
 /**
- * c.f.: https://raw.githubusercontent.com/rabauke/mpl/master/examples/parallel_sort_mpi.c
+ * c.f.: https://raw.githubusercontent.com/rabauke/mpl/main/examples/parallel_sort_mpi.c
  * parallel sort algorithm for distributed memory computers
  *
  * algorithm works as follows:

diff --git a/src/clib/pio.h b/src/clib/pio.h
@@ -450,13 +450,13 @@ typedef struct iosystem_desc_t
      * process is not part of the IO communicator. */
     int io_rank;
 
-    /** Set to MPI_ROOT if this task is the master of IO communicator, 0
+    /** Set to MPI_ROOT if this task is the main of IO communicator, 0
      * otherwise. */
-    int iomaster;
+    int iomain;
 
-    /** Set to MPI_ROOT if this task is the master of comp communicator, 0
+    /** Set to MPI_ROOT if this task is the main of comp communicator, 0
      * otherwise. */
-    int compmaster;
+    int compmain;
 
     /** Rank of IO root task (which is rank 0 in io_comm) in the union
      * communicator. */