diff --git a/dcon/dcon_netcdf.f b/dcon/dcon_netcdf.f index 5d561b67..61c12cfd 100644 --- a/dcon/dcon_netcdf.f +++ b/dcon/dcon_netcdf.f @@ -52,7 +52,8 @@ END SUBROUTINE check c----------------------------------------------------------------------- SUBROUTINE dcon_netcdf_out(wp,wv,wt,wt0,ep,ev,et) - COMPLEX(r8), DIMENSION(mpert), INTENT(IN) :: ep,ev,et + COMPLEX(r8), DIMENSION(mpert), INTENT(IN) :: ep,et + REAL(r8), DIMENSION(mpert), INTENT(IN) :: ev COMPLEX(r8), DIMENSION(mpert,mpert), INTENT(IN) :: wp,wv,wt,wt0 INTEGER :: i, ncid, @@ -182,7 +183,7 @@ SUBROUTINE dcon_netcdf_out(wp,wv,wt,wt0,ep,ev,et) CALL check( nf90_def_var(ncid, "W_v_eigenvector", nf90_double, $ (/m_dim, mo_dim, i_dim/), wv_id) ) CALL check( nf90_def_var(ncid, "W_v_eigenvalue", nf90_double, - $ (/mo_dim, i_dim/), wvv_id) ) + $ (/mo_dim/), wvv_id) ) CALL check( nf90_put_att(ncid,wv_id,"long_name", $ "Vacuum Energy Eigenmodes") ) CALL check( nf90_put_att(ncid,wvv_id,"long_name", @@ -248,8 +249,7 @@ SUBROUTINE dcon_netcdf_out(wp,wv,wt,wt0,ep,ev,et) $ AIMAG(ep)/),(/mpert,2/))) ) CALL check( nf90_put_var(ncid,wv_id,RESHAPE((/REAL(wv), $ AIMAG(wv)/),(/mpert,mpert,2/))) ) - CALL check( nf90_put_var(ncid,wvv_id,RESHAPE((/REAL(ev), - $ AIMAG(ev)/),(/mpert,2/))) ) + CALL check( nf90_put_var(ncid,wvv_id,ev) ) CALL check( nf90_put_var(ncid,wt_id,RESHAPE((/REAL(wt), $ AIMAG(wt)/),(/mpert,mpert,2/))) ) CALL check( nf90_put_var(ncid,wtv_id,RESHAPE((/REAL(et), diff --git a/dcon/free.f b/dcon/free.f index d0d3f1e1..5eeb6c8b 100644 --- a/dcon/free.f +++ b/dcon/free.f @@ -60,7 +60,8 @@ SUBROUTINE free_run(plasma1,vacuum1,total1,nzero,op_netcdf_out) REAL(r8) :: v1 REAL(r8), DIMENSION(mpert) :: singfac ! eigenvalues are complex for gpec - COMPLEX(r8), DIMENSION(mpert) :: ep,ev,et,tt + COMPLEX(r8), DIMENSION(mpert) :: ep,et,tt + REAL(r8), DIMENSION(mpert) :: ev REAL(r8), DIMENSION(3*mpert-2) :: rwork REAL(r8), DIMENSION(2*mpert) :: rwork2 diff --git a/gpec/idcon.f b/gpec/idcon.f index 8d45d6c5..a6cbe79f 100644 --- a/gpec/idcon.f +++ b/gpec/idcon.f @@ -524,7 +524,7 @@ SUBROUTINE idcon_build(egnum,xspmn) RETURN END SUBROUTINE idcon_build c----------------------------------------------------------------------- -c subprogram 4. idcon_matric. +c subprogram 4. idcon_metric. c reconstructs metric tensors from dcon. c----------------------------------------------------------------------- SUBROUTINE idcon_metric