Skip to content

Commit

Permalink
Squashed commit of the following:
Browse files Browse the repository at this point in the history 
commit 67705a1
Merge: 5e53aaf 18afa96
Author: AndrewEichmann-NOAA <58948505+AndrewEichmann-NOAA@users.noreply.github.com>
Date:   Fri Jun 11 10:55:08 2021 -0400

    Merge branch 'NOAA-EMC:master' into master

commit 18afa96
Author: michael.lueken <Michael.Lueken@noaa.gov>
Date:   Thu Jun 10 11:57:29 2021 +0000

    master: Updated fix/rev2 use flags for CrIS NPP due to LW band anomalies (global_satinfo.txt and added gfsv16_historical/global_satinfo.txt.2021052118

commit 51a6564
Merge: 820ee80 d199ed5
Author: MichaelLueken-NOAA <63728921+MichaelLueken-NOAA@users.noreply.github.com>
Date:   Thu Jun 10 07:48:55 2021 -0400

    Merge pull request #169 from RussTreadon-NOAA/master

    GitHub Issue #120. Merge GFS v16.1.1 DA changes into master

commit d199ed5
Author: russ.treadon <Russ.Treadon@noaa.gov>
Date:   Thu May 27 19:08:39 2021 +0000

    GitHub Issue #120. merge GFS v16.1.1 DA changes into master

commit 820ee80
Merge: 6585234 86d4071
Author: MichaelLueken-NOAA <63728921+MichaelLueken-NOAA@users.noreply.github.com>
Date:   Fri May 28 11:34:46 2021 -0400

    Merge pull request #155 from AndrewEichmann-NOAA/EXP-efso_fv3_PR_util_EFSOI_src

    GitHub Issue #118.  EFSOI additions to util/EFSOI-Utilities/src directory.

commit 86d4071
Author: michael.lueken <Michael.Lueken@noaa.gov>
Date:   Fri May 28 15:31:10 2021 +0000

    GitHub Issue #118. Implement EFSOI process in FV3 GFS workflow - EFSOI-specific util source code.

commit 6585234
Merge: 6cec754 efaa7cf
Author: MichaelLueken-NOAA <63728921+MichaelLueken-NOAA@users.noreply.github.com>
Date:   Fri May 28 11:20:54 2021 -0400

    Merge pull request #166 from comgsi/prMaster

    GitHub Issue #167.  Change GSIWRFIO_LIB to WRF_IO_LIB and update build.comgsi accordingly.

commit efaa7cf
Author: Guoqing.Ge <guoqing.ge@noaa.gov>
Date:   Wed May 26 15:51:51 2021 -0600

    change GSIWRFIO_LIB to WRF_IO_LIB and update build.comgsi accordingly

commit 5e53aaf
Merge: e54683c 6cec754
Author: AndrewEichmann-NOAA <58948505+AndrewEichmann-NOAA@users.noreply.github.com>
Date:   Mon May 24 14:34:33 2021 -0400

    Merge branch 'NOAA-EMC:master' into master

commit 6cec754
Merge: 6a6ac4e 3cc26ec
Author: MichaelLueken-NOAA <63728921+MichaelLueken-NOAA@users.noreply.github.com>
Date:   Fri May 21 13:48:26 2021 -0400

    Merge pull request #147 from AndrewEichmann-NOAA/EXP-efso_fv3_PR_util_EFSOI_scripts

    GitHub Issue #118.  EFSOI additions to util/EFSOI-Utilities/scripts directory.

commit 6a6ac4e
Merge: 1162d92 62c884c
Author: MichaelLueken-NOAA <63728921+MichaelLueken-NOAA@users.noreply.github.com>
Date:   Thu May 20 11:03:36 2021 -0400

    Merge pull request #146 from AndrewEichmann-NOAA/EXP-efso_fv3_PR_jobs

    GitHub Issue #118.  EFSOI additions to jobs directory for issue.

commit 1162d92
Merge: 6e38b98 77a729e
Author: MichaelLueken-NOAA <63728921+MichaelLueken-NOAA@users.noreply.github.com>
Date:   Wed May 19 11:02:40 2021 -0400

    Merge pull request #157 from comgsi/tmpdtc

    GitHub Issue #158. Updates for community users to adopt the NOAA hpc-stack structure.

commit 6e38b98
Merge: b511ba0 00eb5da
Author: MichaelLueken-NOAA <63728921+MichaelLueken-NOAA@users.noreply.github.com>
Date:   Wed May 19 07:27:08 2021 -0400

    Merge pull request #164 from EdwardSafford-NOAA/master

    GitHub Issue #160.  Correct data file location problem.

commit 00eb5da
Author: Edward.Safford <edward.safford@noaa.gov>
Date:   Tue May 18 16:31:34 2021 +0000

    GitHub Issue #160.  Correct data file location problem.

commit b511ba0
Author: michael.lueken <Michael.Lueken@noaa.gov>
Date:   Tue May 18 14:38:15 2021 +0000

    GitHub Issue #126. Update global_convinfo.txt and prepobs_errtable.global for high resolution Raob data.

commit 66db434
Merge: dcb735a 23ec8ef
Author: MichaelLueken-NOAA <63728921+MichaelLueken-NOAA@users.noreply.github.com>
Date:   Tue May 18 10:06:16 2021 -0400

    Merge pull request #149 from jderber-NOAA/master

    GitHub Issue #126.  Add use of high resolution Raob data.

commit 77a729e
Author: Guoqing.Ge <guoqing.ge@noaa.gov>
Date:   Fri May 14 11:15:32 2021 -0600

    GitHub Issue #158. Updates for community users to adopt the NOAA hpc-stack structure.

commit e54683c
Merge: f69c3c8 b31b851
Author: andrew.eichmann <andrew.eichmann@noaa.gov>
Date:   Thu May 13 14:39:23 2021 +0000

    Merge branch 'master' of github.com:AndrewEichmann-NOAA/GSI

commit f69c3c8
Merge: 1dc5f83 dcb735a
Author: andrew.eichmann <andrew.eichmann@noaa.gov>
Date:   Thu May 13 14:37:10 2021 +0000

    Merge branch 'master' of github.com:NOAA-EMC/GSI

commit 3cc26ec
Author: andrew.eichmann <andrew.eichmann@noaa.gov>
Date:   Thu May 13 14:28:03 2021 +0000

    GitHub Issue #118. Implement EFSOI process in FV3 GFS workflow - EFSOI additions to util/EFSOI-Utilities/scripts directory.

commit 62c884c
Author: Michael Lueken <michael.lueken@noaa.gov>
Date:   Tue May 11 14:31:14 2021 +0000

    GitHub Issue #118. Implement EFSOI process in FV3 GFS workflow - EFSOI-specific additions to jobs.

commit 23ec8ef
Author: john.derber <John.Derber@noaa.gov>
Date:   Mon Apr 26 19:29:18 2021 +0000

    GitHub Issue #126.  Add use of high resolution Raob data.

commit dcb735a
Merge: c502c92 7939d47
Author: MichaelLueken-NOAA <63728921+MichaelLueken-NOAA@users.noreply.github.com>
Date:   Mon May 3 12:57:43 2021 -0400

    Merge pull request #153 from lbi2018/master

    GitHub Issue #152.

commit b31b851
Author: andrew.eichmann <andrew.eichmann@noaa.gov>
Date:   Fri Apr 30 15:34:59 2021 +0000

    Should not have gone into master
    Revert "EFSOI-specific fortran source from branch EXP-efso_fv3 - GSI issue #118"

    This reverts commit c9b8221.

commit c9b8221
Author: andrew.eichmann <andrew.eichmann@noaa.gov>
Date:   Fri Apr 30 15:30:59 2021 +0000

    EFSOI-specific fortran source from branch EXP-efso_fv3 - GSI issue #118

commit 7939d47
Author: Li.Bi@noaa.gov <Li.Bi@noaa.gov>
Date:   Wed Apr 28 13:15:30 2021 +0000

    GitHub Issue #152. Update of modulefile.ProdGSI.wcoss_c and get_gefs_for_regional.f90 bug fixes.

commit c502c92
Merge: 39ed5fa 5d77565
Author: MichaelLueken-NOAA <63728921+MichaelLueken-NOAA@users.noreply.github.com>
Date:   Mon Apr 26 10:22:12 2021 -0400

    Merge pull request #151 from EdwardSafford-NOAA/master

    GitHub Issue #150.  Correct OznMon read diag issue.

commit 5d77565
Author: edward.safford <edward.safford@noaa.gov>
Date:   Fri Apr 23 19:42:54 2021 +0000

    GitHub Issue #150.  Correct OznMon read diag issue.

commit 39ed5fa
Merge: 02d5ce6 1e6fd61
Author: MichaelLueken-NOAA <63728921+MichaelLueken-NOAA@users.noreply.github.com>
Date:   Tue Apr 13 09:37:05 2021 -0400

    Merge pull request #144 from EdwardSafford-NOAA/master

    GitHub Issue #123. OznMon update and bugzilla fixes.

commit 1e6fd61
Author: Edward.Safford <edward.safford@noaa.gov>
Date:   Fri Apr 9 14:40:01 2021 +0000

    GitHub Issue #123. OznMon update and bugzilla fixes.

commit 1dc5f83
Author: andrew.eichmann <andrew.eichmann@noaa.gov>
Date:   Thu Apr 8 21:15:51 2021 +0000

    removing EFSOI source files until they are merged into GSI master upstream
  • Loading branch information
@AndrewEichmann-NOAA
AndrewEichmann-NOAA committed Jun 21, 2021
1 parent 8e451d9 commit ea93dcd
Show file tree
Hide file tree
Showing 11 changed files with 1,020 additions and 15 deletions.
8 changes: 4 additions & 4 deletions src/enkf/enkf.f90
View file
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ module enkf
obtype, oberrvarmean, numobspersat, deltapredx, biaspreds,&
oberrvar_orig, probgrosserr, prpgerr,&
corrlengthsq,lnsigl,obtimel,obloclat,obloclon,obpress,stattype,&
anal_ob
anal_ob,anal_ob_post
use constants, only: pi, one, zero
use params, only: sprd_tol, paoverpb_thresh, datapath, nanals,&
iassim_order,sortinc,deterministic,numiter,nlevs,&
Expand Down Expand Up @@ -831,19 +831,19 @@ subroutine enkf_update()
call mpi_send(anal_obchunk,numobsperproc(nproc+1)*nanals,mpi_real,0, &
1,mpi_comm_world,ierr)
else
allocate(anal_ob(1:nanals,nobstot))
allocate(anal_ob_post(1:nanals,nobstot))
allocate(buffertmp3(nanals,nobs_max))
do np=1,numproc-1
call mpi_recv(buffertmp3,numobsperproc(np+1)*nanals,mpi_real,np, &
1,mpi_comm_world,mpi_status,ierr)
do nob1=1,numobsperproc(np+1)
nob2 = indxproc_obs(np+1,nob1)
anal_ob(:,nob2) = buffertmp3(:,nob1)
anal_ob_post(:,nob2) = buffertmp3(:,nob1)
end do
end do
do nob1=1,numobsperproc(1)
nob2 = indxproc_obs(1,nob1)
anal_ob(:,nob2) = anal_obchunk(:,nob1)
anal_ob_post(:,nob2) = anal_obchunk(:,nob1)
end do
deallocate(buffertmp3)
end if
Expand Down
12 changes: 6 additions & 6 deletions src/enkf/enkf_obs_sensitivity.f90
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ module enkf_obs_sensitivity
use enkf_obsmod, only: nobstot,nobs_conv,nobs_oz,nobs_sat,obtype,obloclat, &
obloclon,obpress,indxsat,oberrvar,stattype,obtime,ob, &
ensmean_ob,ensmean_obnobc,obsprd_prior,obfit_prior, &
oberrvar_orig,biaspreds,anal_ob,nobstot,lnsigl, &
oberrvar_orig,biaspreds,anal_ob_post,nobstot,lnsigl, &
corrlengthsq,obtimel,oblnp,obloc
use convinfo, only: convinfo_read,init_convinfo
use ozinfo, only: ozinfo_read,init_oz
Expand Down Expand Up @@ -218,7 +218,7 @@ subroutine read_ob_sens
allocate(biaspreds(npred+1,nobs_sat))
allocate(tmpanal_ob(nanals))
allocate(tmpbiaspreds(npred+1))
if(nproc == 0) allocate(anal_ob(nanals,nobstot))
if(nproc == 0) allocate(anal_ob_post(nanals,nobstot))
! Read loop over conventional observations
do nob=1,nobs_conv+nobs_oz
read(iunit) indata,tmpanal_ob
Expand All @@ -235,7 +235,7 @@ subroutine read_ob_sens
oberrvar_orig(nob) = real(indata%oberrvar_orig,r_kind)
stattype(nob) = indata%stattype
obtype(nob) = indata%obtype
if(nproc == 0) anal_ob(1:nanals,nob) = real(tmpanal_ob(1:nanals),r_kind)
if(nproc == 0) anal_ob_post(1:nanals,nob) = real(tmpanal_ob(1:nanals),r_kind)
end do
! Read loop over satellite radiance observations
nn = 0
Expand All @@ -256,7 +256,7 @@ subroutine read_ob_sens
stattype(nob) = indata%stattype
obtype(nob) = indata%obtype
indxsat(nn) = indata%indxsat
if(nproc == 0) anal_ob(1:nanals,nob) = real(tmpanal_ob(1:nanals),r_kind)
if(nproc == 0) anal_ob_post(1:nanals,nob) = real(tmpanal_ob(1:nanals),r_kind)
biaspreds(1:npred+1,nn) = real(tmpbiaspreds(1:npred+1),r_kind)
end do
if(nn /= nobs_sat) then
Expand Down Expand Up @@ -439,7 +439,7 @@ subroutine print_ob_sens
outdata%osense_dry = 9.9e31_r_single
outdata%osense_moist = 9.9e31_r_single
end if
tmpanal_ob(1:nanals) = real(anal_ob(1:nanals,nob),r_single)
tmpanal_ob(1:nanals) = real(anal_ob_post(1:nanals,nob),r_single)
write(iunit) outdata,tmpanal_ob
if(.not. efsoi_flag) cycle
! Sum up
Expand Down Expand Up @@ -510,7 +510,7 @@ subroutine print_ob_sens
outdata%osense_dry = 9.9e31_r_single
outdata%osense_moist = 9.9e31_r_single
end if
tmpanal_ob(1:nanals) = real(anal_ob(1:nanals,nob),r_single)
tmpanal_ob(1:nanals) = real(anal_ob_post(1:nanals,nob),r_single)
write(iunit) outdata,tmpanal_ob,tmpbiaspreds
if(.not. efsoi_flag) cycle
! Sum up
Expand Down
4 changes: 4 additions & 0 deletions src/enkf/enkf_obsmod.f90
View file
Original file line number Diff line number Diff line change
Expand Up @@ -146,6 +146,9 @@ module enkf_obsmod
type(c_ptr) :: anal_ob_modens_cp ! C pointer
integer :: shm_win, shm_win2

! ob-space posterior ensemble, needed for EFSOI
real(r_single),public,allocatable, dimension(:,:) :: anal_ob_post ! Fortran pointer

contains

subroutine readobs()
Expand Down Expand Up @@ -453,6 +456,7 @@ subroutine obsmod_cleanup()
if (allocated(probgrosserr)) deallocate(probgrosserr)
if (allocated(prpgerr)) deallocate(prpgerr)
if (allocated(diagused)) deallocate(diagused)
if (allocated(anal_ob_post)) deallocate(anal_ob_post)
! free shared memory segement, fortran pointer to that memory.
nullify(anal_ob)
call MPI_Barrier(mpi_comm_world,ierr)
Expand Down
2 changes: 1 addition & 1 deletion src/enkf/gridio_gfs.f90
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ module gridio
! language: f95
!
!$$$
use constants, only: zero,one,cp,fv,rd,tiny_r_kind,max_varname_length,t0c,r0_05,constants_initialized
use constants, only: zero,one,cp,fv,rd,tiny_r_kind,max_varname_length,t0c,r0_05
use params, only: nlons,nlats,nlevs,use_gfs_nemsio,pseudo_rh, &
cliptracers,datapath,imp_physics,use_gfs_ncio,cnvw_option, &
nanals
Expand Down
4 changes: 0 additions & 4 deletions src/enkf/params.f90
View file
Original file line number Diff line number Diff line change
Expand Up @@ -761,10 +761,6 @@ subroutine read_namelist()
corrlengthtr = corrlengthtr * 1.e3_r_single/rearth
corrlengthsh = corrlengthsh * 1.e3_r_single/rearth

if(efsoi_cycling) then
letkf_flag = .false.
end if

! convert targe area boundary into radians
tar_minlat = tar_minlat * deg2rad
tar_maxlat = tar_maxlat * deg2rad
Expand Down
9 changes: 9 additions & 0 deletions src/gsi/constants.f90
View file
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,10 @@ module constants
public :: soilmoistmin
public :: stndrd_atmos_ps

! ------ EFSOI relevant parameters -------- !
public :: tref, pref
public :: constants_initialized

! Declare derived constants
integer(i_kind):: huge_i_kind
integer(i_kind), parameter :: max_varname_length=32
Expand All @@ -109,6 +113,8 @@ module constants
real(r_kind),parameter:: ttp = 2.7316e+2_r_kind ! temperature at h2o triple point (K)
real(r_kind),parameter:: jcal = 4.1855e+0_r_kind ! joules per calorie ()
real(r_kind),parameter:: stndrd_atmos_ps = 1013.25e2_r_kind ! 1976 US standard atmosphere ps (Pa)
real(r_kind),parameter:: tref = 2.8000e+2_r_kind ! reference T for total energy
real(r_kind),parameter:: pref = 1.0000e+5_r_kind ! reference P for total energy

! Numeric constants

Expand Down Expand Up @@ -283,6 +289,9 @@ module constants
integer(i_kind),parameter:: i_missing=-9999
integer(r_kind),parameter:: r_missing=-9999._r_kind

! Constants initialized
logical :: constants_initialized = .true.

contains

subroutine init_constants_derived
Expand Down
21 changes: 21 additions & 0 deletions util/EFSOI_Utilities/src/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
cmake_minimum_required(VERSION 2.6)
if(BUILD_EFSOI)

file(GLOB LOCAL_SRC ${CMAKE_CURRENT_SOURCE_DIR}/*90)

set_source_files_properties( ${LOCAL_SRC} PROPERTIES COMPILE_FLAGS ${ENKF_Fortran_FLAGS} )

add_executable(global_efsoi.x ${LOCAL_SRC} )

SET( CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${OMPFLAG}" )

include_directories(${CMAKE_CURRENT_BINARY_DIR} "${PROJECT_BINARY_DIR}/include/global" ${CMAKE_CURRENT_BINARY_DIR}/.. ${MPI_Fortran_INCLUDE_DIRS} ${MPI_Fortran_INCLUDE_PATH} ${CORE_INCS} ${NETCDF_INCLUDE_DIRS} ${NCDIAG_INCS} ${FV3GFS_NCIO_INCS})

target_link_libraries( global_efsoi.x enkflib enkfdeplib ${GSILIB} ${GSISHAREDLIB} ${CORE_LIBRARIES}
${MPI_Fortran_LIBRARIES} ${LAPACK_LIBRARIES} ${NETCDF_Fortran_LIBRARIES} ${NETCDF_C_LIBRARIES}
${FV3GFS_NCIO_LIBRARIES}
${EXTRA_LINKER_FLAGS} ${GSI_LDFLAGS} ${CORE_BUILT} ${CORE_LIBRARIES} ${CORE_BUILT} ${NCDIAG_LIBRARIES})
endif()



Loading

0 comments on commit ea93dcd

Please sign in to comment.