Skip to content

Commit

Permalink
id -> Id
Browse files Browse the repository at this point in the history
  • Loading branch information
@IvanaEscobar
IvanaEscobar committed Nov 19, 2024
1 parent 2f5be3c commit ec57ffb
Show file tree
Hide file tree
Showing 3 changed files with 46 additions and 46 deletions.
28 changes: 14 additions & 14 deletions pkg/profiles/profiles_init_ncfile.F
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ SUBROUTINE PROFILES_INIT_NCFILE(

C !INPUT/OUTPUT PARAMETERS:
C myThid: my thread ID number
INTEGER fid1,fid2,dimid1,dimid2,varid(2*NVARMAX),varid0
INTEGER fid1,fid2,dimId1,dimId2,varId(2*NVARMAX),varId0
INTEGER myThid,bi,bj,err,vecid(2), length, Zlength
CHARACTER*(*) file2
INTEGER irec,num_var,num_file
Expand All @@ -45,28 +45,28 @@ SUBROUTINE PROFILES_INIT_NCFILE(
err = NF_CREATE( file2, NF_CLOBBER, fid2 )
CALL PROFILES_NF_ERROR( 'INIT_NCFILE: NF_CREATE fid2',
& err,bi,bj,myThid )
err = NF_DEF_DIM( fid2,'iDEPTH', Zlength, dimid1 )
err = NF_DEF_DIM( fid2,'iDEPTH', Zlength, dimId1 )
CALL PROFILES_NF_ERROR( 'INIT_NCFILE: NF_DEF_DIM Zlength',
& err,bi,bj,myThid )
err = NF_DEF_DIM( fid2,'iPROF', length, dimid2 )
err = NF_DEF_DIM( fid2,'iPROF', length, dimId2 )
CALL PROFILES_NF_ERROR( 'INIT_NCFILE: NF_DEF_DIM length',
& err,bi,bj,myThid )

vecid(1)=dimid1
vecid(2)=dimid2
vecid(1)=dimId1
vecid(2)=dimId2

err = NF_DEF_VAR( fid2, 'prof_ind_glob',
& NF_INT, 1, vecid(2), varid(1) )
& NF_INT, 1, vecid(2), varId(1) )
CALL PROFILES_NF_ERROR( 'INIT_NCFILE: NF_DEF_VAR prof_ind_glob',
& err,bi,bj,myThid )
err = NF_PUT_ATT_INT( fid2, varid(1),
err = NF_PUT_ATT_INT( fid2, varId(1),
& '_FillValue', NF_INT, 1, 0 )
CALL PROFILES_NF_ERROR( 'INIT_NCFILE: NF_PUT_ATT_INT varId(1)',
& err,bi,bj,myThid )

DO num_var = 1, NVARMAX
err = NF_INQ_VARID( fid1,
& prof_names(num_file,num_var), varid0 )
& prof_names(num_file,num_var), varId0 )
IF (err.EQ.NF_NOERR) THEN
WRITE(msgBuf,'(2A)')
& 'S/R PROFILES_INIT_NCFILE: defining new variable ',
Expand All @@ -75,25 +75,25 @@ SUBROUTINE PROFILES_INIT_NCFILE(
& standardMessageUnit, SQUEEZE_RIGHT, myThid )

err = NF_DEF_VAR( fid2, prof_names(num_file,num_var),
& NF_DOUBLE, 2, vecid, varid(2+(num_var-1)*2) )
& NF_DOUBLE, 2, vecid, varId(2+(num_var-1)*2) )
CALL PROFILES_NF_ERROR(
& 'INIT_NCFILE: NF_DEF_VAR prof_names',
& err,bi,bj,myThid )
err = NF_PUT_ATT_DOUBLE( fid2, varid(2+(num_var-1)*2),
err = NF_PUT_ATT_DOUBLE( fid2, varId(2+(num_var-1)*2),
& '_FillValue', NF_DOUBLE, 1, 0. _d 0 )
CALL PROFILES_NF_ERROR(
& 'INIT_NCFILE: NF_PUT_ATT_DOUBLE varid(2+(num_var-1)*2',
& 'INIT_NCFILE: NF_PUT_ATT_DOUBLE varId(2+(num_var-1)*2',
& err,bi,bj,myThid )

err = NF_DEF_VAR( fid2, prof_namesmask(num_file,num_var),
& NF_DOUBLE, 2, vecid, varid(3+(num_var-1)*2) )
& NF_DOUBLE, 2, vecid, varId(3+(num_var-1)*2) )
CALL PROFILES_NF_ERROR(
& 'INIT_NCFILE: NF_DEF_VAR prof_namesmask',
& err,bi,bj,myThid )
err = NF_PUT_ATT_DOUBLE( fid2, varid(3+(num_var-1)*2),
err = NF_PUT_ATT_DOUBLE( fid2, varId(3+(num_var-1)*2),
& '_FillValue', NF_DOUBLE, 1, 0. _d 0 )
CALL PROFILES_NF_ERROR(
& 'INIT_NCFILE: NF_PUT_ATT_DOUBLE varid(3+(num_var-1)*2',
& 'INIT_NCFILE: NF_PUT_ATT_DOUBLE varId(3+(num_var-1)*2',
& err,bi,bj,myThid )

ELSE
Expand Down
46 changes: 23 additions & 23 deletions pkg/profiles/profiles_make_ncfile.F
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,9 +35,9 @@ SUBROUTINE PROFILES_MAKE_NCFILE( myThid )
INTEGER kLev, kProf, k
INTEGER num_file,num_var,prof_num
INTEGER bi,bj,iG,jG
INTEGER err,dimid,irec,fid1,fid2
INTEGER dimid1,dimid2,vecid(2)
INTEGER varid0,varid1(NVARMAX*2),varid2(NVARMAX*2)
INTEGER err,dimId,irec,fid1,fid2
INTEGER dimId1,dimId2,vecid(2)
INTEGER varId0,varId1(NVARMAX*2),varId2(NVARMAX*2)
INTEGER length,Zlength,optimcycle
INTEGER IL,JL
INTEGER vec_start(2),vec_count(2)
Expand Down Expand Up @@ -164,21 +164,21 @@ SUBROUTINE PROFILES_MAKE_NCFILE( myThid )
CALL PROFILES_NF_ERROR(
& 'MAKE_NCFILE: NF_OPEN('//fnamedata(1:IL+3)//')',
& err,bi,bj,myThid )
err = NF_INQ_DIMID( fid1,'iPROF', dimid )
err = NF_INQ_DIMID( fid1,'iPROF', dimId )
CALL PROFILES_NF_ERROR( 'MAKE_NCFILE: NF_INQ_DIMID iPROF',
& err,bi,bj,myThid )
err = NF_INQ_DIMLEN( fid1, dimid, length )
err = NF_INQ_DIMLEN( fid1, dimId, length )
CALL PROFILES_NF_ERROR( 'MAKE_NCFILE: NF_INQ_DIMLEN length',
& err,bi,bj,myThid )
err = NF_INQ_DIMID( fid1,'iDEPTH', dimid )
err = NF_INQ_DIMID( fid1,'iDEPTH', dimId )
CALL PROFILES_NF_ERROR( 'MAKE_NCFILE: NF_INQ_DIMID iDEPTH',
& err,bi,bj,myThid )
IF (err.NE.NF_NOERR) THEN
err = NF_INQ_DIMID( fid1,'Z', dimid )
err = NF_INQ_DIMID( fid1,'Z', dimId )
CALL PROFILES_NF_ERROR( 'MAKE_NCFILE: NF_INQ_DIMID Z',
& err,bi,bj,myThid )
ENDIF
err = NF_INQ_DIMLEN( fid1, dimid, Zlength )
err = NF_INQ_DIMLEN( fid1, dimId, Zlength )
CALL PROFILES_NF_ERROR(
& 'MAKE_NCFILE: NF_INQ_DIMLEN Zlength',
& err,bi,bj,myThid )
Expand All @@ -195,47 +195,47 @@ SUBROUTINE PROFILES_MAKE_NCFILE( myThid )
CALL PROFILES_NF_ERROR(
& 'MAKE_NCFILE: NF_CREATE('//fnameequinc(1:JL)//')',
& err,bi,bj,myThid )
err = NF_DEF_DIM(fid2,'iDEPTH',Zlength,dimid1)
err = NF_DEF_DIM(fid2,'iDEPTH',Zlength,dimId1)
CALL PROFILES_NF_ERROR( 'MAKE_NCFILE: NF_DEF_DIM iDepth',
& err,bi,bj,myThid )
err = NF_DEF_DIM(fid2,'iPROF',length,dimid2)
err = NF_DEF_DIM(fid2,'iPROF',length,dimId2)
CALL PROFILES_NF_ERROR( 'MAKE_NCFILE: NF_DEF_DIM iPROF',
& err,bi,bj,myThid )

vecid(1)=dimid1
vecid(2)=dimid2
vecid(1)=dimId1
vecid(2)=dimId2

C Define variables and attributes
DO num_var = 1, NVARMAX
err = NF_INQ_VARID( fid1, prof_names(num_file,num_var),
& varid0 )
& varId0 )
CALL PROFILES_NF_ERROR( 'MAKE_NCFILE: NF_INQ_VARID('
& //prof_names(num_file,num_var)//')',
& err,bi,bj,myThid )

IF (err.EQ.NF_NOERR) THEN
err = NF_DEF_VAR( fid2,
& prof_namesequi(num_file,num_var),
& NF_DOUBLE, 2, vecid, varid1(2+(num_var-1)*2) )
& NF_DOUBLE, 2, vecid, varId1(2+(num_var-1)*2) )
CALL PROFILES_NF_ERROR(
'MAKE_NCFILE: NF_DEF_VAR prof_namesequi',
& err,bi,bj,myThid )
err = NF_PUT_ATT_DOUBLE( fid2,varid1(2+(num_var-1)*2),
err = NF_PUT_ATT_DOUBLE( fid2,varId1(2+(num_var-1)*2),
& '_FillValue', NF_DOUBLE, 1, 0. _d 0 )
CALL PROFILES_NF_ERROR(
& 'MAKE_NCFILE: NF_PUT_ATT_DOUBLE varid(2',
& 'MAKE_NCFILE: NF_PUT_ATT_DOUBLE varId(2',
& err,bi,bj,myThid )

err = NF_DEF_VAR( fid2,
& prof_namesmask(num_file,num_var),
& NF_DOUBLE, 2, vecid, varid1(3+(num_var-1)*2) )
& NF_DOUBLE, 2, vecid, varId1(3+(num_var-1)*2) )
CALL PROFILES_NF_ERROR(
'MAKE_NCFILE: NF_DEF_VAR prof_namesmask',
& err,bi,bj,myThid )
err = NF_PUT_ATT_DOUBLE( fid2,varid1(3+(num_var-1)*2),
err = NF_PUT_ATT_DOUBLE( fid2,varId1(3+(num_var-1)*2),
& '_FillValue', NF_DOUBLE, 1, 0. _d 0 )
CALL PROFILES_NF_ERROR(
& 'MAKE_NCFILE: NF_PUT_ATT_DOUBLE varid(3',
& 'MAKE_NCFILE: NF_PUT_ATT_DOUBLE varId(3',
& err,bi,bj,myThid )

ENDIF
Expand Down Expand Up @@ -274,25 +274,25 @@ SUBROUTINE PROFILES_MAKE_NCFILE( myThid )

err = NF_INQ_VARID( fid2,
& prof_namesequi(num_file,num_var),
& varid2(2+(num_var-1)*2) )
& varId2(2+(num_var-1)*2) )
CALL PROFILES_NF_ERROR(
& 'MAKE_NCFILE: NF_INQ_VARID prof_namesequi',
& err,bi,bj,myThid )
err = NF_PUT_VARA_DOUBLE( fid2,
& varid2(2+(num_var-1)*2),
& varId2(2+(num_var-1)*2),
& vec_start, vec_count, prof_traj1D )
CALL PROFILES_NF_ERROR(
& 'MAKE_NCFILE: NF_PUT_VARA_DOUBLE prof_traj1D',
& err,bi,bj,myThid )

err = NF_INQ_VARID( fid2,
& prof_namesmask(num_file,num_var),
& varid2(3+(num_var-1)*2) )
& varId2(3+(num_var-1)*2) )
CALL PROFILES_NF_ERROR(
& 'MAKE_NCFILE: NF_INQ_VARID prof_namesmask',
& err,bi,bj,myThid )
err = NF_PUT_VARA_DOUBLE( fid2,
& varid2(3+(num_var-1)*2),
& varId2(3+(num_var-1)*2),
& vec_start, vec_count, prof_mask1D )
CALL PROFILES_NF_ERROR(
& 'MAKE_NCFILE: NF_PUT_VARA_DOUBLE prof_mask1D',
Expand Down
18 changes: 9 additions & 9 deletions pkg/profiles/profiles_readvector.F
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ SUBROUTINE PROFILES_READVECTOR(fNb, vNb, irec,

C !LOCAL VARIABLES:
INTEGER num_var,v1,v2
INTEGER err,varid1,tmpprofno
INTEGER err,varId1,tmpprofno
#ifdef ALLOW_PROFILES
INTEGER vec_start(2),vec_count(2)
_RL vec_tmp1(1000*NLEVELMAX),vec_tmp2(1000*NLEVELMAX)
Expand All @@ -48,10 +48,10 @@ SUBROUTINE PROFILES_READVECTOR(fNb, vNb, irec,
IF ( (irec.LT.profiles_minind_buff(bi,bj)) .OR.
& (irec.GT.profiles_maxind_buff(bi,bj)) .OR.
& (profiles_curfile_buff(bi,bj).NE.fNb) ) THEN
err = NF_INQ_DIMID(fiddata(fNb,bi,bj),'iPROF', varid1)
err = NF_INQ_DIMID(fiddata(fNb,bi,bj),'iPROF', varId1)
CALL PROFILES_NF_ERROR( 'READVECTOR: NF_INQ_DIMID fiddata',
& err,bi,bj,myThid )
err = NF_INQ_DIMLEN( fiddata(fNb,bi,bj), varid1, tmpprofno )
err = NF_INQ_DIMLEN( fiddata(fNb,bi,bj), varId1, tmpprofno )
CALL PROFILES_NF_ERROR( 'READVECTOR: NF_INQ_DIMLEN tmpprofno',
& err,bi,bj,myThid )

Expand Down Expand Up @@ -92,35 +92,35 @@ SUBROUTINE PROFILES_READVECTOR(fNb, vNb, irec,
DO num_var = 1, NVARMAX
IF (vec_quantities(fNb,num_var,bi,bj).EQV..TRUE.) THEN
err = NF_INQ_VARID( fiddata(fNb,bi,bj),
& prof_names(fNb,num_var), varid1 )
& prof_names(fNb,num_var), varId1 )
CALL PROFILES_NF_ERROR(
& 'READVECTOR: NF_INQ_VARID prof_names',
& err,bi,bj,myThid )
err = NF_GET_VARA_DOUBLE( fiddata(fNb,bi,bj), varid1,
err = NF_GET_VARA_DOUBLE( fiddata(fNb,bi,bj), varId1,
& vec_start, vec_count, vec_tmp1 )
CALL PROFILES_NF_ERROR(
& 'READVECTOR: NF_GET_VARA_DOUBLE vec_tmp1',
& err,bi,bj,myThid )

err = NF_INQ_VARID( fiddata(fNb,bi,bj),
& prof_namesweight(fNb,num_var), varid1 )
& prof_namesweight(fNb,num_var), varId1 )
CALL PROFILES_NF_ERROR(
& 'READVECTOR: NF_INQ_VARID prof_namesweight',
& err,bi,bj,myThid )
err = NF_GET_VARA_DOUBLE( fiddata(fNb,bi,bj),
& varid1, vec_start, vec_count, vec_tmp2 )
& varId1, vec_start, vec_count, vec_tmp2 )
CALL PROFILES_NF_ERROR(
& 'READVECTOR: NF_GET_VARA_DOUBLE vec_tmp2',
& err,bi,bj,myThid )

# ifdef ALLOW_PROFILES_CLIMMASK
err = NF_INQ_VARID( fiddata(fNb,bi,bj),
& prof_namesclim(fNb,num_var),varid1 )
& prof_namesclim(fNb,num_var),varId1 )
CALL PROFILES_NF_ERROR(
& 'READVECTOR: NF_INQ_VARID prof_namesclim',
& err,bi,bj,myThid )
err = NF_GET_VARA_DOUBLE( fiddata(fNb,bi,bj),
& varid1,vec_start,vec_count, vec_tmp3 )
& varId1,vec_start,vec_count, vec_tmp3 )
CALL PROFILES_NF_ERROR(
& 'READVECTOR: NF_GET_VARA_DOUBLE vec_tmp3',
& err,bi,bj,myThid )
Expand Down

0 comments on commit ec57ffb

Please sign in to comment.