Changeset 5185 for LMDZ6/branches/Amaury_dev/libf/phylmd/ecrad

Timestamp:

Sep 11, 2024, 4:27:07 PM (9 days ago)

Author:

abarral

Message:

Replace REPROBUS CPP KEY by logical using handmade wonky wrapper

Location:

LMDZ6/branches/Amaury_dev/libf/phylmd/ecrad

Files:

• driver/ecrad_driver.F90 (modified) (1 diff)
• driver/ecrad_driver_config.F90 (modified) (1 diff)
• driver/ecrad_driver_read_input.F90 (modified) (8 diffs)
• driver/ifs_blocking.F90 (modified) (2 diffs)
• ifsaux/abor1.F90 (modified) (1 diff)
• radiation/radiation_aerosol_optics.F90 (modified) (3 diffs)
• radiation/radiation_aerosol_optics_data.F90 (modified) (1 diff)
• radiation/radiation_aerosol_optics_description.F90 (modified) (8 diffs)
• radiation/radiation_check.F90 (modified) (7 diffs)
• radiation/radiation_cloud_generator.F90 (modified) (4 diffs)
• radiation/radiation_cloud_optics.F90 (modified) (2 diffs)
• radiation/radiation_config.F90 (modified) (11 diffs)
• radiation/radiation_ecckd.F90 (modified) (3 diffs)
• radiation/radiation_ecckd_interface.F90 (modified) (4 diffs)
• radiation/radiation_flux.F90 (modified) (5 diffs)
• radiation/radiation_gas.F90 (modified) (3 diffs)
• radiation/radiation_homogeneous_lw.F90 (modified) (2 diffs)
• radiation/radiation_homogeneous_sw.F90 (modified) (1 diff)
• radiation/radiation_ifs_rrtm.F90 (modified) (4 diffs)
• radiation/radiation_interface.F90 (modified) (3 diffs)
• radiation/radiation_save.F90 (modified) (13 diffs)
• radiation/radiation_single_level.F90 (modified) (1 diff)
• radiation/radiation_spartacus_lw.F90 (modified) (5 diffs)
• radiation/radiation_spartacus_sw.F90 (modified) (8 diffs)
• radiation/radiation_spectral_definition.F90 (modified) (4 diffs)
• radiation/radiation_tripleclouds_lw.F90 (modified) (4 diffs)
• radiation/radiation_tripleclouds_lw.F90.or (modified) (4 diffs)
• radiation/radiation_tripleclouds_sw.F90 (modified) (3 diffs)
• utilities/easy_netcdf.F90 (modified) (16 diffs)
• utilities/print_matrix.F90 (modified) (1 diff)

LMDZ6/branches/Amaury_dev/libf/phylmd/ecrad/driver/ecrad_driver.F90

@@ -200 +200 @@
   end if
 
-  if (driver_config%do_save_cloud_optics .and. config%use_general_cloud_optics) then
+  if (driver_config%do_save_cloud_optics .AND. config%use_general_cloud_optics) then
     call save_general_cloud_optics(config, 'hydrometeor_optics', iverbose=driver_config%iverbose)
   end if

LMDZ6/branches/Amaury_dev/libf/phylmd/ecrad/driver/ecrad_driver_config.F90

@@ -355 +355 @@
 
     if (do_override_eff_size &
-         &  .and. (this%high_inv_effective_size_override < 0.0_jprb &
+         &  .AND. (this%high_inv_effective_size_override < 0.0_jprb &
               .or. this%middle_inv_effective_size_override < 0.0_jprb &
               .or. this%low_inv_effective_size_override < 0.0_jprb)) then

LMDZ6/branches/Amaury_dev/libf/phylmd/ecrad/driver/ecrad_driver_read_input.F90

@@ -103 +103 @@
     else
       single_level%solar_irradiance = 1366.0_jprb
-      if (driver_config%iverbose >= 1 .and. config%do_sw) then
+      if (driver_config%iverbose >= 1 .AND. config%do_sw) then
         write(nulout,'(a,g10.3,a)') 'Warning: solar irradiance set to ', &
              &  single_level%solar_irradiance, ' W m-2'
@@ -204 +204 @@
       ! Optional scaling of liquid water mixing ratio
       if (driver_config%q_liq_scaling >= 0.0_jprb &
-           &  .and. driver_config%q_liq_scaling /= 1.0_jprb) then
+           &  .AND. driver_config%q_liq_scaling /= 1.0_jprb) then
         cloud%q_liq = cloud%q_liq * driver_config%q_liq_scaling
         if (driver_config%iverbose >= 2) then
@@ -213 +213 @@
 
       ! Optional scaling of ice water mixing ratio
-      if (driver_config%q_ice_scaling >= 0.0_jprb .and. driver_config%q_ice_scaling /= 1.0_jprb) then
+      if (driver_config%q_ice_scaling >= 0.0_jprb .AND. driver_config%q_ice_scaling /= 1.0_jprb) then
         cloud%q_ice = cloud%q_ice * driver_config%q_ice_scaling
         if (driver_config%iverbose >= 2) then
@@ -223 +223 @@
       ! Optional scaling of cloud fraction
       if (driver_config%cloud_fraction_scaling >= 0.0_jprb &
-           &  .and. driver_config%cloud_fraction_scaling /= 1.0_jprb) then
+           &  .AND. driver_config%cloud_fraction_scaling /= 1.0_jprb) then
         cloud%fraction = cloud%fraction * driver_config%cloud_fraction_scaling
         if (driver_config%iverbose >= 2) then
@@ -332 +332 @@
 
         else if (driver_config%cloud_separation_scale_surface > 0.0_jprb &
-             &  .and. driver_config%cloud_separation_scale_toa > 0.0_jprb) then
+             &  .AND. driver_config%cloud_separation_scale_toa > 0.0_jprb) then
           ! (2) Cloud separation scale provided in namelist
 
@@ -386 +386 @@
           allocate(cloud%inv_inhom_effective_size(ncol,nlev))
           where (cloud%fraction > config%cloud_fraction_threshold &
-               &  .and. cloud%fraction < 1.0_jprb - config%cloud_fraction_threshold)
+               &  .AND. cloud%fraction < 1.0_jprb - config%cloud_fraction_threshold)
             ! Convert effective cloud separation to effective cloud
             ! size, noting divisions rather than multiplications
@@ -442 +442 @@
         ! In cases (3) and (4) above the effective size obtained from
         ! the NetCDF may be scaled by a namelist variable
-        if (is_cloud_size_scalable .and. driver_config%effective_size_scaling > 0.0_jprb) then
+        if (is_cloud_size_scalable .AND. driver_config%effective_size_scaling > 0.0_jprb) then
           ! Scale cloud effective size
           cloud%inv_cloud_effective_size = cloud%inv_cloud_effective_size &
@@ -477 +477 @@
       allocate(single_level%skin_temperature(ncol))
       single_level%skin_temperature(1:ncol) = thermodynamics%temperature_hl(1:ncol,nlev+1)
-      if (driver_config%iverbose >= 1 .and. config%do_lw &
-           &  .and. driver_config%skin_temperature_override < 0.0_jprb) then 
+      if (driver_config%iverbose >= 1 .AND. config%do_lw &
+           &  .AND. driver_config%skin_temperature_override < 0.0_jprb) then
         write(nulout,'(a)') 'Warning: skin temperature set equal to lowest air temperature'
       end if

LMDZ6/branches/Amaury_dev/libf/phylmd/ecrad/driver/ifs_blocking.F90

@@ -73 +73 @@
   lldebug=(driver_config%iverbose>4)     ! debug
   llactaero = .false.
-  if(yradiation%rad_config%n_aerosol_types > 0 .and.&
-    & yradiation%rad_config%n_aerosol_types <= 21 .and. yradiation%yrerad%naermacc == 0) then
+  if(yradiation%rad_config%n_aerosol_types > 0 .AND.&
+    & yradiation%rad_config%n_aerosol_types <= 21 .AND. yradiation%yrerad%naermacc == 0) then
     llactaero = .true.
   endif
@@ -121 +121 @@
   ifs_config%ihti   =indrad(inext,nlev+1,.true.)
   ifs_config%iaero  =indrad(inext,yradiation%rad_config%n_aerosol_types*nlev,&
-                          & llactaero .and. yradiation%yrerad%naermacc==0)
+                          & llactaero .AND. yradiation%yrerad%naermacc==0)
 
   iinend =inext-1                  ! end of input variables

LMDZ6/branches/Amaury_dev/libf/phylmd/ecrad/ifsaux/abor1.F90

@@ -23 +23 @@
   ! FLUSH not understood by NAG compiler
   !CALL FLUSH(NULOUT)
-  IF (NULOUT /= 0 .and. NULOUT /= 6) CLOSE(NULOUT)
+  IF (NULOUT /= 0 .AND. NULOUT /= 6) CLOSE(NULOUT)
 ENDIF
 

LMDZ6/branches/Amaury_dev/libf/phylmd/ecrad/radiation/radiation_aerosol_optics.F90

@@ -292 +292 @@
           else
             iwn = 1
-            DO while (wavenumber(iwn+1) < wavenumber_target .and. iwn < nwn-1)
+            DO while (wavenumber(iwn+1) < wavenumber_target .AND. iwn < nwn-1)
               iwn = iwn + 1
             end do
@@ -756 +756 @@
               iband = config%i_band_from_reordered_g_sw(jg)
               local_od = od_sw(jg,jlev,jcol) + od_sw_aerosol(iband,jlev)
-              if (local_od > 0.0_jprb .and. od_sw_aerosol(iband,jlev) > 0.0_jprb) then
+              if (local_od > 0.0_jprb .AND. od_sw_aerosol(iband,jlev) > 0.0_jprb) then
                 local_scat = ssa_sw(jg,jlev,jcol) * od_sw(jg,jlev,jcol) &
                      &  + scat_sw_aerosol(iband,jlev)
@@ -785 +785 @@
               iband = config%i_band_from_reordered_g_lw(jg)
               local_od = od_lw(jg,jlev,jcol) + od_lw_aerosol(iband,jlev)
-              if (local_od > 0.0_jprb .and. od_lw_aerosol(iband,jlev) > 0.0_jprb) then
+              if (local_od > 0.0_jprb .AND. od_lw_aerosol(iband,jlev) > 0.0_jprb) then
                 ! All scattering is due to aerosols, therefore the
                 ! asymmetry factor is equal to the value for aerosols

LMDZ6/branches/Amaury_dev/libf/phylmd/ecrad/radiation/radiation_aerosol_optics_data.F90

@@ -378 +378 @@
     end if
 
-    if (n_type_philic > 0 .and. nrh > 0) then
+    if (n_type_philic > 0 .AND. nrh > 0) then
       if (n_bands_sw > 0) then
         allocate(this%mass_ext_sw_philic(n_bands_sw, nrh, n_type_philic))

LMDZ6/branches/Amaury_dev/libf/phylmd/ecrad/radiation/radiation_aerosol_optics_description.F90

@@ -168 +168 @@
       ! Check if we have a match
       if (to_string(this%code_philic(:,ja)) == code_str &
-           &  .and. trim(to_string(this%optical_model_philic(:,ja))) &
+           &  .AND. trim(to_string(this%optical_model_philic(:,ja))) &
            &          == optical_model_str) then
         this%is_preferred_philic(ja) = .true.
@@ -178 +178 @@
     DO ja = 1,size(this%bin_phobic)
       if (to_string(this%code_phobic(:,ja)) == code_str &
-           &  .and. trim(to_string(this%optical_model_phobic(:,ja))) &
+           &  .AND. trim(to_string(this%optical_model_phobic(:,ja))) &
            &          == optical_model_str) then
         this%is_preferred_phobic(ja) = .true.
@@ -259 +259 @@
         if (to_string(this%code_philic(:,ja)) == code_str) then
           ! Aerosol code matches
-          if (present(ibin) .and. this%bin_philic(ja) > 0) then
+          if (present(ibin) .AND. this%bin_philic(ja) > 0) then
             if (ibin > 0) then
               if (ibin == this%bin_philic(ja)) then
@@ -291 +291 @@
             current_score = current_score + 2
           end if
-          if (current_score > 0 .and. this%is_preferred_philic(ja)) then
+          if (current_score > 0 .AND. this%is_preferred_philic(ja)) then
             current_score = current_score + 1
           end if
@@ -299 +299 @@
             score = current_score
             is_ambiguous = .false.
-          else if (current_score > 0 .and. current_score == score) then
+          else if (current_score > 0 .AND. current_score == score) then
             is_ambiguous = .true.
           end if
@@ -310 +310 @@
         if (to_string(this%code_phobic(:,ja)) == code_str) then
           ! Aerosol code matches
-          if (present(ibin) .and. this%bin_phobic(ja) > 0) then
+          if (present(ibin) .AND. this%bin_phobic(ja) > 0) then
             if (ibin > 0) then
               if (ibin == this%bin_phobic(ja)) then
@@ -342 +342 @@
             current_score = current_score + 2
           end if
-          if (current_score > 0 .and. this%is_preferred_phobic(ja)) then
+          if (current_score > 0 .AND. this%is_preferred_phobic(ja)) then
             current_score = current_score + 1
           end if
@@ -350 +350 @@
             score = current_score
             is_ambiguous = .false.
-          else if (current_score > 0 .and. current_score == score) then
+          else if (current_score > 0 .AND. current_score == score) then
             is_ambiguous = .true.
           end if          

LMDZ6/branches/Amaury_dev/libf/phylmd/ecrad/radiation/radiation_check.F90

@@ -48 +48 @@
     if (allocated(var)) then
 
-      if (present(i1) .and. present(i2)) then
+      if (present(i1) .AND. present(i2)) then
         varmin = minval(var(i1:i2))
         varmax = maxval(var(i1:i2))
@@ -62 +62 @@
         is_bad = .true.
         if (do_fix) then
-          if (present(i1) .and. present(i2)) then
+          if (present(i1) .AND. present(i2)) then
             var(i1:i2) = max(boundmin, min(boundmax, var(i1:i2)))
           else
@@ -105 +105 @@
     if (allocated(var)) then
 
-      if (present(i1) .and. present(i2)) then
+      if (present(i1) .AND. present(i2)) then
         ii1 = i1
         ii2 = i2
@@ -112 +112 @@
         ii2 = ubound(var,1)
       end if
-      if (present(j1) .and. present(j2)) then
+      if (present(j1) .AND. present(j2)) then
         jj1 = j1
         jj2 = j2
@@ -168 +168 @@
     if (allocated(var)) then
 
-      if (present(i1) .and. present(i2)) then
+      if (present(i1) .AND. present(i2)) then
         ii1 = i1
         ii2 = i2
@@ -175 +175 @@
         ii2 = ubound(var,1)
       end if
-      if (present(j1) .and. present(j2)) then
+      if (present(j1) .AND. present(j2)) then
         jj1 = j1
         jj2 = j2
@@ -182 +182 @@
         jj2 = ubound(var,2)
       end if
-      if (present(k1) .and. present(k2)) then
+      if (present(k1) .AND. present(k2)) then
         kk1 = k1
         kk2 = k2

LMDZ6/branches/Amaury_dev/libf/phylmd/ecrad/radiation/radiation_cloud_generator.F90

@@ -213 +213 @@
           trigger = rand_top(jg) * total_cloud_cover
           jlev = ibegin
-          DO while (trigger > cum_cloud_cover(jlev) .and. jlev < iend)
+          DO while (trigger > cum_cloud_cover(jlev) .AND. jlev < iend)
             jlev = jlev + 1
           end do
@@ -693 +693 @@
 
           ! For each spectral interval, has the first cloud appeared at this level?
-          first_cloud(jg) = (trigger(jg) <= cum_cloud_cover(jlev) .and. .not. found_cloud(jg))
+          first_cloud(jg) = (trigger(jg) <= cum_cloud_cover(jlev) .AND. .not. found_cloud(jg))
 
           ! ...if so, add to found_cloud
@@ -703 +703 @@
           ! prev_cloud)
           is_cloud(jg) = first_cloud(jg) &
-               &  .or. found_cloud(jg) .and. merge(rand_cloud(jg,jlev)*frac(jlev-1) &
+               &  .or. found_cloud(jg) .AND. merge(rand_cloud(jg,jlev)*frac(jlev-1) &
                &               < frac(jlev)+frac(jlev-1)-pair_cloud_cover(jlev-1), &
                &             rand_cloud(jg,jlev)*(cum_cloud_cover(jlev-1) - frac(jlev-1)) &
@@ -716 +716 @@
           rand_inhom(jg,jlev) = merge(merge(rand_inhom(jg,jlev-1), rand_inhom(jg,jlev), &
                &                           rand_inhom2(jg,jlev) < overlap_param_inhom(jlev-1) &
-               &                           .and. prev_cloud(jg)), &
+               &                           .AND. prev_cloud(jg)), &
                &                     0.0_jprb, is_cloud(jg))
         end do

LMDZ6/branches/Amaury_dev/libf/phylmd/ecrad/radiation/radiation_cloud_optics.F90

@@ -137 +137 @@
       end if
     else if (config%i_ice_model == IIceModelBaran &
-         &  .and. size(config%cloud_optics%ice_coeff_lw, 2) &
+         &  .AND. size(config%cloud_optics%ice_coeff_lw, 2) &
          &  /= NIceOpticsCoeffsBaran) then
       write(nulerr,'(a,i0,a,i0,a,i0,a)') &
@@ -145 +145 @@
       call radiation_abort()
     else if (config%i_ice_model == IIceModelBaran2016 &
-         &  .and. size(config%cloud_optics%ice_coeff_lw, 2) &
+         &  .AND. size(config%cloud_optics%ice_coeff_lw, 2) &
          &  /= NIceOpticsCoeffsBaran2016) then
       write(nulerr,'(a,i0,a,i0,a,i0,a)') &

LMDZ6/branches/Amaury_dev/libf/phylmd/ecrad/radiation/radiation_config.F90

@@ -852 +852 @@
     use_updated_solar_spectrum    = this%use_updated_solar_spectrum
 
-    if (present(file_name) .and. present(unit)) then
+    if (present(file_name) .AND. present(unit)) then
       write(nulerr,'(a)') '*** Error: cannot specify both file_name and unit in call to config_type%read'
       call radiation_abort('Radiation configuration error')
-    else if (.not. present(file_name) .and. .not. present(unit)) then
+    else if (.not. present(file_name) .AND. .not. present(unit)) then
       write(nulerr,'(a)') '*** Error: neither file_name nor unit specified in call to config_type%read'
       call radiation_abort('Radiation configuration error')
@@ -1065 +1065 @@
 
     ! Will clouds be used at all?
-    if ((this%do_sw .and. this%i_solver_sw /= ISolverCloudless) &
-         &  .or. (this%do_lw .and. this%i_solver_lw /= ISolverCloudless)) then
+    if ((this%do_sw .AND. this%i_solver_sw /= ISolverCloudless) &
+         &  .or. (this%do_lw .AND. this%i_solver_lw /= ISolverCloudless)) then
       this%do_clouds = .true.
     else
@@ -1073 +1073 @@
 
     if (this%use_general_cloud_optics .or. this%use_general_aerosol_optics) then
-      if (this%do_sw .and. this%do_cloud_aerosol_per_sw_g_point &
-           &  .and. this%i_gas_model_sw == IGasModelIFSRRTMG) then
+      if (this%do_sw .AND. this%do_cloud_aerosol_per_sw_g_point &
+           &  .AND. this%i_gas_model_sw == IGasModelIFSRRTMG) then
         write(nulout,'(a)') 'Warning: RRTMG SW only supports cloud/aerosol/surface optical properties per band, not per g-point'
         this%do_cloud_aerosol_per_sw_g_point = .false.
       end if
-      if (this%do_lw .and. this%do_cloud_aerosol_per_lw_g_point &
-           &  .and. this%i_gas_model_lw == IGasModelIFSRRTMG) then
+      if (this%do_lw .AND. this%do_cloud_aerosol_per_lw_g_point &
+           &  .AND. this%i_gas_model_lw == IGasModelIFSRRTMG) then
         write(nulout,'(a)') 'Warning: RRTMG LW only supports cloud/aerosol/surface optical properties per band, not per g-point'
         this%do_cloud_aerosol_per_lw_g_point = .false.
@@ -1113 +1113 @@
 
     ! Check consistency of models
-    if (this%do_canopy_fluxes_sw .and. .not. this%do_surface_sw_spectral_flux) then
+    if (this%do_canopy_fluxes_sw .AND. .not. this%do_surface_sw_spectral_flux) then
       if (this%iverbosesetup >= 1) then
         write(nulout,'(a)') 'Warning: turning on do_surface_sw_spectral_flux as required by do_canopy_fluxes_sw'
@@ -1121 +1121 @@
 
     ! Will clouds be used at all?
-    if ((this%do_sw .and. this%i_solver_sw /= ISolverCloudless) &
-         &  .or. (this%do_lw .and. this%i_solver_lw /= ISolverCloudless)) then
+    if ((this%do_sw .AND. this%i_solver_sw /= ISolverCloudless) &
+         &  .or. (this%do_lw .AND. this%i_solver_lw /= ISolverCloudless)) then
       this%do_clouds = .true.
     else
@@ -1133 +1133 @@
          & .or. this%i_solver_sw == ISolverTripleclouds &
          & .or. this%i_solver_lw == ISolverTripleclouds) &
-         & .and. this%i_overlap_scheme /= IOverlapExponentialRandom) then
+         & .AND. this%i_overlap_scheme /= IOverlapExponentialRandom) then
       write(nulerr,'(a)') '*** Error: SPARTACUS/Tripleclouds solvers can only do Exponential-Random overlap'
       call radiation_abort('Radiation configuration error')
     end if
 
-    if (jprb < jprd .and. this%iverbosesetup >= 1 &
-         &  .and. (this%i_solver_sw == ISolverSPARTACUS &
+    if (jprb < jprd .AND. this%iverbosesetup >= 1 &
+         &  .AND. (this%i_solver_sw == ISolverSPARTACUS &
          &    .or. this%i_solver_lw == ISolverSPARTACUS)) then
       write(nulout,'(a)') 'Warning: the SPARTACUS solver may be unstable in single precision'
@@ -1297 +1297 @@
     end if
 
-    if (this%use_aerosols .and. this%n_aerosol_types == 0) then
+    if (this%use_aerosols .AND. this%n_aerosol_types == 0) then
       if (this%iverbosesetup >= 2) then
         write(nulout, '(a)') 'Aerosols on but n_aerosol_types=0: optical properties to be computed outside ecRad'
@@ -1324 +1324 @@
     end if
 
-    if (this%i_solver_sw == ISolverSPARTACUS .and. this%do_sw_delta_scaling_with_gases) then
+    if (this%i_solver_sw == ISolverSPARTACUS .AND. this%do_sw_delta_scaling_with_gases) then
       write(nulerr,'(a)') '*** Error: SW delta-Eddington scaling with gases not possible with SPARTACUS solver'
       call radiation_abort('Radiation configuration error')
     end if
 
-    if ((this%do_lw .and. this%do_sw) .and. &
+    if ((this%do_lw .AND. this%do_sw) .AND. &
          & (     (      this%i_solver_sw == ISolverHomogeneous  &
-         &        .and. this%i_solver_lw /= ISolverHomogeneous) &
+         &        .AND. this%i_solver_lw /= ISolverHomogeneous) &
          &  .or. (      this%i_solver_sw /= ISolverHomogeneous  &
-         &        .and. this%i_solver_lw == ISolverHomogeneous) &
+         &        .AND. this%i_solver_lw == ISolverHomogeneous) &
          & ) ) then
       write(nulerr,'(a)') '*** Error: if one solver is "Homogeneous" then the other must be'
@@ -1341 +1341 @@
     ! Set is_homogeneous if the active solvers are homogeneous, since
     ! this affects how "in-cloud" water contents are computed
-    if (        (this%do_sw .and. this%i_solver_sw == ISolverHomogeneous) &
-         & .or. (this%do_lw .and. this%i_solver_lw == ISolverHomogeneous)) then
+    if (        (this%do_sw .AND. this%i_solver_sw == ISolverHomogeneous) &
+         & .or. (this%do_lw .AND. this%i_solver_lw == ISolverHomogeneous)) then
       this%is_homogeneous = .true.
     end if
@@ -1669 +1669 @@
            &  wavelength1, ' to ', wavelength2, ' m is outside shortwave band'
       call radiation_abort('Radiation configuration error')
-    else if (this%iverbosesetup >= 2 .and. present(weighting_name)) then
+    else if (this%iverbosesetup >= 2 .AND. present(weighting_name)) then
       write(nulout,'(a,a,a,f6.0,a,f6.0,a)') 'Spectral weights for ', &
            &  weighting_name, ' (', wavenumber1, ' to ', &
@@ -1741 +1741 @@
     mapping = mapping_local(2:ninterval+1,:)
 
-    if (this%iverbosesetup >= 2 .and. present(weighting_name)) then
+    if (this%iverbosesetup >= 2 .AND. present(weighting_name)) then
       write(nulout,'(a,a)') 'Spectral mapping generated for ', &
            &  weighting_name

LMDZ6/branches/Amaury_dev/libf/phylmd/ecrad/radiation/radiation_ecckd.F90

@@ -376 +376 @@
       DO jwav = 1,nwav-1
         if (wavenumber(jwav) < wavenumber_grid(jwav_grid) &
-             &  .and. wavenumber(jwav+1) >= wavenumber_grid(jwav_grid)) then
+             &  .AND. wavenumber(jwav+1) >= wavenumber_grid(jwav_grid)) then
           ! Linear interpolation - this is not perfect
           ssi_grid(jwav_grid) = (ssi(jwav)*(wavenumber(jwav+1)-wavenumber_grid(jwav_grid)) &
@@ -650 +650 @@
 
       ! Rayleigh scattering
-      if (this%is_sw .and. present(rayleigh_od_fl)) then
+      if (this%is_sw .AND. present(rayleigh_od_fl)) then
         DO jlev = 1,nlev
           rayleigh_od_fl(:,jlev,jcol) = global_multiplier &
@@ -875 +875 @@
 
       ! Rayleigh scattering
-      if (this%is_sw .and. present(rayleigh_od_fl)) then
+      if (this%is_sw .AND. present(rayleigh_od_fl)) then
         DO jcol = istartcol,iendcol
           DO jlev = 1,nlev

LMDZ6/branches/Amaury_dev/libf/phylmd/ecrad/radiation/radiation_ecckd_interface.F90

@@ -39 +39 @@
     if (lhook) call dr_hook('radiation_ecckd_interface:setup_gas_optics',0,hook_handle)
 
-    if (config%do_sw .and. config%i_gas_model_sw == IGasModelECCKD) then
+    if (config%do_sw .AND. config%i_gas_model_sw == IGasModelECCKD) then
 
       ! Read shortwave ecCKD gas optics NetCDF file
@@ -84 +84 @@
     end if
 
-    if (config%do_lw .and. config%i_gas_model_lw == IGasModelECCKD) then
+    if (config%do_lw .AND. config%i_gas_model_lw == IGasModelECCKD) then
 
       ! Read longwave ecCKD gas optics NetCDF file
@@ -255 +255 @@
     end if
     
-    if (config%do_sw .and. config%i_gas_model_sw == IGasModelECCKD) then
+    if (config%do_sw .AND. config%i_gas_model_sw == IGasModelECCKD) then
 
       if (is_volume_mixing_ratio) then
@@ -293 +293 @@
     end if
 
-    if (config%do_lw .and. config%i_gas_model_lw == IGasModelECCKD) then
+    if (config%do_lw .AND. config%i_gas_model_lw == IGasModelECCKD) then
 
       if (is_volume_mixing_ratio) then

LMDZ6/branches/Amaury_dev/libf/phylmd/ecrad/radiation/radiation_flux.F90

@@ -414 +414 @@
     if (lhook) call dr_hook('radiation_flux:calc_surface_spectral',0,hook_handle)
 
-    if (config%do_sw .and. config%do_surface_sw_spectral_flux) then
+    if (config%do_sw .AND. config%do_surface_sw_spectral_flux) then
 
       if (use_indexed_sum_vec) then
@@ -473 +473 @@
 
     ! Fluxes in bands required for canopy radiative transfer
-    if (config%do_sw .and. config%do_canopy_fluxes_sw) then
+    if (config%do_sw .AND. config%do_canopy_fluxes_sw) then
       if (config%use_canopy_full_spectrum_sw) then
         this%sw_dn_diffuse_surf_canopy(:,istartcol:iendcol) = this%sw_dn_diffuse_surf_g(:,istartcol:iendcol)
@@ -525 +525 @@
     end if ! do_canopy_fluxes_sw
 
-    if (config%do_lw .and. config%do_canopy_fluxes_lw) then
+    if (config%do_lw .AND. config%do_canopy_fluxes_lw) then
       if (config%use_canopy_full_spectrum_lw) then
         this%lw_dn_surf_canopy(:,istartcol:iendcol) = this%lw_dn_surf_g(:,istartcol:iendcol)
@@ -592 +592 @@
     if (lhook) call dr_hook('radiation_flux:calc_toa_spectral',0,hook_handle)
 
-    if (config%do_sw .and. config%do_toa_spectral_flux) then
+    if (config%do_sw .AND. config%do_toa_spectral_flux) then
 
       if (use_indexed_sum_vec) then
@@ -627 +627 @@
     end if
 
-    if (config%do_lw .and. config%do_toa_spectral_flux) then
+    if (config%do_lw .AND. config%do_toa_spectral_flux) then
 
       if (use_indexed_sum_vec) then

LMDZ6/branches/Amaury_dev/libf/phylmd/ecrad/radiation/radiation_gas.F90

@@ -380 +380 @@
       if (this%is_present(igas)) then
         if (iunits == IMassMixingRatio &
-             &   .and. this%iunits(igas) == IVolumeMixingRatio) then
+             &   .AND. this%iunits(igas) == IVolumeMixingRatio) then
           sf = sf * GasMolarMass(igas) / AirMolarMass
         else if (iunits == IVolumeMixingRatio &
-             &   .and. this%iunits(igas) == IMassMixingRatio) then
+             &   .AND. this%iunits(igas) == IMassMixingRatio) then
           sf = sf * AirMolarMass / GasMolarMass(igas)
         end if
@@ -417 +417 @@
     scaling = this%scale_factor
     DO jg = 1,NMaxGases
-      if (iunits == IMassMixingRatio .and. this%iunits(jg) == IVolumeMixingRatio) then
+      if (iunits == IMassMixingRatio .AND. this%iunits(jg) == IVolumeMixingRatio) then
         scaling(jg) = scaling(jg) * GasMolarMass(jg) / AirMolarMass
-      else if (iunits == IVolumeMixingRatio .and. this%iunits(jg) == IMassMixingRatio) then
+      else if (iunits == IVolumeMixingRatio .AND. this%iunits(jg) == IMassMixingRatio) then
         scaling(jg) = scaling(jg) * AirMolarMass / GasMolarMass(jg)
       end if
@@ -544 +544 @@
     else
       if (iunits == IMassMixingRatio &
-           &   .and. this%iunits(igas) == IVolumeMixingRatio) then
+           &   .AND. this%iunits(igas) == IVolumeMixingRatio) then
         sf = sf * GasMolarMass(igas) / AirMolarMass
       else if (iunits == IVolumeMixingRatio &
-           &   .and. this%iunits(igas) == IMassMixingRatio) then
+           &   .AND. this%iunits(igas) == IMassMixingRatio) then
         sf = sf * AirMolarMass / GasMolarMass(igas)
       end if

LMDZ6/branches/Amaury_dev/libf/phylmd/ecrad/radiation/radiation_homogeneous_lw.F90

@@ -221 +221 @@
                        &     / od_total
                 end where
-                where (ssa_total > 0.0_jprb .and. od_total > 0.0_jprb)
+                where (ssa_total > 0.0_jprb .AND. od_total > 0.0_jprb)
                   g_total = (g(:,jlev,jcol)*ssa(:,jlev,jcol)*od(:,jlev,jcol) &
                        &     +   g_cloud(config%i_band_from_reordered_g_lw,jlev,jcol) &
@@ -233 +233 @@
                        &     * od_cloud_g / od_total
                 end where
-                where (ssa_total > 0.0_jprb .and. od_total > 0.0_jprb)
+                where (ssa_total > 0.0_jprb .AND. od_total > 0.0_jprb)
                   g_total = g_cloud(config%i_band_from_reordered_g_lw,jlev,jcol) &
                        &     * ssa_cloud(config%i_band_from_reordered_g_lw,jlev,jcol) &

LMDZ6/branches/Amaury_dev/libf/phylmd/ecrad/radiation/radiation_homogeneous_sw.F90

@@ -244 +244 @@
                      &     / od_total
               end where
-              where (ssa_total > 0.0_jprb .and. od_total > 0.0_jprb)
+              where (ssa_total > 0.0_jprb .AND. od_total > 0.0_jprb)
                 g_total = (g(:,jlev,jcol)*ssa(:,jlev,jcol)*od(:,jlev,jcol) &
                      &     +   g_cloud(config%i_band_from_reordered_g_sw,jlev,jcol) &

LMDZ6/branches/Amaury_dev/libf/phylmd/ecrad/radiation/radiation_ifs_rrtm.F90

@@ -81 +81 @@
     if (lhook) call dr_hook('radiation_ifs_rrtm:setup_gas_optics',0,hook_handle)
 
-    do_sw = (config%do_sw .and. config%i_gas_model_sw == IGasModelIFSRRTMG)
-    do_lw = (config%do_lw .and. config%i_gas_model_lw == IGasModelIFSRRTMG)
+    do_sw = (config%do_sw .AND. config%i_gas_model_sw == IGasModelIFSRRTMG)
+    do_lw = (config%do_lw .AND. config%i_gas_model_lw == IGasModelIFSRRTMG)
     
     ! The IFS implementation of RRTMG uses many global variables.  In
@@ -373 +373 @@
     if (lhook) call dr_hook('radiation_ifs_rrtm:gas_optics',0,hook_handle)
 
-    do_sw = (config%do_sw .and. config%i_gas_model_sw == IGasModelIFSRRTMG)
-    do_lw = (config%do_lw .and. config%i_gas_model_lw == IGasModelIFSRRTMG)
+    do_sw = (config%do_sw .AND. config%i_gas_model_sw == IGasModelIFSRRTMG)
+    do_lw = (config%do_lw .AND. config%i_gas_model_lw == IGasModelIFSRRTMG)
 
     ! Compute start and end levels for indexing the gas mixing ratio
@@ -670 +670 @@
       DO jcol = istartcol,iendcol
         temperature = thermodynamics%temperature_hl(jcol,jlev+ilevoffset)
-        if (temperature < 339.0_jprb .and. temperature >= 160.0_jprb) then
+        if (temperature < 339.0_jprb .AND. temperature >= 160.0_jprb) then
           ! Linear interpolation between -113 and 66 degC
           ind(jcol)  = int(temperature - 159.0_jprb)
@@ -796 +796 @@
     DO jcol = istartcol,iendcol
       Tsurf = temperature(jcol)
-      if (Tsurf < 339.0_jprb .and. Tsurf >= 160.0_jprb) then
+      if (Tsurf < 339.0_jprb .AND. Tsurf >= 160.0_jprb) then
         ! Linear interpolation between -113 and 66 degC
         ind(jcol)  = int(Tsurf - 159.0_jprb)

LMDZ6/branches/Amaury_dev/libf/phylmd/ecrad/radiation/radiation_interface.F90

@@ -83 +83 @@
 
     if (config%do_lw_aerosol_scattering &
-         & .and. .not. config%do_lw_cloud_scattering) then
+         & .AND. .not. config%do_lw_cloud_scattering) then
       write(nulerr, '(a)') '*** Error: longwave aerosol scattering requires longwave cloud scattering'
       call radiation_abort('Radiation configuration error')
@@ -114 +114 @@
     ! solver_lw as they will be needed.
     if (config%do_lw_cloud_scattering &
-         &  .and. config%i_solver_lw == ISolverMcICA) then
+         &  .AND. config%i_solver_lw == ISolverMcICA) then
       config%n_g_lw_if_scattering = config%n_g_lw
     end if
@@ -404 +404 @@
       ! a NetCDF file
       if (config%do_save_radiative_properties) then
-        if (istartcol == 1 .and. iendcol == ncol) then
+        if (istartcol == 1 .AND. iendcol == ncol) then
           rad_prop_file_name = rad_prop_base_file_name // ".nc"
         else

LMDZ6/branches/Amaury_dev/libf/phylmd/ecrad/radiation/radiation_save.F90

@@ -87 +87 @@
 
     if (config%i_gas_model_lw == IGasModelMonochromatic &
-         .and. config%mono_lw_wavelength > 0.0_jprb) then
+         .AND. config%mono_lw_wavelength > 0.0_jprb) then
       lw_units_str = 'W m-3'
     else
@@ -127 +127 @@
     end if
 
-    if (config%do_lw .and. config%do_canopy_fluxes_lw) then
+    if (config%do_lw .AND. config%do_canopy_fluxes_lw) then
       call out_file%define_dimension("canopy_band_lw", &
            &  size(flux%lw_dn_surf_canopy, 1))
     end if
-    if (config%do_sw .and. config%do_canopy_fluxes_sw) then
+    if (config%do_sw .AND. config%do_canopy_fluxes_sw) then
       call out_file%define_dimension("canopy_band_sw", &
            &  size(flux%sw_dn_diffuse_surf_canopy, 1))
@@ -328 +328 @@
     end if
    
-    if (config%do_lw .and. config%do_clouds) then
+    if (config%do_lw .AND. config%do_clouds) then
       call out_file%define_variable("cloud_cover_lw", &
            &  dim1_name="column", units_str="1", &
@@ -334 +334 @@
            &  standard_name="cloud_area_fraction")
     end if
-    if (config%do_sw .and. config%do_clouds) then
+    if (config%do_sw .AND. config%do_clouds) then
       call out_file%define_variable("cloud_cover_sw", &
            &  dim1_name="column", units_str="1", &
@@ -444 +444 @@
     end if
 
-    if (config%do_lw .and. config%do_clouds) then
+    if (config%do_lw .AND. config%do_clouds) then
       call out_file%put("cloud_cover_lw", flux%cloud_cover_lw)
     end if
-    if (config%do_sw .and. config%do_clouds) then
+    if (config%do_sw .AND. config%do_clouds) then
       call out_file%put("cloud_cover_sw", flux%cloud_cover_sw)
     end if
@@ -516 +516 @@
 
     if (config%i_gas_model_lw == IGasModelMonochromatic &
-         .and. config%mono_lw_wavelength > 0.0_jprb) then
+         .AND. config%mono_lw_wavelength > 0.0_jprb) then
       lw_units_str = 'W m-3'
     else
@@ -543 +543 @@
     call out_file%define_dimension("half_level", n_lev_plus1)
 
-    if (config%do_lw .and. config%do_canopy_fluxes_lw) then
+    if (config%do_lw .AND. config%do_canopy_fluxes_lw) then
       call out_file%define_dimension("canopy_band_lw", &
            &  size(flux%lw_dn_surf_canopy, 1))
     end if
-    if (config%do_sw .and. config%do_canopy_fluxes_sw) then
+    if (config%do_sw .AND. config%do_canopy_fluxes_sw) then
       call out_file%define_dimension("canopy_band_sw", &
            &  size(flux%sw_dn_diffuse_surf_canopy, 1))
@@ -838 +838 @@
          &  units_str="Pa", long_name="Pressure on half-levels")
 
-    if (allocated(thermodynamics%h2o_sat_liq) .and. config%use_aerosols) then
+    if (allocated(thermodynamics%h2o_sat_liq) .AND. config%use_aerosols) then
       call out_file%define_variable("q_sat_liquid", &
            &  dim2_name="column", dim1_name="level", &
@@ -953 +953 @@
     call out_file%put("pressure_hl", thermodynamics%pressure_hl(istartcol:iendcol,:))
 
-    if (allocated(thermodynamics%h2o_sat_liq) .and. config%use_aerosols) then
+    if (allocated(thermodynamics%h2o_sat_liq) .AND. config%use_aerosols) then
       call out_file%put("q_sat_liquid", thermodynamics%h2o_sat_liq(istartcol:iendcol,:))
     end if
@@ -1074 +1074 @@
     nlev = nlev - 1
     
-    do_aerosol = config%use_aerosols .and. present(aerosol)
+    do_aerosol = config%use_aerosols .AND. present(aerosol)
 
     ! Open the file
@@ -1169 +1169 @@
          &   units_str="1", long_name="Ozone mass mixing ratio")
     DO jgas = 1,NMaxGases
-      if (gas%is_present(jgas) .and. jgas /= IH2O .and. jgas /= IO3) then
+      if (gas%is_present(jgas) .AND. jgas /= IH2O .AND. jgas /= IO3) then
         write(var_name,'(a,a)') trim(GasLowerCaseName(jgas)), '_vmr'
         write(long_name,'(a,a)') trim(GasName(jgas)), ' volume mixing ratio'
@@ -1244 +1244 @@
     end if
     call out_file%put("lw_emissivity", single_level%lw_emissivity)
-    if (config%do_clouds .and. allocated(single_level%iseed)) then
+    if (config%do_clouds .AND. allocated(single_level%iseed)) then
       allocate(seed(ncol))
       seed = single_level%iseed
@@ -1260 +1260 @@
     call out_file%put("o3_mmr", mixing_ratio)
     DO jgas = 1,NMaxGases
-      if (gas%is_present(jgas) .and. jgas /= IH2O .and. jgas /= IO3) then
+      if (gas%is_present(jgas) .AND. jgas /= IH2O .AND. jgas /= IO3) then
         write(var_name,'(a,a)') trim(GasLowerCaseName(jgas)), '_vmr'
         call gas%get(jgas, IVolumeMixingRatio, mixing_ratio)

LMDZ6/branches/Amaury_dev/libf/phylmd/ecrad/radiation/radiation_single_level.F90

@@ -325 +325 @@
     end if
 
-    if (config%do_lw .and. present(lw_albedo)) then
+    if (config%do_lw .AND. present(lw_albedo)) then
       if (config%use_canopy_full_spectrum_lw) then
         if (config%n_g_lw /= size(this%lw_emissivity,2)) then

LMDZ6/branches/Amaury_dev/libf/phylmd/ecrad/radiation/radiation_spartacus_lw.F90

@@ -421 +421 @@
           ! region and the sky is overcast then 3D calculations must
           ! be turned off as there will be only one region
-          if (config%do_3d_effects .and. &
-               &  allocated(cloud%inv_cloud_effective_size) .and. &
-               &  .not. (nreg == 2 .and. cloud%fraction(jcol,jlev) &
+          if (config%do_3d_effects .AND. &
+               &  allocated(cloud%inv_cloud_effective_size) .AND. &
+               &  .not. (nreg == 2 .AND. cloud%fraction(jcol,jlev) &
                &  > 1.0_jprb-config%cloud_fraction_threshold)) then
             if (cloud%inv_cloud_effective_size(jcol,jlev) &
@@ -586 +586 @@
             ! 3D effects for any further g-points
             if (ng3D == ng &
-                 &  .and. od_region(jg,1) > config%max_gas_od_3D) then
+                 &  .AND. od_region(jg,1) > config%max_gas_od_3D) then
               ng3D = jg-1
             end if
@@ -637 +637 @@
           ! of the cloud
           if (config%do_lw_side_emissivity &
-             & .and. region_fracs(1,jlev,jcol) > 0.0_jprb .and. region_fracs(2,jlev,jcol) > 0.0_jprb &
-             & .and. config%do_3d_effects &
-             & .and. cloud%inv_cloud_effective_size(jcol,jlev) > 0.0_jprb) then
+             & .AND. region_fracs(1,jlev,jcol) > 0.0_jprb .AND. region_fracs(2,jlev,jcol) > 0.0_jprb &
+             & .AND. config%do_3d_effects &
+             & .AND. cloud%inv_cloud_effective_size(jcol,jlev) > 0.0_jprb) then
             aspect_ratio = 1.0_jprb / (min(cloud%inv_cloud_effective_size(jcol,jlev), &
                  &                         1.0_jprb / config%min_cloud_effective_size) &
@@ -894 +894 @@
         ! source below a layer interface to the equivalent values
         ! just above
-        if (is_clear_sky_layer(jlev) .and. is_clear_sky_layer(jlev-1)) then
+        if (is_clear_sky_layer(jlev) .AND. is_clear_sky_layer(jlev-1)) then
           ! If both layers are cloud free, this is trivial...
           total_albedo(:,:,:,jlev) = 0.0_jprb
@@ -1014 +1014 @@
         ! Account for overlap rules in translating fluxes just above
         ! a layer interface to the values just below
-        if (is_clear_sky_layer(jlev) .and. is_clear_sky_layer(jlev+1)) then
+        if (is_clear_sky_layer(jlev) .AND. is_clear_sky_layer(jlev+1)) then
           flux_dn_below = flux_dn_above
         else

LMDZ6/branches/Amaury_dev/libf/phylmd/ecrad/radiation/radiation_spartacus_sw.F90

@@ -493 +493 @@
           end if
 
-          if (config%do_3d_effects .and. &
-               &  allocated(cloud%inv_cloud_effective_size) .and. &
-               &  .not. (nreg == 2 .and. cloud%fraction(jcol,jlev) &
+          if (config%do_3d_effects .AND. &
+               &  allocated(cloud%inv_cloud_effective_size) .AND. &
+               &  .not. (nreg == 2 .AND. cloud%fraction(jcol,jlev) &
                &  > 1.0-config%cloud_fraction_threshold)) then
             if (cloud%inv_cloud_effective_size(jcol,jlev) > 0.0_jprb) then
@@ -662 +662 @@
             ! 3D effects for any further g-points
             if (ng3D == ng &
-                 &  .and. od_region(jg,1) > config%max_gas_od_3D) then
+                 &  .AND. od_region(jg,1) > config%max_gas_od_3D) then
               ng3D = jg-1
             end if
@@ -935 +935 @@
         if ((config%i_3d_sw_entrapment == IEntrapmentExplicitNonFractal &
              &  .or. config%i_3d_sw_entrapment == IEntrapmentExplicit) &
-             &  .and. jlev >= i_cloud_top) then
+             &  .AND. jlev >= i_cloud_top) then
 #else
         if (config%i_3d_sw_entrapment == IEntrapmentExplicitNonFractal &
@@ -969 +969 @@
         ! Account for cloud overlap when converting albedo and source
         ! below a layer interface to the equivalent values just above
-        if (is_clear_sky_layer(jlev) .and. is_clear_sky_layer(jlev-1)) then
+        if (is_clear_sky_layer(jlev) .AND. is_clear_sky_layer(jlev-1)) then
           ! If both layers are cloud free, this is trivial...
           total_albedo(:,:,:,jlev) = 0.0_jprb
@@ -1217 +1217 @@
                        &  / max(config%cloud_fraction_threshold, region_fracs(jreg,jlev,jcol))
                   DO jreg4 = 1,nreg ! VIA first lower region (jreg2 is second lower region)
-                    if (.not. (jreg4 == jreg .and. jreg4 /= jreg2)) then
+                    if (.not. (jreg4 == jreg .AND. jreg4 /= jreg2)) then
                       albedo_part(:,jreg3,jreg) = albedo_part(:,jreg3,jreg) + entrapment(:,jreg3,jreg) &
                            &  * v_matrix(jreg4,jreg,jlev,jcol) * total_albedo_below(:,jreg2,jreg4)
@@ -1305 +1305 @@
                        &  / max(config%cloud_fraction_threshold, region_fracs(jreg,jlev,jcol))
                   DO jreg4 = 1,nreg
-                    if (.not. (jreg4 == jreg .and. jreg4 /= jreg2)) then
+                    if (.not. (jreg4 == jreg .AND. jreg4 /= jreg2)) then
                      albedo_part(:,jreg3,jreg) = albedo_part(:,jreg3,jreg) + entrapment(:,jreg3,jreg) &
                            &  * v_matrix(jreg4,jreg,jlev,jcol) * total_albedo_below_direct(:,jreg2,jreg4)
@@ -1329 +1329 @@
         if ((config%i_3d_sw_entrapment == IEntrapmentExplicitNonFractal &
              &  .or. config%i_3d_sw_entrapment == IEntrapmentExplicit) &
-             &  .and. .not. (is_clear_sky_layer(jlev) .and. is_clear_sky_layer(jlev-1))) then
+             &  .AND. .not. (is_clear_sky_layer(jlev) .AND. is_clear_sky_layer(jlev-1))) then
           ! Horizontal migration distances are averaged when
           ! applying overlap rules, so equation is
@@ -1525 +1525 @@
         ! Account for overlap rules in translating fluxes just above
         ! a layer interface to the values just below
-        if (is_clear_sky_layer(jlev) .and. is_clear_sky_layer(jlev+1)) then
+        if (is_clear_sky_layer(jlev) .AND. is_clear_sky_layer(jlev+1)) then
           ! Regions in current layer map directly on to regions in
           ! layer below

LMDZ6/branches/Amaury_dev/libf/phylmd/ecrad/radiation/radiation_spectral_definition.F90

@@ -202 +202 @@
       find_wavenumber = 1
       DO while (wavenumber > this%wavenumber2(find_wavenumber) &
-           &    .and. find_wavenumber < this%nwav)
+           &    .AND. find_wavenumber < this%nwav)
         find_wavenumber = find_wavenumber + 1
       end do
@@ -290 +290 @@
           ! will be applicable
           if (wavenumber(jwav) >= this%wavenumber1_band(jband) &
-               & .and. wavenumber(jwav) <= this%wavenumber2_band(jband)) then
+               & .AND. wavenumber(jwav) <= this%wavenumber2_band(jband)) then
             if (jwav > 1) then
               wavenum1 = max(this%wavenumber1_band(jband), &
@@ -432 +432 @@
                  &       / (this%wavenumber2(isd1)-this%wavenumber1(isd1))
           else
-            if (isd2 >= 1 .and. isd2 <= this%nwav) then
+            if (isd2 >= 1 .AND. isd2 <= this%nwav) then
               ! Right part of triangle
               weight(isd2) = weight(isd2) + 0.5_jprb * (wavenum2-this%wavenumber1(isd2))**2 &
@@ -696 +696 @@
         wavenumber2_bound = 0.01_jprb / wavelength_bound(jint-1)
         where (wavenumber_mid > wavenumber1_bound &
-             & .and. wavenumber_mid <= wavenumber2_bound)
+             & .AND. wavenumber_mid <= wavenumber2_bound)
           i_input = i_intervals(jint)
         end where

LMDZ6/branches/Amaury_dev/libf/phylmd/ecrad/radiation/radiation_tripleclouds_lw.F90

@@ -325 +325 @@
                        &     / od_total
                 end where
-                where (ssa_total > 0.0_jprb .and. od_total > 0.0_jprb)
+                where (ssa_total > 0.0_jprb .AND. od_total > 0.0_jprb)
                   g_total = (g(:,jlev,jcol)*ssa(:,jlev,jcol)*od(:,jlev,jcol) &
                        &     +   g_cloud(config%i_band_from_reordered_g_lw,jlev,jcol) &
@@ -337 +337 @@
                        &     * od_cloud_new / od_total
                 end where
-                where (ssa_total > 0.0_jprb .and. od_total > 0.0_jprb)
+                where (ssa_total > 0.0_jprb .AND. od_total > 0.0_jprb)
                   g_total = g_cloud(config%i_band_from_reordered_g_lw,jlev,jcol) &
                        &     * ssa_cloud(config%i_band_from_reordered_g_lw,jlev,jcol) &
@@ -418 +418 @@
         ! Account for cloud overlap when converting albedo below a
         ! layer interface to the equivalent values just above
-        if (is_clear_sky_layer(jlev) .and. is_clear_sky_layer(jlev-1)) then
+        if (is_clear_sky_layer(jlev) .AND. is_clear_sky_layer(jlev-1)) then
           total_albedo(:,:,jlev) = total_albedo_below(:,:)
           total_source(:,:,jlev) = total_source_below(:,:)
@@ -518 +518 @@
 
         if (.not. (is_clear_sky_layer(jlev) &
-             &    .and. is_clear_sky_layer(jlev+1))) then
+             &    .AND. is_clear_sky_layer(jlev+1))) then
           ! Account for overlap rules in translating fluxes just above
           ! a layer interface to the values just below

LMDZ6/branches/Amaury_dev/libf/phylmd/ecrad/radiation/radiation_tripleclouds_lw.F90.or

@@ -340 +340 @@
                        &     / od_total
                 end where
-                where (ssa_total > 0.0_jprb .and. od_total > 0.0_jprb)
+                where (ssa_total > 0.0_jprb .AND. od_total > 0.0_jprb)
                   g_total = (g(:,jlev,jcol)*ssa(:,jlev,jcol)*od(:,jlev,jcol) &
                        &     +   g_cloud(config%i_band_from_reordered_g_lw,jlev,jcol) &
@@ -352 +352 @@
                        &     * od_cloud_new / od_total
                 end where
-                where (ssa_total > 0.0_jprb .and. od_total > 0.0_jprb)
+                where (ssa_total > 0.0_jprb .AND. od_total > 0.0_jprb)
                   g_total = g_cloud(config%i_band_from_reordered_g_lw,jlev,jcol) &
                        &     * ssa_cloud(config%i_band_from_reordered_g_lw,jlev,jcol) &
@@ -433 +433 @@
         ! Account for cloud overlap when converting albedo below a
         ! layer interface to the equivalent values just above
-        if (is_clear_sky_layer(jlev) .and. is_clear_sky_layer(jlev-1)) then
+        if (is_clear_sky_layer(jlev) .AND. is_clear_sky_layer(jlev-1)) then
           total_albedo(:,:,jlev) = total_albedo_below(:,:)
           total_source(:,:,jlev) = total_source_below(:,:)
@@ -550 +550 @@
 
         if (.not. (is_clear_sky_layer(jlev) &
-             &    .and. is_clear_sky_layer(jlev+1))) then
+             &    .AND. is_clear_sky_layer(jlev+1))) then
           ! Account for overlap rules in translating fluxes just above
           ! a layer interface to the values just below

LMDZ6/branches/Amaury_dev/libf/phylmd/ecrad/radiation/radiation_tripleclouds_sw.F90

@@ -18 +18 @@
 !   2017-10-23  R. Hogan  Renamed single-character variables
 !   2018-10-08  R. Hogan  Call calc_region_properties
-!   2019-01-02  R. Hogan  Fixed problem of do_save_spectral_flux .and. .not. do_sw_direct
+!   2019-01-02  R. Hogan  Fixed problem of do_save_spectral_flux .AND. .not. do_sw_direct
 !   2020-09-18  R. Hogan  Replaced some array expressions with loops for speed
 !   2021-10-01  P. Ukkonen Performance optimizations: batched computations
@@ -392 +392 @@
         ! Account for cloud overlap when converting albedo below a
         ! layer interface to the equivalent values just above
-        if (is_clear_sky_layer(jlev) .and. is_clear_sky_layer(jlev-1)) then
+        if (is_clear_sky_layer(jlev) .AND. is_clear_sky_layer(jlev-1)) then
           total_albedo(:,:,jlev)        = total_albedo_below(:,:)
           total_albedo_direct(:,:,jlev) = total_albedo_below_direct(:,:)
@@ -539 +539 @@
         
         if (.not. (is_clear_sky_layer(jlev) &
-             &    .and. is_clear_sky_layer(jlev+1))) then
+             &    .AND. is_clear_sky_layer(jlev+1))) then
           ! Account for overlap rules in translating fluxes just above
           ! a layer interface to the values just below

LMDZ6/branches/Amaury_dev/libf/phylmd/ecrad/utilities/easy_netcdf.F90

@@ -763 +763 @@
     DO j = 1, ndims
       n = n * ndimlens(j)
-      if (j > 1 .and. ndimlens(j) > 1) then
+      if (j > 1 .AND. ndimlens(j) > 1) then
         write(nulerr,'(a,a,a)') '*** Error reading NetCDF variable ', &
              & var_name, &
@@ -821 +821 @@
     DO j = 1, ndims
       n = n * ndimlens(j)
-      if (j > 1 .and. ndimlens(j) > 1) then
+      if (j > 1 .AND. ndimlens(j) > 1) then
         write(nulerr,'(a,a,a)') '*** Error reading NetCDF variable ', &
              & var_name, &
@@ -880 +880 @@
     DO j = 1, ndims
       n = n * ndimlens(j)
-      if (j > 1 .and. ndimlens(j) > 1) then
+      if (j > 1 .AND. ndimlens(j) > 1) then
         write(nulerr,'(a,a,a)') '*** Error reading NetCDF variable ', &
              & var_name, &
@@ -940 +940 @@
     DO j = 1, ndims-1
       n = n * ndimlens(j)
-      if (j > 1 .and. ndimlens(j) > 1) then
+      if (j > 1 .AND. ndimlens(j) > 1) then
         write(nulerr,'(a,a,a)') '*** Error reading 1D slice from NetCDF variable ', &
              & var_name, &
@@ -1023 +1023 @@
     DO j = 1, ndims
       ntotal = ntotal * ndimlens(j)
-      if (j > 2 .and. ndimlens(j) > 1) then
+      if (j > 2 .AND. ndimlens(j) > 1) then
         write(nulerr,'(a,a,a)') '*** Error reading NetCDF variable ', &
            & var_name, &
@@ -1135 +1135 @@
     DO j = 1, ndims
       ntotal = ntotal * ndimlens(j)
-      if (j > 2 .and. ndimlens(j) > 1) then
+      if (j > 2 .AND. ndimlens(j) > 1) then
         write(nulerr,'(a,a,a)') '*** Error reading NetCDF variable ', &
            & var_name, &
@@ -1254 +1254 @@
     DO j = 1, ndims-1
       ntotal = ntotal * ndimlens(j)
-      if (j > 2 .and. ndimlens(j) > 1) then
+      if (j > 2 .AND. ndimlens(j) > 1) then
         write(nulerr,'(a,a,a)') '*** Error reading 2D slice from NetCDF variable ', &
            & var_name, &
@@ -1378 +1378 @@
     DO j = 1, ndims
       ntotal = ntotal * ndimlens(j)
-      if (j > 3 .and. ndimlens(j) > 1) then
+      if (j > 3 .AND. ndimlens(j) > 1) then
         write(nulerr,'(a,a,a)') '*** Error reading NetCDF variable ', &
            & var_name, &
@@ -1514 +1514 @@
     DO j = 1, ndims-1
       ntotal = ntotal * ndimlens(j)
-      if (j > 3 .and. ndimlens(j) > 1) then
+      if (j > 3 .AND. ndimlens(j) > 1) then
         write(nulerr,'(a,a,a)') '*** Error reading 3D slice from NetCDF variable ', &
            & var_name, &
@@ -1656 +1656 @@
     DO j = 1, ndims
       ntotal = ntotal * ndimlens(j)
-      if (j > 4 .and. ndimlens(j) > 1) then
+      if (j > 4 .AND. ndimlens(j) > 1) then
         write(nulerr,'(a,a,a)') '*** Error reading NetCDF variable ', &
            & var_name, &
@@ -1987 +1987 @@
     end if
 
-    if (present(dim1_name) .and. ndims_input >= 1) then
+    if (present(dim1_name) .AND. ndims_input >= 1) then
       ! Variable is at least one dimensional
       ndims_local = 1
@@ -1996 +1996 @@
         call my_abort('Error writing NetCDF file')
       end if
-      if (present(dim2_name) .and. ndims_input >= 2) then
+      if (present(dim2_name) .AND. ndims_input >= 2) then
         ! Variable is at least two dimensional
         ndims_local = 2
@@ -2005 +2005 @@
           call my_abort('Error writing NetCDF file')
         end if
-        if (present(dim3_name) .and. ndims_input >= 3) then
+        if (present(dim3_name) .AND. ndims_input >= 3) then
           ! Variable is at least three dimensional
           ndims_local = 3
@@ -2014 +2014 @@
             call my_abort('Error writing NetCDF file')
           end if
-          if (present(dim4_name) .and. ndims_input >= 4) then
+          if (present(dim4_name) .AND. ndims_input >= 4) then
             ! Variable is at least three dimensional
             ndims_local = 4
@@ -2472 +2472 @@
     ! Check the total size of the variable to be stored (but receiving
     ! ntotal is zero then there must be an unlimited dimension)
-    if (ntotal /= size(var,kind=jpib) .and. ntotal /= 0) then
+    if (ntotal /= size(var,kind=jpib) .AND. ntotal /= 0) then
       write(nulerr,'(a,i0,a,a,a,i0)') '*** Error: attempt to write matrix of total size ', &
            & nvarlen, ' to ', var_name, ' which has total size ', ntotal
@@ -2551 +2551 @@
       write(var_slice_name,'(a,a,i0,a)') var_name, '(:,:,', index3, ')'
     end if
-    if (ntotal /= size(var,kind=jpib) .and. ntotal /= 0) then
+    if (ntotal /= size(var,kind=jpib) .AND. ntotal /= 0) then
       write(nulerr,'(a,i0,a,a,a,i0)') '*** Error: attempt to write matrix of total size ', &
            & nvarlen, ' to ', trim(var_slice_name), ' which has total size ', ntotal

LMDZ6/branches/Amaury_dev/libf/phylmd/ecrad/utilities/print_matrix.F90

@@ -47 +47 @@
           write(unit_local,'(f16.8,$)') mat(i,j)
        end do
-       if (present(name) .and. i == size(mat,1)) then
+       if (present(name) .AND. i == size(mat,1)) then
          write(unit_local,'(a)') ']'
        else