removed rarely used EXTRA_OUTPUT

Author: lumlauf

src/CMakeLists.txt

@@ -44,9 +44,6 @@ endif()
 if(GOTM_USE_SEAGRASS)
   add_definitions(-D_SEAGRASS_)
 endif()
-if(GOTM_EXTRA_OUTPUT)
-  add_definitions(-DEXTRA_OUTPUT)
-endif()
 
 # ----------------------------
 # Targets

src/gotm/register_all_variables.F90

@@ -477,13 +477,6 @@ subroutine register_meanflow_variables(nlev)
    call field%attributes%set('axis', 'Z')
    call fm%register('h', 'm', 'layer thickness', standard_name='cell_thickness', dimensions=(/id_dim_z/), data1d=h(1:nlev),category='column_structure',part_of_state=.true.)
    call fm%register('ho', 'm', 'layer thickness - old time step', standard_name='cell_thickness', dimensions=(/id_dim_z/), data1d=h(1:nlev),category='column_structure', part_of_state=.true., output_level=output_level_debug)
-#ifdef EXTRA_OUTPUT
-   call fm%register('mean1', '??', '1. mean dummy variable', standard_name='??', dimensions=(/id_dim_z/), data1d=mean1(1:nlev),category='meanflow',output_level=output_level_debug)
-   call fm%register('mean2', '??', '2. mean dummy variable', standard_name='??', dimensions=(/id_dim_z/), data1d=mean2(1:nlev),category='meanflow',output_level=output_level_debug)
-   call fm%register('mean3', '??', '3. mean dummy variable', standard_name='??', dimensions=(/id_dim_z/), data1d=mean3(1:nlev),category='meanflow',output_level=output_level_debug)
-   call fm%register('mean4', '??', '4. mean dummy variable', standard_name='??', dimensions=(/id_dim_z/), data1d=mean4(1:nlev),category='meanflow',output_level=output_level_debug)
-   call fm%register('mean5', '??', '5. mean dummy variable', standard_name='??', dimensions=(/id_dim_z/), data1d=mean5(1:nlev),category='meanflow',output_level=output_level_debug)
-#endif
 #ifndef _ICE_
    call fm%register('Hice', 'm', 'fake ice thickness', standard_name='', data0d=Hice, category='surface')
 #endif
@@ -581,13 +574,7 @@ subroutine register_turbulence_variables(nlev)
    call fm%register('uu', 'm2/s2', 'variance of u-fluctuations', standard_name='??', dimensions=(/id_dim_zi/), data1d=uu(0:nlev),category='turbulence/shear')
    call fm%register('vv', 'm2/s2', 'variance of v-fluctuations', standard_name='??', dimensions=(/id_dim_zi/), data1d=vv(0:nlev),category='turbulence/shear')
    call fm%register('ww', 'm2/s2', 'variance of w-fluctuations', standard_name='??', dimensions=(/id_dim_zi/), data1d=ww(0:nlev),category='turbulence/shear')
-#ifdef EXTRA_OUTPUT
-   call fm%register('turb1', '', '1. turbulence dummy variable', dimensions=(/id_dim_zi/), data1d=turb1(0:nlev),category='turbulence',output_level=output_level_debug)
-   call fm%register('turb2', '', '2. turbulence dummy variable', dimensions=(/id_dim_zi/), data1d=turb2(0:nlev),category='turbulence',output_level=output_level_debug)
-   call fm%register('turb3', '', '3. turbulence dummy variable', dimensions=(/id_dim_zi/), data1d=turb3(0:nlev),category='turbulence',output_level=output_level_debug)
-   call fm%register('turb4', '', '4. turbulence dummy variable', dimensions=(/id_dim_zi/), data1d=turb4(0:nlev),category='turbulence',output_level=output_level_debug)
-   call fm%register('turb5', '', '5. turbulence dummy variable', dimensions=(/id_dim_zi/), data1d=turb5(0:nlev),category='turbulence',output_level=output_level_debug)
-#endif
+
    return
    end subroutine register_turbulence_variables
 !EOC

src/meanflow/meanflow.F90

@@ -81,13 +81,6 @@ module meanflow
    REALTYPE, public  :: Hice
 #endif
 
-# ifdef EXTRA_OUTPUT
-
-!  dummies for testing
-   REALTYPE, public, dimension(:), allocatable   :: mean1,mean2,mean3,mean4,mean5
-
-# endif
-
 !  the 'meanflow' configuration
    REALTYPE, public                    :: h0b
    logical,  public                    :: calc_bottom_stress
@@ -394,30 +387,6 @@ subroutine post_init_meanflow(nlev,latitude)
    if (rc /= 0) STOP 'init_meanflow: Error allocating (bioshade)'
    bioshade = _ONE_
 
-# ifdef EXTRA_OUTPUT
-
-   allocate(mean1(0:nlev),stat=rc)
-   if (rc /= 0) stop 'init_meanflow: Error allocating (mean1)'
-   mean1 = _ZERO_
-
-   allocate(mean2(0:nlev),stat=rc)
-   if (rc /= 0) stop 'init_meanflow: Error allocating (mean2)'
-   mean2 = _ZERO_
-
-   allocate(mean3(0:nlev),stat=rc)
-   if (rc /= 0) stop 'init_meanflow: Error allocating (mean3)'
-   mean3 = _ZERO_
-
-   allocate(mean4(0:nlev),stat=rc)
-   if (rc /= 0) stop 'init_meanflow: Error allocating (mean4)'
-   mean4 = _ZERO_
-
-   allocate(mean5(0:nlev),stat=rc)
-   if (rc /= 0) stop 'init_meanflow: Error allocating (mean5)'
-   mean5 = _ZERO_
-
-# endif
-
    LEVEL2 'done.'
    return
    end subroutine post_init_meanflow
@@ -480,13 +449,6 @@ subroutine clean_meanflow()
    if (allocated(rad)) deallocate(rad)
    if (allocated(avh)) deallocate(avh)
    if (allocated(bioshade)) deallocate(bioshade)
-# ifdef EXTRA_OUTPUT
-   if (allocated(mean1)) deallocate(mean1)
-   if (allocated(mean2)) deallocate(mean2)
-   if (allocated(mean3)) deallocate(mean3)
-   if (allocated(mean4)) deallocate(mean4)
-   if (allocated(mean5)) deallocate(mean5)
-# endif
    LEVEL2 'done.'
 
    return
@@ -542,13 +504,6 @@ subroutine print_state_meanflow()
    if (allocated(fric)) LEVEL2 'fric',fric
    if (allocated(drag)) LEVEL2 'drag',drag
    if (allocated(bioshade)) LEVEL2 'bioshade',bioshade
-# ifdef EXTRA_OUTPUT
-   if (allocated(mean1)) LEVEL2 'mean1',mean1
-   if (allocated(mean2)) LEVEL2 'mean2',mean2
-   if (allocated(mean3)) LEVEL2 'mean3',mean3
-   if (allocated(mean4)) LEVEL2 'mean4',mean4
-   if (allocated(mean5)) LEVEL2 'mean5',mean5
-# endif
 
    LEVEL2 'meanflow configuration',                 &
       h0b,z0s_min,charnock,charnock_val,ddu,ddl,    &

src/turbulence/turbulence.F90

@@ -117,13 +117,6 @@ module turbulence
 !  turbulent velocity variances
    REALTYPE, public, dimension(:), allocatable   :: uu,vv,ww
 
-# ifdef EXTRA_OUTPUT
-
-!  dummies for testing
-   REALTYPE, public, dimension(:), allocatable   :: turb1,turb2,turb3,turb4,turb5
-
-# endif
-
 !  some additional constants
    REALTYPE, public                              :: cm0,cmsf,cde,rcm, b1
 
@@ -1062,30 +1055,6 @@ subroutine post_init_turbulence(nlev)
    if (rc /= 0) stop 'init_turbulence: Error allocating (ww)'
    ww = _ZERO_
 
-# ifdef EXTRA_OUTPUT
-
-   allocate(turb1(0:nlev),stat=rc)
-   if (rc /= 0) stop 'init_turbulence: Error allocating (turb1)'
-   turb1 = _ZERO_
-
-   allocate(turb2(0:nlev),stat=rc)
-   if (rc /= 0) stop 'init_turbulence: Error allocating (turb2)'
-   turb2 = _ZERO_
-
-   allocate(turb3(0:nlev),stat=rc)
-   if (rc /= 0) stop 'init_turbulence: Error allocating (turb3)'
-   turb3 = _ZERO_
-
-   allocate(turb4(0:nlev),stat=rc)
-   if (rc /= 0) stop 'init_turbulence: Error allocating (turb4)'
-   turb4 = _ZERO_
-
-   allocate(turb5(0:nlev),stat=rc)
-   if (rc /= 0) stop 'init_turbulence: Error allocating (turb5)'
-   turb5 = _ZERO_
-
-# endif
-
    LEVEL2 'done.'
 
    if (turb_method .eq. no_model) then
@@ -4060,13 +4029,6 @@ subroutine clean_turbulence()
    if (allocated(uu)) deallocate(uu)
    if (allocated(vv)) deallocate(vv)
    if (allocated(ww)) deallocate(ww)
-# ifdef EXTRA_OUTPUT
-   if (allocated(turb1)) deallocate(turb1)
-   if (allocated(turb2)) deallocate(turb2)
-   if (allocated(turb3)) deallocate(turb3)
-   if (allocated(turb4)) deallocate(turb4)
-   if (allocated(turb5)) deallocate(turb5)
-# endif
    LEVEL2 'done.'
 
    return
@@ -4112,15 +4074,6 @@ subroutine print_state_turbulence()
    LEVEL2 'Rig',Rig
    LEVEL2 'xRf',xRf
    LEVEL2 'uu,vv,ww',uu,vv,ww
-
-#ifdef EXTRA_OUTPUT
-   LEVEL2 'turb1',turb1
-   LEVEL2 'turb2',turb2
-   LEVEL2 'turb3',turb3
-   LEVEL2 'turb4',turb4
-   LEVEL2 'turb5',turb5
-#endif
-
    LEVEL2 'cm0,cmsf,cde,rcm, b1',cm0,cmsf,cde,rcm, b1
    LEVEL2 'Prandtl0',Prandtl0
    LEVEL2 'craig_m,sig_e0',craig_m,sig_e0