Changeset 2939 for trunk

Timestamp:

Apr 14, 2023, 11:36:06 AM (2 years ago)

Author:

llange

Message:

PEM
Fixing bug when reading the mass adsorded written in startfi_PEM (only the mass for islope = 1 was read)
I've cleaned some print * I've introduced in my last commit
LL

Location:

trunk/LMDZ.COMMON/libf/evolution

Files:

• adsorption_mod.F90 (modified) (1 diff)
• evol_h2o_ice_s_mod_slope.F90 (modified) (1 diff)
• pem.F90 (modified) (2 diffs)
• pemetat0.F90 (modified) (3 diffs)
• update_soil.F90 (modified) (1 diff)

trunk/LMDZ.COMMON/libf/evolution/adsorption_mod.F90

@@ -230 +230 @@
    m_h2o_completesoil(:,:,:) = dm_h2o_regolith_slope(:,:,:)
 
-
  RETURN
 #endif

trunk/LMDZ.COMMON/libf/evolution/evol_h2o_ice_s_mod_slope.F90

@@ -80 +80 @@
     print *, "Tendencies on ice increasing=", pos_tend
     print *, "This can be due to the absence of water ice in the PCM run!!"
-    print *,cell_area,qsurf(:,:),ngrid,STOPPING
-      call criterion_waterice_stop(cell_area,1.,qsurf(:,:)*0.,STOPPING,ngrid,qsurf(:,:)*0.)
-      do i=1,ngrid
-         do islope=1,nslope
-          new_tendencies(i,islope)=0
-         enddo
-      enddo
+    call criterion_waterice_stop(cell_area,1.,qsurf(:,:)*0.,STOPPING,ngrid,qsurf(:,:)*0.)
+    do i=1,ngrid
+       do islope=1,nslope
+         new_tendencies(i,islope)=0
+       enddo
+    enddo
   endif
 

trunk/LMDZ.COMMON/libf/evolution/pem.F90

@@ -749 +749 @@
 ! II.a.1. Compute updated global pressure
      print *, "Recomputing the new pressure..."
+
      do i=1,ngrid
        do islope=1,nslope
@@ -754 +755 @@
       enddo
      enddo
-       print *, 'Global average pressure old time step',global_ave_press_old
+     print *, 'Global average pressure old time step',global_ave_press_old
 
      call WRITEDIAGFI(ngrid,'ps_ave','Global average pressure','Pa',0,global_ave_press_new)

trunk/LMDZ.COMMON/libf/evolution/pemetat0.F90

@@ -90 +90 @@
 
 write(*,*)'Is start PEM?',startpem_file
-startpem_file = .true.
 
 !1. Run
@@ -275 +274 @@
 
 !4. CO2 & H2O Adsorption
+
  if(adsorption_pem) then
   DO islope=1,nslope
@@ -281 +281 @@
     if((.not.found)) then
        m_co2_regolith_phys(:,:,:) = 0.
+       exit
     endif
-    exit
+    
   ENDDO
 
   DO islope=1,nslope
    write(num,fmt='(i2.2)') islope
-   call get_field("mh2o_reg_ads_slope"//num,m_co2_regolith_phys(:,:,islope),found2)
+   call get_field("mh2o_reg_ads_slope"//num,m_h2o_regolith_phys(:,:,islope),found2)
     if((.not.found2)) then
        m_h2o_regolith_phys(:,:,:) = 0.
+      exit
     endif
-    exit
+    
   ENDDO
 

trunk/LMDZ.COMMON/libf/evolution/update_soil.F90

@@ -44 +44 @@
    regolith_inertia(:,islope) = inertiedat_PEM(:,1)
    do ig = 1,ngrid
-      write(*,*) 'ig,islope',ig,islope,tendencies_waterice(ig,islope),waterice(ig,islope)
       if((tendencies_waterice(ig,islope).lt.-1e-5).and.(waterice(ig,islope).eq.0)) then
               regolith_inertia(ig,islope) = inertie_averaged