Merge pull request #21 from Qiyu-Song/main

Add prespotb to restart

Author: Qiyu-Song

.gitignore

@@ -0,0 +1 @@
+domain.f90

domain.f90

@@ -3,10 +3,10 @@
 module domain
 
        integer, parameter :: YES3D = 1  ! Domain dimensionality: 1 - 3D, 0 - 2D
-       integer, parameter :: nx_gl = 64 ! Number of grid points in X
-       integer, parameter :: ny_gl = 64 ! Number of grid points in Y
-       integer, parameter :: nz_gl = 64 ! Number of pressure (scalar) levels
-       integer, parameter :: nsubdomains_x  = 8 ! No of subdomains in x
+       integer, parameter :: nx_gl = 32 ! Number of grid points in X
+       integer, parameter :: ny_gl = 32 ! Number of grid points in Y
+       integer, parameter :: nz_gl = 28 ! Number of pressure (scalar) levels
+       integer, parameter :: nsubdomains_x  = 4 ! No of subdomains in x
        integer, parameter :: nsubdomains_y  = 4 ! No of subdomains in y
 
 
@@ -28,4 +28,4 @@ module domain
 !  * if one processor is used, than  nsubdomains_x = nsubdomains_y = 1;
 !  * if ntracers is > 0, don't forget to set dotracers to .true. in namelist 
 
-end module domain
+end module domain

forcing.f90

@@ -93,10 +93,9 @@ subroutine forcing
          endif
       end do
    end if
-
    call atmosphere(z(iz-1)/1000.,ratio1,ratio2,ratio_t1)
    call atmosphere(z(iz)/1000.,ratio1,ratio2,ratio_t2)
-
+   
    tt(iz,n)=ratio_t2/ratio_t1*tt(iz-1,n)
 !      qq(iz,n)=max(0.,2.*qq(iz-1,n)-qq(iz-2,n))
    qq(iz,n) = qq(iz-1,n)*exp(-(z(iz)-z(iz-1))/3000.)

restart.f90

@@ -193,7 +193,8 @@ subroutine write_statement()
 
         write(65)  &
          u, v, w, t, p, qv, qcl, qci, qpl, qpi, dudt, dvdt, dwdt, &
-         tracer, micro_field, sgs_field, sgs_field_diag, z, pres, prespot, presi, prespoti, &
+         tracer, micro_field, sgs_field, sgs_field_diag, z, pres, &
+         prespot, prespotb, presi, prespoti, &
          rho, rhow, bet, sstxy, precinst, rank, nx, ny, nz, irecc
         close(65)
         if(masterproc) then
@@ -244,7 +245,8 @@ subroutine read_statement()
 
         read(65)  &
          u, v, w, t, p, qv, qcl, qci, qpl, qpi, dudt, dvdt, dwdt, &
-         tracer, micro_field, sgs_field, sgs_field_diag, z, pres, prespot, presi, prespoti, &
+         tracer, micro_field, sgs_field, sgs_field_diag, z, pres, &
+         prespot, prespotb, presi, prespoti, &
          rho, rhow, bet, sstxy, precinst, rank1, nx1, ny1, nz1, irecc
         close(65)
         read(66) version1, &

wtg_jas2008.f90

@@ -95,7 +95,7 @@ subroutine wtg_jas2008
    end if
 
    dwwtgdt = 0.
-
+   
    call calc_wtend(0.5*pi/lambda_wtg, w_wtg(1:ktrop), dwwtgdt(1:ktrop), &
                      tabs0(1:ktrop), tg0(1:ktrop), tv_wave(1:ktrop), tv_lsbg(1:ktrop), &
                      rho(1:ktrop), z(1:ktrop), zi(1:ktrop+1), ktrop)