Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Rahulproblem #315

Closed
wants to merge 11 commits into from
Closed

Rahulproblem #315

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
b846b29
GitHub Issue NOAA-EMC/GSI#175. Use the global 127L B-Matrix in regio…
jderber-NOAA Aug 13, 2021
05f1c1f
Merge remote-tracking branch 'upstream/master'
jderber-NOAA Sep 30, 2021
059e402
Merge remote-tracking branch 'upstream/master'
jderber-NOAA Oct 15, 2021
f938842
GitHub Issue NOAA-EMC/GSI#219 Improve Minimization and fix bug in vqc
jderber-NOAA Oct 22, 2021
fafadac
Merge remote-tracking branch 'upstream/master'
jderber-NOAA Nov 3, 2021
52c5ae6
fix setupw
jderber-NOAA Nov 5, 2021
f00e377
Merge remote-tracking branch 'upstream/master'
jderber-NOAA Nov 16, 2021
7703367
Merge remote-tracking branch 'upstream/master'
jderber-NOAA Feb 17, 2022
9eb9606
Merge remote-tracking branch 'upstream/master'
jderber-NOAA Feb 23, 2022
680916f
Modify hdraobmod.f90 to fix problem with GNU compiler found by Rahul.
jderber-NOAA Feb 24, 2022
f07fef8
Add additional changes to hdraob.
jderber-NOAA Feb 24, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion fix
Open in desktop
Submodule fix updated from 2ff806 to f5bdc1
2 changes: 1 addition & 1 deletion regression/regression_var.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ case $machine in

# On Hera, there are no scrubbers to remove old contents from stmp* directories.
# After completion of regression tests, will remove the regression test subdirecories
export clean=".true."
export clean=".false."
;;
Jet)

Expand Down
22 changes: 14 additions & 8 deletions src/gsi/hdraobmod.f90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,6 +143,7 @@ subroutine read_hdraob(nread,ndata,nodata,infile,obstype,lunout,twindin,sis,&
character(10) date
character(8) subset
character(8) c_station_id,id_station
character(8) c_prvstg,c_sprvstg
! character(8) stnid
character(8) stntype

Expand Down Expand Up @@ -198,11 +199,14 @@ subroutine read_hdraob(nread,ndata,nodata,infile,obstype,lunout,twindin,sis,&
real(r_double),dimension(2,maxlevs):: levdat
real(r_double),dimension(8,maxlevs):: var_jb,obserr
real(r_double),dimension(8,maxlevs):: obsdat
real(r_double) :: r_prvstg,r_sprvstg

logical newstation,toocold


! equivalence to handle character names
equivalence(r_prvstg,c_prvstg)
equivalence(r_sprvstg,c_sprvstg)
equivalence(rstation_id,c_station_id)
equivalence(r_station,id_station)

Expand All @@ -220,6 +224,8 @@ subroutine read_hdraob(nread,ndata,nodata,infile,obstype,lunout,twindin,sis,&

print_verbose=.false.
if(verbose) print_verbose=.true.
c_prvstg = '88888888'
c_sprvstg =HDRAOB'
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please include the ' before HDRAOB' on line 228. The code fails to compile with the following:

/gpfs/dell2/emc/modeling/noscrub/Michael.Lueken/update/src/gsi/hdraobmod.f90(228): error #5120: Unterminated character constant
  c_sprvstg =HDRAOB'
-------------------^


! Initialize variables

Expand Down Expand Up @@ -976,8 +982,8 @@ subroutine read_hdraob(nread,ndata,nodata,infile,obstype,lunout,twindin,sis,&
cdata_all(19,iout)=stnelev ! station elevation (m)
cdata_all(20,iout)=levdat(2,k) ! observation height (m)
cdata_all(21,iout)=zz ! terrain height at ob location
cdata_all(22,iout)='88888888' ! provider name
cdata_all(23,iout)='HDRAOB' ! subprovider name
cdata_all(22,iout)=r_prvstg ! provider name
cdata_all(23,iout)=r_sprvstg ! subprovider name
cdata_all(24,iout)=2 ! cat
cdata_all(25,iout)=var_jb(3,k) ! non linear qc for T
if(perturb_obs)cdata_all(nreal,iout)=ran01dom()*perturb_fact ! t perturbation
Expand Down Expand Up @@ -1075,8 +1081,8 @@ subroutine read_hdraob(nread,ndata,nodata,infile,obstype,lunout,twindin,sis,&
cdata_all(19,iout)=dlon_earth_deg ! earth relative longitude (degrees)
cdata_all(20,iout)=dlat_earth_deg ! earth relative latitude (degrees)
cdata_all(21,iout)=zz ! terrain height at ob location
cdata_all(22,iout)='88888888' ! provider name
cdata_all(23,iout)='HDRAOB' ! subprovider name
cdata_all(22,iout)=r_prvstg ! provider name
cdata_all(23,iout)=r_sprvstg ! subprovider name
cdata_all(24,iout)=2 ! cat
cdata_all(25,iout)=var_jb(5,k) ! non linear qc parameter
cdata_all(26,iout)=one ! hilbert curve weight, modified later
Expand Down Expand Up @@ -1157,8 +1163,8 @@ subroutine read_hdraob(nread,ndata,nodata,infile,obstype,lunout,twindin,sis,&
cdata_all(17,iout)=stnelev ! station elevation (m)
cdata_all(18,iout)=levdat(2,k) ! observation height (m)
cdata_all(19,iout)=zz ! terrain height at ob location
cdata_all(20,iout)='88888888' ! provider name
cdata_all(21,iout)='HDRAOB' ! subprovider name
cdata_all(20,iout)=r_prvstg ! provider name
cdata_all(21,iout)=r_sprvstg ! subprovider name
cdata_all(22,iout)=2 ! cat
cdata_all(23,iout)=var_jb(2,k) ! non linear qc b parameter
if(perturb_obs)cdata_all(24,iout)=ran01dom()*perturb_fact ! q perturbation
Expand Down Expand Up @@ -1222,8 +1228,8 @@ subroutine read_hdraob(nread,ndata,nodata,infile,obstype,lunout,twindin,sis,&
cdata_all(15,iout)=dlat_earth_deg ! earth relative latitude (degrees)
cdata_all(16,iout)=stnelev ! station elevation (m)
cdata_all(17,iout)=zz ! terrain height at ob location
cdata_all(18,iout)='88888888' ! provider name
cdata_all(19,iout)='HDRAOB' ! subprovider name
cdata_all(18,iout)=r_prvstg ! provider name
cdata_all(19,iout)=r_sprvstg ! subprovider name
cdata_all(20,iout)=var_jb(1,k) ! non linear qc b parameter
if(perturb_obs)cdata_all(21,iout)=ran01dom()*perturb_fact ! ps perturbation
if (twodvar_regional) &
Expand Down