Skip to content

Change all instances of !$ to !, unless followed by OMP #671

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

Merged
Whyborn merged 1 commit into from
Jan 11, 2026
Merged

Change all instances of !$ to !, unless followed by OMP #671

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 4 additions & 4 deletions src/offline/CASAONLY_LUC.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -255,10 +255,10 @@ SUBROUTINE CASAONLY_LUC( dels,kstart,kend,veg,soil,casabiome,casapool, &
CALL POP_IO( pop, casamet, YYYY, 'WRITE_EPI', &
( YYYY.EQ.cable_user%YearEnd ) )

!!$ WHERE (pop%pop_grid(:)%cmass_sum_old.gt.0.1 .and. pop%pop_grid(:)%cmass_sum.gt.0.1 )
!!$ casapool%Cplant(Iw,2) = casapool%Cplant(Iw,2)*(1.0- min( POP%pop_grid(:)%cat_mortality/(POP%pop_grid(:)%cmass_sum_old),0.99))
!!$ casapool%Nplant(Iw,2) = casapool%Nplant(Iw,2)*(1.0- min( POP%pop_grid(:)%cat_mortality/(POP%pop_grid(:)%cmass_sum_old),0.99))
!!$ ENDWHERE
!! WHERE (pop%pop_grid(:)%cmass_sum_old.gt.0.1 .and. pop%pop_grid(:)%cmass_sum.gt.0.1 )
!! casapool%Cplant(Iw,2) = casapool%Cplant(Iw,2)*(1.0- min( POP%pop_grid(:)%cat_mortality/(POP%pop_grid(:)%cmass_sum_old),0.99))
!! casapool%Nplant(Iw,2) = casapool%Nplant(Iw,2)*(1.0- min( POP%pop_grid(:)%cat_mortality/(POP%pop_grid(:)%cmass_sum_old),0.99))
!! ENDWHERE


CALL POP_LUC_CASA_transfer(POPLUC,POP,LUC_EXPT,casapool,casabal,casaflux,ktauday)
Expand Down
Binary file modified src/offline/TumbaFluxnet.1.3_met.nc
View file
Open in desktop
Binary file not shown.
74 changes: 37 additions & 37 deletions src/offline/cable_cru_TRENDY.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -432,17 +432,17 @@ SUBROUTINE CRU_GET_FILENAME ( CRU, cyear, par, FN )

! Build the rest of the filename according to the value of par, which references 11 possible
! types of met through the parameter names rain, lwdn, etc.
!$ SELECT CASE ( par )
!$ CASE(rain) ; FN = TRIM(FN)//"/rain/cruncep2015_1_rain_"//cy//".daymean.nc"
!$ CASE(lwdn) ; FN = TRIM(FN)//"/lwdown/cruncep2015_1_lwdown_"//cy//".daymean.nc"
!$ CASE(swdn) ; FN = TRIM(FN)//"/swdown/cruncep2015_1_swdown_"//cy//".daymean.nc"
!$ CASE(pres) ; FN = TRIM(FN)//"/press/cruncep2015_1_press_"//cy//".daymean.nc"
!$ CASE(qair) ; FN = TRIM(FN)//"/qair/cruncep2015_1_qair_"//cy//".daymean.nc"
!$ CASE(tmax,PrevTmax) ; FN = TRIM(FN)//"/tmax/cruncep2015_1_tair_"//cy//".daymax.nc"
!$ CASE(tmin,NextTmin) ; FN = TRIM(FN)//"/tmin/cruncep2015_1_tair_"//cy//".daymin.nc"
!$ CASE(uwind) ; FN = TRIM(FN)//"/uwind/cruncep2015_1_uwind_"//cy//".daymean.nc"
!$ CASE(vwind) ; FN = TRIM(FN)//"/vwind/cruncep2015_1_vwind_"//cy//".daymean.nc"
!$ END SELECT
! SELECT CASE ( par )
! CASE(rain) ; FN = TRIM(FN)//"/rain/cruncep2015_1_rain_"//cy//".daymean.nc"
! CASE(lwdn) ; FN = TRIM(FN)//"/lwdown/cruncep2015_1_lwdown_"//cy//".daymean.nc"
! CASE(swdn) ; FN = TRIM(FN)//"/swdown/cruncep2015_1_swdown_"//cy//".daymean.nc"
! CASE(pres) ; FN = TRIM(FN)//"/press/cruncep2015_1_press_"//cy//".daymean.nc"
! CASE(qair) ; FN = TRIM(FN)//"/qair/cruncep2015_1_qair_"//cy//".daymean.nc"
! CASE(tmax,PrevTmax) ; FN = TRIM(FN)//"/tmax/cruncep2015_1_tair_"//cy//".daymax.nc"
! CASE(tmin,NextTmin) ; FN = TRIM(FN)//"/tmin/cruncep2015_1_tair_"//cy//".daymin.nc"
! CASE(uwind) ; FN = TRIM(FN)//"/uwind/cruncep2015_1_uwind_"//cy//".daymean.nc"
! CASE(vwind) ; FN = TRIM(FN)//"/vwind/cruncep2015_1_vwind_"//cy//".daymean.nc"
! END SELECT


SELECT CASE ( par )
Expand Down Expand Up @@ -624,11 +624,11 @@ SUBROUTINE OPEN_CRU_MET( CRU )

! For S0_TRENDY and initialisation, calculate the required met year for repeatedly cycling through the
! 30 years of 1901-1930 spinup meteorology. For normal runs 1901-2015, MetYear = CYEAR.
!$ IF ( TRIM(CRU%Run) .EQ. 'S0_TRENDY' .OR. ( TRIM(CRU%Run) .EQ. 'S1_TRENDY' )) THEN
!$ MetYear = 1901 + MOD(CRU%CYEAR-RunStartYear,30)
!$ ELSE IF ( TRIM(CRU%Run) .EQ. 'S2_TRENDY' ) THEN
!$ MetYear = CRU%CYEAR
!$ ENDIF
! IF ( TRIM(CRU%Run) .EQ. 'S0_TRENDY' .OR. ( TRIM(CRU%Run) .EQ. 'S1_TRENDY' )) THEN
! MetYear = 1901 + MOD(CRU%CYEAR-RunStartYear,30)
! ELSE IF ( TRIM(CRU%Run) .EQ. 'S2_TRENDY' ) THEN
! MetYear = CRU%CYEAR
! ENDIF
IF ( TRIM(CRU%Run) .EQ. 'S0_TRENDY' .OR. ( TRIM(CRU%Run) .EQ. 'S1_TRENDY' ) &
.OR. ( TRIM(CRU%Run) .EQ. 'S0_TRENDY_CO2') &
.OR. ( TRIM(CRU%Run) .EQ. 'S0_TRENDY_Ndep' )) THEN
Expand Down Expand Up @@ -742,13 +742,13 @@ SUBROUTINE CRU_GET_DAILY_MET( CRU, LastDayOfYear, LastYearOfMet )
! Stop with error for anything else.


!$ IF ( TRIM(CRU%Run) .EQ. 'S0_TRENDY' .OR. ( TRIM(CRU%Run) .EQ. 'S1_TRENDY' )) THEN
!$ MetYear = 1901 + MOD(CRU%CYEAR-RunStartYear,30)
!$ ELSE IF ( TRIM(CRU%Run) .EQ. 'S2_TRENDY' ) THEN
!$ MetYear = CRU%CYEAR
!$ ELSE
!$ STOP 'Error in cable_cru.F90: CRU%Run not S0_TRENDY, S1_TRENDY, or 1901-2015'
!$ ENDIF
! IF ( TRIM(CRU%Run) .EQ. 'S0_TRENDY' .OR. ( TRIM(CRU%Run) .EQ. 'S1_TRENDY' )) THEN
! MetYear = 1901 + MOD(CRU%CYEAR-RunStartYear,30)
! ELSE IF ( TRIM(CRU%Run) .EQ. 'S2_TRENDY' ) THEN
! MetYear = CRU%CYEAR
! ELSE
! STOP 'Error in cable_cru.F90: CRU%Run not S0_TRENDY, S1_TRENDY, or 1901-2015'
! ENDIF

!print *, "runstartyear, metyear", runstartyear, metyear

Expand Down Expand Up @@ -888,11 +888,11 @@ SUBROUTINE CRU_GET_DAILY_MET( CRU, LastDayOfYear, LastYearOfMet )
t = 1 ! Time index is set to the first day of the next year

! Add one to the calculation of MetYear
!$ IF ( TRIM(CRU%Run) .EQ. 'S0_TRENDY' .OR. ( TRIM(CRU%Run) .EQ. 'S1_TRENDY' )) THEN
!$ NextMetYear = 1901 + MOD(CRU%CYEAR + 1 - RunStartYear,30)
!$ ELSE IF ( TRIM(CRU%Run) .EQ. 'S2_TRENDY' ) THEN
!$ NextMetYear = CRU%CYEAR + 1
!$ ENDIF
! IF ( TRIM(CRU%Run) .EQ. 'S0_TRENDY' .OR. ( TRIM(CRU%Run) .EQ. 'S1_TRENDY' )) THEN
! NextMetYear = 1901 + MOD(CRU%CYEAR + 1 - RunStartYear,30)
! ELSE IF ( TRIM(CRU%Run) .EQ. 'S2_TRENDY' ) THEN
! NextMetYear = CRU%CYEAR + 1
! ENDIF
IF ( TRIM(CRU%Run) .EQ. 'S0_TRENDY' .OR. ( TRIM(CRU%Run) .EQ. 'S1_TRENDY' ) &
.OR. ( TRIM(CRU%Run) .EQ. 'S0_TRENDY_CO2') &
.OR. ( TRIM(CRU%Run) .EQ. 'S0_TRENDY_Ndep' )) THEN
Expand Down Expand Up @@ -1384,15 +1384,15 @@ SUBROUTINE CRU_GET_SUBDIURNAL_MET(CRU, MET, CurYear, ktau, kend, LastYearOfMet )
! calculate snowfall based on total precip and air T
!(ref Jin et al. Table II, Hyd Proc, 1999)

!$ if (WG%Temp(iland) > 2.5) then
!$ met%precip_sn(is:ie) = 0.0
!$ elseif ((WG%Temp(iland) <= 2.5) .and. (WG%Temp(iland) > 2.0)) then
!$ met%precip_sn(is:ie) = 0.6* met%precip(is:ie)
!$ elseif ((WG%Temp(iland) <= 2.0) .and. (WG%Temp(iland) > 0.0)) then
!$ met%precip_sn(is:ie) = (1.0 - (54.62 - 0.2 *(WG%Temp(iland) + 273.15)))* met%precip(is:ie) ! this facr can be > 1 !
!$ elseif (WG%Temp(iland) <= 0.0) then
!$ met%precip_sn(is:ie) = met%precip(is:ie)
!$ endif
! if (WG%Temp(iland) > 2.5) then
! met%precip_sn(is:ie) = 0.0
! elseif ((WG%Temp(iland) <= 2.5) .and. (WG%Temp(iland) > 2.0)) then
! met%precip_sn(is:ie) = 0.6* met%precip(is:ie)
! elseif ((WG%Temp(iland) <= 2.0) .and. (WG%Temp(iland) > 0.0)) then
! met%precip_sn(is:ie) = (1.0 - (54.62 - 0.2 *(WG%Temp(iland) + 273.15)))* met%precip(is:ie) ! this facr can be > 1 !
! elseif (WG%Temp(iland) <= 0.0) then
! met%precip_sn(is:ie) = met%precip(is:ie)
! endif

IF (WG%Temp(iland) <= 0.0) THEN
met%precip_sn(is:ie) = met%precip(is:ie)
Expand Down
42 changes: 21 additions & 21 deletions src/offline/cable_initialise.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -417,10 +417,10 @@ SUBROUTINE get_restart_data(logn,ssnow,canopy,rough,bgc, &
ssnow%GWwb = 0.95*soil%ssat
END IF

!$ IF(cable_user%SOIL_STRUC=='sli'.or.cable_user%FWSOIL_SWITCH=='Haverd2013') THEN
!$ CALL readpar(ncid_rin,'gamma',dummy,veg%gamma,filename%restart_in, &
!$ max_vegpatches,'def',from_restart,mp)
!$ ENDIF
! IF(cable_user%SOIL_STRUC=='sli'.or.cable_user%FWSOIL_SWITCH=='Haverd2013') THEN
! CALL readpar(ncid_rin,'gamma',dummy,veg%gamma,filename%restart_in, &
! max_vegpatches,'def',from_restart,mp)
! ENDIF

IF(cable_user%SOIL_STRUC=='sli') THEN
CALL readpar(ncid_rin,'S',dummy,ssnow%S,filename%restart_in, &
Expand All @@ -437,23 +437,23 @@ SUBROUTINE get_restart_data(logn,ssnow,canopy,rough,bgc, &
max_vegpatches,'snow',from_restart,mp)
CALL readpar(ncid_rin,'sconds',dummy,ssnow%sconds,filename%restart_in, &
max_vegpatches,'snow',from_restart,mp)
!$ CALL readpar(ncid_rin,'ZR',dummy,veg%ZR, &
!$ filename%restart_in,max_vegpatches,'def',from_restart,mp)
!$ CALL readpar(ncid_rin,'F10',dummy,veg%F10, &
!$ filename%restart_in,max_vegpatches,'def',from_restart,mp)
!$ CALL readpar(ncid_rin,'zeta',dummy,soil%zeta,filename%restart_in, &
!$ max_vegpatches,'def',from_restart,mp)
!$ CALL readpar(ncid_rin,'fsatmax',dummy,soil%fsatmax,filename%restart_in, &
!$ max_vegpatches,'def',from_restart,mp)
!$ CALL readpar(ncid_rin,'nhorizons',dummy,soil%nhorizons,filename%restart_in, &
!$ max_vegpatches,'def',from_restart,mp)
!$ ALLOCATE(var_r2(mp,ms))
!$ CALL readpar(ncid_rin,'ishorizon',dummy,var_r2,filename%restart_in, &
!$ max_vegpatches,'ms',from_restart,mp)
!$ soil%ishorizon = int(var_r2)
!$ DEALLOCATE(var_r2)
!$ CALL readpar(ncid_rin,'clitt',dummy,veg%clitt,filename%restart_in, &
!$ max_vegpatches,'def',from_restart,mp)
! CALL readpar(ncid_rin,'ZR',dummy,veg%ZR, &
! filename%restart_in,max_vegpatches,'def',from_restart,mp)
! CALL readpar(ncid_rin,'F10',dummy,veg%F10, &
! filename%restart_in,max_vegpatches,'def',from_restart,mp)
! CALL readpar(ncid_rin,'zeta',dummy,soil%zeta,filename%restart_in, &
! max_vegpatches,'def',from_restart,mp)
! CALL readpar(ncid_rin,'fsatmax',dummy,soil%fsatmax,filename%restart_in, &
! max_vegpatches,'def',from_restart,mp)
! CALL readpar(ncid_rin,'nhorizons',dummy,soil%nhorizons,filename%restart_in, &
! max_vegpatches,'def',from_restart,mp)
! ALLOCATE(var_r2(mp,ms))
! CALL readpar(ncid_rin,'ishorizon',dummy,var_r2,filename%restart_in, &
! max_vegpatches,'ms',from_restart,mp)
! soil%ishorizon = int(var_r2)
! DEALLOCATE(var_r2)
! CALL readpar(ncid_rin,'clitt',dummy,veg%clitt,filename%restart_in, &
! max_vegpatches,'def',from_restart,mp)
ENDIF
CALL readpar(ncid_rin,'cansto',dummy,canopy%cansto,filename%restart_in, &
max_vegpatches,'def',from_restart,mp)
Expand Down
6 changes: 3 additions & 3 deletions src/offline/cable_input.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1138,9 +1138,9 @@ SUBROUTINE open_met_file(dels,koffset,kend,spinup, TFRZ)
(ok,'Error finding LWdown units in met data file ' &
//TRIM(filename%met)//' (SUBROUTINE open_met_file)')
! vh_js ! fixed bug in logic
!$ IF(metunits%LWdown(1:4)/='W/m2'.AND.metunits%LWdown(1:5) &
!$ /='W/m^2'.AND.metunits%LWdown(1:5)/='Wm^-2' &
!$ .AND.metunits%LWdown(1:4)/='Wm-2') THEN
! IF(metunits%LWdown(1:4)/='W/m2'.AND.metunits%LWdown(1:5) &
! /='W/m^2'.AND.metunits%LWdown(1:5)/='Wm^-2' &
! .AND.metunits%LWdown(1:4)/='Wm-2') THEN
IF(.NOT.(metunits%LWdown(1:4)/='W/m2'.OR.metunits%LWdown(1:5) &
/='W/m^2'.OR.metunits%LWdown(1:5)/='Wm^-2' &
.OR.metunits%LWdown(1:4)/='Wm-2'.OR.metunits%SWdown(1:5) /= 'W m-2')) THEN
Expand Down
Loading