Changeset 2982

Timestamp:

Jun 21, 2023, 3:36:23 PM (20 months ago)

Author:

romain.vande

Message:

MARS PEM:
Small correction to adapt the pem to the picky gnu compiler.
RV

Location:

trunk/LMDZ.COMMON/libf/evolution

Files:

• conf_pem.F90 (modified) (1 diff)
• orbit_param_criterion_mod.F90 (modified) (3 diffs)
• pem.F90 (modified) (3 diffs)

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

@@ -106 +106 @@
    print*, 'Do we compute the ice table with the dynamic method?', icetable_dynamic
 
-  if ((not(soil_pem)).and.((icetable_equilibrium).or.(icetable_dynamic))) then
+  if ((.not.soil_pem).and.((icetable_equilibrium).or.(icetable_dynamic))) then
        print*,'Ice table  must be used when soil_pem = T'
        call abort_physic(modname,"Ice table  must be used when soil_pem = T",1)
   endif
 
-  if ((not(soil_pem)).and.adsorption_pem) then
+  if ((.not.soil_pem).and.adsorption_pem) then
        print*,'Adsorption must be used when soil_pem = T'
        call abort_physic(modname,"Adsorption must be used when soil_pem = T",1)
   endif
   
-  if ((not(soil_pem)).and.(fluxgeo.gt.0.)) then
+  if ((.not.soil_pem).and.(fluxgeo.gt.0.)) then
        print*,'Soil is not activated but Flux Geo > 0.'
        call abort_physic(modname,"Soil is not activated but Flux Geo > 0.",1)
   endif
  
-  if ((not(soil_pem)).and.reg_thprop_dependp) then
+  if ((.not.soil_pem).and.reg_thprop_dependp) then
      print*,'Regolith properties vary with Ps only when soil is set to true'
      call abort_physic(modname,'Regolith properties vary with Ps only when soil is set to true',1)

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

@@ -14 +14 @@
 
       SUBROUTINE orbit_param_criterion(year_iter_max)
+#ifdef CPP_IOIPSL
+  use IOIPSL, only: getin
+#else
+  ! if not using IOIPSL, we still need to use (a local version of) getin
+  use ioipsl_getincom, only: getin
+#endif
 
       USE temps_mod_evol, ONLY: year_bp_ini, year_PEM, var_obl, var_ex, var_lsp
@@ -109 +115 @@
 !Constant max change case 
 
-        max_change_obl=0.1
+        max_change_obl=0.5
         max_change_ex=0.1
         max_change_lsp=40.
+
+        CALL getin('max_change_obl', max_change_obl)
+
+        CALL getin('max_change_ex', max_change_ex)
+
+        CALL getin('max_change_lsp', max_change_lsp)
 
         max_obl=obliquit+max_change_obl
@@ -147 +159 @@
         endif
 
-        max_obl_iter=999999999999
-        max_ex_iter =999999999999
-        max_lsp_iter=999999999999
+        max_obl_iter=999999
+        max_ex_iter =999999
+        max_lsp_iter=999999
 
 !--------------------------------

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

@@ -921 +921 @@
 
       print *, "Updating the new Tsurf"
-      bool_sublim=0
+      bool_sublim=.false.
       Tsurfave_before_saved(:,:) = tsurf_ave(:,:)
       DO ig = 1,ngrid
@@ -931 +931 @@
                   if(initial_co2_ice(ig_loop,islope_loop).lt.0.5 .and. qsurf(ig_loop,igcm_co2,islope_loop).LT. 1E-10) then
                     tsurf_ave(ig,islope)=tsurf_ave(ig_loop,islope_loop)
-                    bool_sublim=1
+                    bool_sublim=.true.
                     exit
                   endif
                 enddo
-                if (bool_sublim.eq.1) then
+                if (bool_sublim.eqv. .true.) then
                   exit
                 endif
@@ -944 +944 @@
                   if(initial_co2_ice(ig_loop,islope_loop).lt.0.5 .and. qsurf(ig_loop,igcm_co2,islope_loop).LT. 1E-10) then
                     tsurf_ave(ig,islope)=tsurf_ave(ig_loop,islope_loop)
-                    bool_sublim=1
+                    bool_sublim=.true.
                     exit
                   endif
                 enddo
-                if (bool_sublim.eq.1) then
+                if (bool_sublim.eqv. .true.) then
                   exit
                 endif