fixing tests

ufs-community · Nov 20, 2024 · f2b07a9 · f2b07a9
1 parent f5af65f
commit f2b07a9
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 12 deletions.
diff --git a/tests/test_main.F90 b/tests/test_main.F90
@@ -36,7 +36,7 @@ program test_main
    write(*,*) ''
 
    ! Read input file and initialize grid
-   call cc_read_config(Config, GridState, EmisState, ChemState, rc, configFile)
+   call cc_read_config(Config, EmisState, ChemState, rc, configFile)
    if (rc /= CC_SUCCESS) then
       errMsg = 'Error reading configuration file: ' // TRIM( configFile )
       call cc_emit_error(errMsg, rc, thisLoc)
@@ -99,14 +99,8 @@ program test_main
    call assert_close(ChemState%ChemSpecies(1)%radius, 0.8_fp, msg="dust1 radius")
    call assert_close(ChemState%ChemSpecies(1)%density, 2500.0_fp, msg="dust1 density")
 
-   ! write grid info
-   write(*,*) 'Grid info:'
-   write(*,*) 'Number of grid nx = ', GridState%NX
-   write(*,*) 'Number of grid ny = ', GridState%NY
-   write(*,*) 'Number of grid levels = ', GridState%number_of_levels
-
    ! initialize met
-   call cc_init_met(GridState, MetState, rc)
+   call cc_init_met(MetState, rc)
    if (rc /= CC_SUCCESS) then
       errMsg = 'Error initializing meteorology'
       call cc_emit_error(errMsg, rc, thisLoc)

diff --git a/tests/test_plumerise.F90 b/tests/test_plumerise.F90
@@ -35,7 +35,7 @@ program test_plumerise
    write(*,*) '  PLUMERISE TEST'
 
    ! Read input file and initialize grid
-   call cc_read_config(Config, GridState, EmisState, ChemState, rc, configFile)
+   call cc_read_config(Config, EmisState, ChemState, rc, configFile)
    if (rc /= CC_success) then
       errMsg = 'Error reading configuration file: ' // TRIM( configFile )
       call cc_emit_error(errMsg, rc, thisLoc)
@@ -44,8 +44,9 @@ program test_plumerise
 
    ! Allocate MetState
    MetState%nSOIL = 4
+   MetState%nLEVS = 127
    print*, 'Allocating MetState'
-   call cc_allocate_metstate(GridState, MetState, rc)
+   call cc_allocate_metstate(MetState, rc)
    if (rc /= CC_success) then
       errMsg = 'Error in "cc_allocate_metstate"'
       call cc_emit_error(errMsg, rc, thisLoc)
@@ -62,7 +63,7 @@ program test_plumerise
    endif
 
    ! Allocate EmisState
-   call cc_allocate_emisstate(GridState, EmisState, rc)
+   call cc_allocate_emisstate(MetState, EmisState, rc)
    if (rc /= CC_success) then
       errMsg = 'Error in "cc_allocate_emisstate"'
       call cc_emit_error(errMsg, rc, thisLoc)

diff --git a/tests/test_seasalt.F90 b/tests/test_seasalt.F90
@@ -35,7 +35,7 @@ program test_dust
    !----------------------------
 
    ! Read input file and initialize grid
-   call cc_read_config(Config, GridState, EmisState, ChemState, rc, configFile)
+   call cc_read_config(Config, EmisState, ChemState, rc, configFile)
    if (rc /= CC_success) then
       errMsg = 'Error reading configuration file: ' // TRIM( configFile )
       call cc_emit_error(errMsg, rc, thisLoc)