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

Timestamp:

Sep 11, 2024, 4:27:07 PM (12 months ago)

Author:

abarral

Message:

Replace REPROBUS CPP KEY by logical using handmade wonky wrapper

Location:

LMDZ6/branches/Amaury_dev/libf/phylmd/ecrad/driver

Files:

• ecrad_driver.F90 (modified) (1 diff)
• ecrad_driver_config.F90 (modified) (1 diff)
• ecrad_driver_read_input.F90 (modified) (8 diffs)
• ifs_blocking.F90 (modified) (2 diffs)

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