Changeset 3204 for trunk/LMDZ.GENERIC

Timestamp:

Feb 8, 2024, 9:38:16 AM (10 months ago)

Author:

emillour

Message:

Generic PCM:
Code cleanup. Remove obsolete "sourceevol" option and related variables.
EM

Location:

trunk/LMDZ.GENERIC

Files:

• README (modified) (1 diff)
• libf/phystd/callkeys_mod.F90 (modified) (2 diffs)
• libf/phystd/inifis_mod.F90 (modified) (1 diff)
• libf/phystd/phys_state_var_mod.F90 (modified) (3 diffs)
• libf/phystd/physiq_mod.F90 (modified) (9 diffs)

trunk/LMDZ.GENERIC/README

@@ -1838 +1838 @@
 == 31/01/2024 == NC
 Small corrections to enable compilation with WRF4.
+
+== 08/02/2024 == EM
+Code cleanup. Remove obsolete "sourceevol" option and related variables.

trunk/LMDZ.GENERIC/libf/phystd/callkeys_mod.F90

@@ -57 +57 @@
 !$OMP THREADPRIVATE(aerogeneric)
       logical,save :: hydrology
-      logical,save :: sourceevol
       logical,save :: CLFvarying
       logical,save :: nosurf
       logical,save :: oblate
-!$OMP THREADPRIVATE(hydrology,sourceevol,CLFvarying,nosurf,oblate)
+!$OMP THREADPRIVATE(hydrology,CLFvarying,nosurf,oblate)
       logical,save :: ok_slab_ocean
       logical,save :: ok_slab_sic
@@ -143 +142 @@
       real,save :: tau_relax
       real,save :: cloudlvl
-      real,save :: icetstep
       real,save :: intheat
-!$OMP THREADPRIVATE(Tsaldiff,tau_relax,cloudlvl,icetstep,intheat)
+!$OMP THREADPRIVATE(Tsaldiff,tau_relax,cloudlvl,intheat)
       real,save :: flatten
       real,save :: Rmean

trunk/LMDZ.GENERIC/libf/phystd/inifis_mod.F90

@@ -1022 +1022 @@
      if (is_master) write(*,*)trim(rname)//": hydrology = ",hydrology
 
-     if (is_master) write(*,*)trim(rname)//": Evolve surface water sources ?"
-     sourceevol=.false. ! default value
-     call getin_p("sourceevol",sourceevol)
-     if (is_master) write(*,*)trim(rname)//": sourceevol = ",sourceevol
-
-     if (is_master) write(*,*)trim(rname)//": Ice evolution timestep ?"
-     icetstep=100.0 ! default value
-     call getin_p("icetstep",icetstep)
-     if (is_master) write(*,*)trim(rname)//": icetstep = ",icetstep
-         
      if (is_master) write(*,*)trim(rname)//": Spectral Dependant albedo ?"
      albedo_spectral_mode=.false. ! default value

trunk/LMDZ.GENERIC/libf/phystd/phys_state_var_mod.F90

@@ -88 +88 @@
       real,allocatable,dimension(:,:,:),save :: nueffrad ! Aerosol effective radius variance. By RW
 !$OMP THREADPRIVATE(qsurf_hist,nueffrad)
-
-      real,allocatable,dimension(:),save :: ice_initial
-      real,allocatable,dimension(:),save :: ice_min
-!$OMP THREADPRIVATE(ice_initial,ice_min)
 
       real,dimension(:),allocatable,save ::  pctsrf_sic
@@ -170 +166 @@
         ALLOCATE(reffrad(klon,klev,naerkind))
         ALLOCATE(nueffrad(klon,klev,naerkind))
-        ALLOCATE(ice_initial(klon))
-        ALLOCATE(ice_min(klon))
         ALLOCATE(fluxsurf_lw(klon))
         ALLOCATE(fluxsurf_lw1(klon))
@@ -263 +257 @@
         DEALLOCATE(reffrad)
         DEALLOCATE(nueffrad)
-        DEALLOCATE(ice_initial)
-        DEALLOCATE(ice_min)
         DEALLOCATE(fluxsurf_lw)
         DEALLOCATE(fluxsurf_lw1)

trunk/LMDZ.GENERIC/libf/phystd/physiq_mod.F90

@@ -61 +61 @@
                               calltherm, CLFvarying, co2cond, corrk, diagdtau, &
                               diurnal, enertest, fat1au, flatten, j2, &
-                              hydrology, icetstep, intheat, iradia, kastprof, &
+                              hydrology, intheat, iradia, kastprof, &
                               lwrite, mass_redistrib, massplanet, meanOLR, &
                               nearco2cond, newtonian, noseason_day, oblate, &
                               ok_slab_ocean, photochem, rings_shadow, rmean, &
                               season, sedimentation,generic_condensation, &
-                              sourceevol, specOLR, &
+                              specOLR, &
                               startphy_file, testradtimes, tlocked, &
                               tracer, UseTurbDiff, water, watercond, &
@@ -454 +454 @@
 !$OMP THREADPRIVATE(reffcol)
 
-!     Sourceevol for 'accelerated ice evolution'. By RW
-      real delta_ice,ice_tot
-      integer num_run
-      logical,save :: ice_update
 !  Non-oro GW tendencies
       REAL d_u_hin(ngrid,nlayer), d_v_hin(ngrid,nlayer)
@@ -545 +541 @@
                        rnat,pctsrf_sic,tslab, tsea_ice,sea_ice)
 
-!!         call WriteField_phy("post_phyetat0_qsurf",qsurf(1:ngrid,igcm_h2o_vap),1)
 #else   
 
@@ -582 +577 @@
          call surfini(ngrid,nq,qsurf,albedo,albedo_bareground,albedo_snow_SPECTV,albedo_co2_ice_SPECTV) 
 
-!!        call WriteField_phy("post_surfini1_qsurf",qsurf(1:ngrid,igcm_h2o_vap),1)
-!!        call WriteField_phy("post_surfini2_qsurf",qsurf(1:ngrid,igcm_h2o_vap),1)
-         
 !        Initialize orbital calculation. 
 !        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -654 +646 @@
             
          endif ! end of 'callsoil'.
-
-!!         call WriteField_phy("post_callsoil_qsurf",qsurf(1:ngrid,igcm_h2o_vap),1)
          
          icount=1
-
-!        Decide whether to update ice at end of run.
-!        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-         ice_update=.false.
-         if(sourceevol)then
-!$OMP MASTER
-            open(128,file='num_run',form='formatted', &
-                     status="old",iostat=ierr)
-            if (ierr.ne.0) then
-               write(*,*) "physiq: Error! No num_run file!"
-               write(*,*) " (which is needed for sourceevol option)"
-               stop
-            endif
-            read(128,*) num_run 
-            close(128)
-!$OMP END MASTER
-!$OMP BARRIER
-        
-            if(num_run.ne.0.and.mod(num_run,2).eq.0)then
-               print*,'Updating ice at end of this year!'
-               ice_update=.true.
-               ice_min(:)=1.e4
-            endif
-            
-         endif ! end of 'sourceevol'.
-
 
          ! Here is defined the type of the surface : Continent or Ocean.
@@ -741 +705 @@
             endif
 
-            if(ice_update)then
-               ice_initial(:)=qsurf(:,igcm_h2o_ice)
-            endif
-
-         endif
-
-!!         call WriteField_phy("post_ice_update_qsurf",qsurf(1:ngrid,igcm_h2o_vap),1)
+         endif
 
 !        Set metallicity for GCS
@@ -2006 +1964 @@
          qsurf_hist(:,:) = qsurf(:,:)
 
-         if(ice_update)then
-            ice_min(1:ngrid)=min(ice_min(1:ngrid),qsurf(1:ngrid,igcm_h2o_ice))
-         endif
-
       endif! end of if 'tracer'
 
@@ -2322 +2276 @@
          ztime_fin = ptime + ptimestep/(float(iphysiq)*daysec)
 
-         ! Update surface ice distribution to iterate to steady state if requested
-         if(ice_update)then
-
-            do ig=1,ngrid
-
-               delta_ice = (qsurf(ig,igcm_h2o_ice)-ice_initial(ig))
-               
-               ! add multiple years of evolution
-               qsurf_hist(ig,igcm_h2o_ice) = qsurf_hist(ig,igcm_h2o_ice) + delta_ice*icetstep 
-
-               ! if ice has gone -ve, set to zero
-               if(qsurf_hist(ig,igcm_h2o_ice).lt.0.0)then
-                  qsurf_hist(ig,igcm_h2o_ice) = 0.0 
-               endif
-
-               ! if ice is seasonal, set to zero (NEW)
-               if(ice_min(ig).lt.0.01)then
-                  qsurf_hist(ig,igcm_h2o_ice) = 0.0 
-               endif
-
-            enddo
-
-            ! enforce ice conservation
-            ice_tot= SUM(qsurf_hist(:,igcm_h2o_ice)*cell_area(:) )/SUM(cell_area(:))
-            qsurf_hist(:,igcm_h2o_ice) = qsurf_hist(:,igcm_h2o_ice)*(icesrf/ice_tot)
-
-         endif
 #ifndef MESOSCALE
          
@@ -2661 +2588 @@
             endif
 
-            if(ice_update)then
-               call writediagfi(ngrid,"ice_min","min annual ice","m",2,ice_min)
-               call writediagfi(ngrid,"ice_ini","initial annual ice","m",2,ice_initial)
-            endif
-
-            ! do ig=1,ngrid
-            !    if(tau_col(ig).gt.1.e3)then
-            !       print*,'WARNING: tau_col=',tau_col(ig)
-            !       print*,'at ig=',ig,'in PHYSIQ'
-            !    endif         
-            ! end do
-
             call writediagfi(ngrid,"tau_col","Total aerosol optical depth","[]",2,tau_col)